[PR PATCH] monero, monero-gui: update to 0.17.2.0

[PR PATCH] monero, monero-gui: update to 0.17.2.0

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 1590 bytes --]

There is a new pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages monero-update
https://github.com/void-linux/void-packages/pull/30190

monero, monero-gui: update to 0.17.2.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30190.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-monero-update-30190.patch --]
[-- Type: text/x-diff, Size: 5250 bytes --]

From e721d6c2b5da3360493d0a70e65f6b56cbd0be95 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 12 Apr 2021 23:23:09 +0300
Subject: [PATCH 1/2] monero: update to 0.17.2.0

---
 srcpkgs/monero/patches/march_cross.patch      | 16 +++++++++-------
 srcpkgs/monero/patches/system-miniupnpc.patch |  7 +++----
 srcpkgs/monero/template                       |  6 +++---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/monero/patches/march_cross.patch b/srcpkgs/monero/patches/march_cross.patch
index 1c086feee419..a1276013b00d 100644
--- a/srcpkgs/monero/patches/march_cross.patch
+++ b/srcpkgs/monero/patches/march_cross.patch
@@ -1,11 +1,13 @@
---- CMakeLists.txt	2017-09-22 19:22:04.735657685 +0200
-+++ CMakeLists.txt	2017-09-22 19:20:08.164169125 +0200
-@@ -388,7 +388,7 @@
-   include(TestCXXAcceptsFlag)
-   set(ARCH native CACHE STRING "CPU to build for: -march value or 'default' to not pass -march at all")
+diff --git CMakeLists.txt CMakeLists.txt
+index 953707657..394e8cb32 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -581,7 +581,7 @@ else()
+     set_default_arch()
+   endif()
    message(STATUS "Building on ${CMAKE_SYSTEM_PROCESSOR} for ${ARCH}")
-+  if(ARCH STREQUAL "default" OR CMAKE_CROSSCOMPILING)
 -  if(ARCH STREQUAL "default")
++  if(ARCH STREQUAL "default" OR CMAKE_CROSSCOMPILING)
      set(ARCH_FLAG "")
    elseif(PPC64LE)
-     set(ARCH_FLAG "-mcpu=${ARCH}")
+     set(ARCH_FLAG "-mcpu=power8")
diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch
index 79b2e4d842c8..607162d8a54d 100644
--- a/srcpkgs/monero/patches/system-miniupnpc.patch
+++ b/srcpkgs/monero/patches/system-miniupnpc.patch
@@ -1,7 +1,6 @@
 --- CMakeLists.txt
 +++ CMakeLists.txt
-@@ -430,6 +430,14 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
- 
+@@ -527,5 +527,13 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
  add_subdirectory(external)
  
 +# Final setup for miniupnpc
@@ -19,9 +18,9 @@ diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
 index 9b21705e..76340a22 100644
 --- src/p2p/net_node.inl
 +++ src/p2p/net_node.inl
-@@ -49,9 +49,16 @@
- #include "storages/levin_abstract_invoke2.h"
+@@ -61,9 +61,16 @@ #include "storages/levin_abstract_invoke2.h"
  #include "cryptonote_core/cryptonote_core.h"
+ #include "net/parse.h"
  
 -#include <miniupnp/miniupnpc/miniupnpc.h>
 -#include <miniupnp/miniupnpc/upnpcommands.h>
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 45072e81b820..3617a446f098 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
-version=0.17.1.9
-revision=2
+version=0.17.2.0
+revision=1
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -23,7 +23,7 @@ distfiles="https://github.com/monero-project/monero/archive/v${version}.tar.gz
  https://github.com/tevador/RandomX/archive/v${_randomx_version}.tar.gz
  https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz
  https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz"
-checksum="efedac6d9a64488f57e5237cb6199b56d819c8315f529af5142a9e41fcfcac91
+checksum="5e9bd2e565a57b4ae9f0d851704725b2e0b18c4a94051e56d5deae4e74727496
  f982a12d18b1d260bef2a1d3c46ae4902975fbf63abb38ca6413c96d1778db3a
  44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
  b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7"

From 3c9349df17d5059dbe85ca7eddd9c0974e2d56d9 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 12 Apr 2021 23:55:35 +0300
Subject: [PATCH 2/2] monero-gui: update to 0.17.2.0

---
 srcpkgs/monero-gui/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6ed3b0f5ce6a..16d2926d770a 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,8 +1,8 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
-version=0.17.1.9
-revision=2
-_monero_version=0.17.1.9
+version=0.17.2.0
+revision=1
+_monero_version=0.17.2.0
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -26,8 +26,8 @@ distfiles="https://github.com/monero-project/monero-gui/archive/v${version}.tar.
  https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz
  https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz
  https://github.com/dlbeer/quirc/archive/${_quirc_gitrev}.tar.gz"
-checksum="3a924b4e08b557d93337a0c05826a9fa95e5cf8c503aff0ecb3676be45db1d14
- efedac6d9a64488f57e5237cb6199b56d819c8315f529af5142a9e41fcfcac91
+checksum="00fbadca8090b85781b66b9cf54c36926ba9502ea5ce8e375a4342993b4ce907
+ 5e9bd2e565a57b4ae9f0d851704725b2e0b18c4a94051e56d5deae4e74727496
  f982a12d18b1d260bef2a1d3c46ae4902975fbf63abb38ca6413c96d1778db3a
  44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
  b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7

Re: [PR PATCH] [Merged]: monero, monero-gui: update to 0.17.2.0

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1423 bytes --]

There's a merged pull request on the void-packages repository

monero, monero-gui: update to 0.17.2.0
https://github.com/void-linux/void-packages/pull/30190

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->