From 7e1bb9e4709b196a26bc382cf4d28629a00fae6a Mon Sep 17 00:00:00 2001 From: alureon Date: Fri, 19 Aug 2022 05:07:50 +0100 Subject: [PATCH 1/2] monero: update to 0.18.1.0 --- srcpkgs/monero/patches/system-miniupnpc.patch | 8 +++++--- srcpkgs/monero/template | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch index 3d9c8bb08bbc..30a6708ac471 100644 --- a/srcpkgs/monero/patches/system-miniupnpc.patch +++ b/srcpkgs/monero/patches/system-miniupnpc.patch @@ -41,9 +41,9 @@ index 9b21705e..76340a22 100644 -- 2.17.0 ---- a/external/CMakeLists.txt 2018-10-10 13:13:55.759414180 +0200 -+++ b/external/CMakeLists.txt 2018-10-10 13:19:33.363411827 +0200 -@@ -34,22 +34,46 @@ +--- a/external/CMakeLists.txt 2022-08-17 17:56:16.277171566 +0100 ++++ b/external/CMakeLists.txt 2022-08-17 18:12:39.342914327 +0100 +@@ -34,24 +34,46 @@ # We always compile if we are building statically to reduce static dependency issues... # ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with # others. @@ -54,8 +54,10 @@ index 9b21705e..76340a22 100644 -find_package(Miniupnpc REQUIRED) - -message(STATUS "Using in-tree miniupnpc") +-set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE) -add_subdirectory(miniupnp/miniupnpc) -set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") +-set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON) -if(MSVC) - set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") -elseif(NOT MSVC) diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template index bff62347ebd6..ae68b566d32c 100644 --- a/srcpkgs/monero/template +++ b/srcpkgs/monero/template @@ -1,7 +1,7 @@ # Template file for 'monero' pkgname=monero -version=0.17.2.3 -revision=2 +version=0.18.1.0 +revision=1 _randomx_version="1.1.9" # 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="e4462f8909bdc5e66d76f4023374ff759159c15fe7d407f0c21619769e87c35d +checksum="9e5718a3959685bf6e6b01481354019686a5341b35b6a290bbaa3e0d47f83c82 b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5 44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273 b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7" From c8a79218bb2fef0c843af07c4db8890f58911988 Mon Sep 17 00:00:00 2001 From: alureon Date: Fri, 19 Aug 2022 05:08:04 +0100 Subject: [PATCH 2/2] monero-gui: update to 0.18.1.0 --- srcpkgs/monero-gui/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template index 67ed3273defa..e8d10703902e 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.2.3 +version=0.18.1.0 revision=1 -_monero_version=0.17.2.3 +_monero_version=0.18.1.0 _randomx_version="1.1.9" # 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="aeab35380282b0403be926b78d5249df2f97f9cbe36bb374ac39daf4f02bb349 - e4462f8909bdc5e66d76f4023374ff759159c15fe7d407f0c21619769e87c35d +checksum="82b7180b2306c7f67f9dcadc2914cb6d366d713345aab78b1476453f4c3909bf + 9e5718a3959685bf6e6b01481354019686a5341b35b6a290bbaa3e0d47f83c82 b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5 44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273 b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7