* Re: [PR PATCH] [Updated] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
@ 2022-10-04 20:14 ` kevcrumb
2022-11-11 20:13 ` kevcrumb
` (37 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-10-04 20:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by kevcrumb against master on the void-packages repository
https://github.com/kevcrumb/void-packages monero18
https://github.com/void-linux/void-packages/pull/39721
monero: update to 0.18.1.2.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/39721.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-monero18-39721.patch --]
[-- Type: text/x-diff, Size: 5252 bytes --]
From cb1af09d196dff26052465e948b2be998e41ab39 Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Tue, 4 Oct 2022 17:38:25 +0000
Subject: [PATCH] monero: update to 0.18.1.2.
---
srcpkgs/monero/patches/system-miniupnpc.patch | 68 ++++++++++---------
srcpkgs/monero/template | 6 +-
2 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch
index 3d9c8bb08bbc..6da9a92d491e 100644
--- a/srcpkgs/monero/patches/system-miniupnpc.patch
+++ b/srcpkgs/monero/patches/system-miniupnpc.patch
@@ -1,6 +1,9 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b05c087cf..4f1a20101 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -527,5 +527,13 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
+@@ -676,6 +676,14 @@ ExternalProject_Add(generate_translations_header
+ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
add_subdirectory(external)
+# Final setup for miniupnpc
@@ -12,38 +15,13 @@
+endif()
+
# Final setup for libunbound
- include_directories(${UNBOUND_INCLUDE})
- link_directories(${UNBOUND_LIBRARY_DIRS})
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 9b21705e..76340a22 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -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>
--#include <miniupnp/miniupnpc/upnperrors.h>
-+// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
-+#ifdef UPNP_STATIC
-+ #include <miniupnp/miniupnpc/miniupnpc.h>
-+ #include <miniupnp/miniupnpc/upnpcommands.h>
-+ #include <miniupnp/miniupnpc/upnperrors.h>
-+#else
-+ #include "miniupnpc.h"
-+ #include "upnpcommands.h"
-+ #include "upnperrors.h"
-+#endif
+ include_directories(${UNBOUND_INCLUDE_DIR})
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
---
-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 @@
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index 5b7f69a56..00ef3f43d 100644
+--- a/external/CMakeLists.txt
++++ b/external/CMakeLists.txt
+@@ -34,24 +34,47 @@
# 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 +32,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)
@@ -100,3 +80,27 @@ index 9b21705e..76340a22 100644
find_package(Unbound)
+diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
+index f33ce977d..87d23a1e1 100644
+--- a/src/p2p/net_node.inl
++++ b/src/p2p/net_node.inl
+@@ -60,9 +60,16 @@
+ #include "cryptonote_core/cryptonote_core.h"
+ #include "net/parse.h"
+
+-#include <miniupnp/miniupnpc/miniupnpc.h>
+-#include <miniupnp/miniupnpc/upnpcommands.h>
+-#include <miniupnp/miniupnpc/upnperrors.h>
++// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
++#ifdef UPNP_STATIC
++ #include <miniupnp/miniupnpc/miniupnpc.h>
++ #include <miniupnp/miniupnpc/upnpcommands.h>
++ #include <miniupnp/miniupnpc/upnperrors.h>
++#else
++ #include "miniupnpc.h"
++ #include "upnpcommands.h"
++ #include "upnperrors.h"
++#endif
+
+ #undef MONERO_DEFAULT_LOG_CATEGORY
+ #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index eebce3d0a551..dc115f6a6595 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=3
+version=0.18.1.2
+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="f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5
44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7"
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
2022-10-04 20:14 ` [PR PATCH] [Updated] " kevcrumb
@ 2022-11-11 20:13 ` kevcrumb
2022-11-12 20:50 ` paper42
` (36 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-11 20:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
New comment by kevcrumb on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#issuecomment-1312157623
Comment:
As outlined on IRC today, the currently packaged version is outdated and doesn't allow users to connect to the Monero network any more. Please consider a timely merge of this PR.
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
2022-10-04 20:14 ` [PR PATCH] [Updated] " kevcrumb
2022-11-11 20:13 ` kevcrumb
@ 2022-11-12 20:50 ` paper42
2022-11-12 20:51 ` [PR REVIEW] " paper42
` (35 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: paper42 @ 2022-11-12 20:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#issuecomment-1312569425
Comment:
could you also update monero-gui in this PR in a separate commit?
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (2 preceding siblings ...)
2022-11-12 20:50 ` paper42
@ 2022-11-12 20:51 ` paper42
2022-11-12 21:28 ` kruceter
` (34 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: paper42 @ 2022-11-12 20:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1020805003
Comment:
did you make sure submodule versions didn't change since the last 0.17.2.3?
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (3 preceding siblings ...)
2022-11-12 20:51 ` [PR REVIEW] " paper42
@ 2022-11-12 21:28 ` kruceter
2022-11-12 21:29 ` kruceter
` (33 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kruceter @ 2022-11-12 21:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1020808410
Comment:
Monero uses randomx different version from release 1.1.9 with revision `261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c`.
rapidjson is the same.
supercop is the same.
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (4 preceding siblings ...)
2022-11-12 21:28 ` kruceter
@ 2022-11-12 21:29 ` kruceter
2022-11-12 21:46 ` paper42
` (32 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kruceter @ 2022-11-12 21:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1020808410
Comment:
Monero uses different version of randomx with revision `261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c`, which is newer than 1.1.9.
rapidjson is the same.
supercop is the same.
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (5 preceding siblings ...)
2022-11-12 21:29 ` kruceter
@ 2022-11-12 21:46 ` paper42
2022-11-14 19:13 ` [PR PATCH] [Updated] " kevcrumb
` (31 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: paper42 @ 2022-11-12 21:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1020809905
Comment:
great, let's bump randomx to that revision then
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR PATCH] [Updated] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (6 preceding siblings ...)
2022-11-12 21:46 ` paper42
@ 2022-11-14 19:13 ` kevcrumb
2022-11-14 21:21 ` kruceter
` (30 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-14 19:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by kevcrumb against master on the void-packages repository
https://github.com/kevcrumb/void-packages monero18
https://github.com/void-linux/void-packages/pull/39721
monero: update to 0.18.1.2.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/39721.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-monero18-39721.patch --]
[-- Type: text/x-diff, Size: 6715 bytes --]
From 62af359f0852e59e0cced35d5e5a90797dedd994 Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Tue, 4 Oct 2022 17:38:25 +0000
Subject: [PATCH] monero: update to 0.18.1.2.
---
srcpkgs/monero/files/monerod/log/run | 3 +
srcpkgs/monero/patches/system-miniupnpc.patch | 68 ++++++++++---------
srcpkgs/monero/template | 16 ++---
3 files changed, 47 insertions(+), 40 deletions(-)
create mode 100644 srcpkgs/monero/files/monerod/log/run
diff --git a/srcpkgs/monero/files/monerod/log/run b/srcpkgs/monero/files/monerod/log/run
new file mode 100644
index 000000000000..afcb02949c66
--- /dev/null
+++ b/srcpkgs/monero/files/monerod/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec logger -p daemon.notice -t monerod
diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch
index 3d9c8bb08bbc..6da9a92d491e 100644
--- a/srcpkgs/monero/patches/system-miniupnpc.patch
+++ b/srcpkgs/monero/patches/system-miniupnpc.patch
@@ -1,6 +1,9 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b05c087cf..4f1a20101 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -527,5 +527,13 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
+@@ -676,6 +676,14 @@ ExternalProject_Add(generate_translations_header
+ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
add_subdirectory(external)
+# Final setup for miniupnpc
@@ -12,38 +15,13 @@
+endif()
+
# Final setup for libunbound
- include_directories(${UNBOUND_INCLUDE})
- link_directories(${UNBOUND_LIBRARY_DIRS})
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 9b21705e..76340a22 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -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>
--#include <miniupnp/miniupnpc/upnperrors.h>
-+// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
-+#ifdef UPNP_STATIC
-+ #include <miniupnp/miniupnpc/miniupnpc.h>
-+ #include <miniupnp/miniupnpc/upnpcommands.h>
-+ #include <miniupnp/miniupnpc/upnperrors.h>
-+#else
-+ #include "miniupnpc.h"
-+ #include "upnpcommands.h"
-+ #include "upnperrors.h"
-+#endif
+ include_directories(${UNBOUND_INCLUDE_DIR})
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
---
-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 @@
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index 5b7f69a56..00ef3f43d 100644
+--- a/external/CMakeLists.txt
++++ b/external/CMakeLists.txt
+@@ -34,24 +34,47 @@
# 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 +32,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)
@@ -100,3 +80,27 @@ index 9b21705e..76340a22 100644
find_package(Unbound)
+diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
+index f33ce977d..87d23a1e1 100644
+--- a/src/p2p/net_node.inl
++++ b/src/p2p/net_node.inl
+@@ -60,9 +60,16 @@
+ #include "cryptonote_core/cryptonote_core.h"
+ #include "net/parse.h"
+
+-#include <miniupnp/miniupnpc/miniupnpc.h>
+-#include <miniupnp/miniupnpc/upnpcommands.h>
+-#include <miniupnp/miniupnpc/upnperrors.h>
++// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
++#ifdef UPNP_STATIC
++ #include <miniupnp/miniupnpc/miniupnpc.h>
++ #include <miniupnp/miniupnpc/upnpcommands.h>
++ #include <miniupnp/miniupnpc/upnperrors.h>
++#else
++ #include "miniupnpc.h"
++ #include "upnpcommands.h"
++ #include "upnperrors.h"
++#endif
+
+ #undef MONERO_DEFAULT_LOG_CATEGORY
+ #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index eebce3d0a551..dd80d75e7091 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,9 +1,9 @@
# Template file for 'monero'
pkgname=monero
-version=0.17.2.3
-revision=3
-_randomx_version="1.1.9"
+version=0.18.1.2
+revision=1
# the revision monero uses as a submodule for the specific version
+_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
build_style=cmake
@@ -20,14 +20,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://getmonero.org"
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/tevador/RandomX/archive/${_randomx_gitrev}.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
- b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5
+checksum="f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
+ 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7"
-skip_extraction="v${_randomx_version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz"
+skip_extraction="${_randomx_gitrev}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz"
system_accounts="monero"
case "$XBPS_TARGET_MACHINE" in
@@ -52,7 +52,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_randomx_version}.tar.gz \
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_randomx_gitrev}.tar.gz \
--strip-components=1 -C ${wrksrc}/external/randomx
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz \
--strip-components=1 -C ${wrksrc}/external/rapidjson
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (7 preceding siblings ...)
2022-11-14 19:13 ` [PR PATCH] [Updated] " kevcrumb
@ 2022-11-14 21:21 ` kruceter
2022-11-14 22:03 ` [PR PATCH] [Updated] " kevcrumb
` (29 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kruceter @ 2022-11-14 21:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4263 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#issuecomment-1314397077
Comment:
Here is a draft for monero-gui. I expected it to build on my machine, but perhaps monero is too much for it.
I hope you find the following patch below useful in some way.
```diff
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 61e5dd9da1..dac012a960 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,10 +1,10 @@
# Template file for 'monero-gui'
pkgname=monero-gui
-version=0.17.2.3
-revision=2
-_monero_version=0.17.2.3
-_randomx_version="1.1.9"
+version=0.18.1.2
+revision=1
+_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
+_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
_quirc_gitrev="7e7ab596e4d0988faf1c12ae89c354b114181c40"
@@ -12,9 +12,9 @@ build_style=cmake
configure_args="-DVERSION_IS_RELEASE=true -DQt5_LRELEASE_EXECUTABLE=/usr/bin/lrelease"
hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-quickcontrols qt5-declarative-devel
qt5-svg-devel"
-makedepends="boost-devel libatomic-devel libunwind-devel miniupnpc-devel
-qt5-declarative-devel readline-devel unbound-devel libsodium-devel hidapi-devel
- qt5-svg-devel libgcrypt-devel zeromq-devel"
+makedepends="boost-devel libunwind-devel miniupnpc-devel qt5-declarative-devel
+ readline-devel unbound-devel libsodium-devel hidapi-devel qt5-svg-devel
+ libgcrypt-devel zeromq-devel"
depends="qt5-graphicaleffects qt5-quickcontrols qt5-quickcontrols2 qt5-xmlpatterns"
short_desc="GUI for the core Monero implementation"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -22,17 +22,17 @@ license="BSD-3-Clause"
homepage="https://getmonero.org"
distfiles="https://github.com/monero-project/monero-gui/archive/v${version}.tar.gz
https://github.com/monero-project/monero/archive/v${_monero_version}.tar.gz>monero-${_monero_version}.tar.gz
- https://github.com/tevador/RandomX/archive/v${_randomx_version}.tar.gz
+ https://github.com/tevador/RandomX/archive/${_randomx_gitrev}.tar.gz
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
- b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5
+checksum="b5494830e917231aa7515992c69bcbb495f532fefde42530b265f9fd590e1702
+ f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
+ 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7
c8366aecb6ba48ec50a7e579a4fa18eb55c3c4be7d3efb2a83726157977f4ca6"
-skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz v${_randomx_version}.tar.gz
+skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz ${_randomx_gitrev}.tar.gz
${_quirc_gitrev}.tar.gz"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -60,7 +60,7 @@ post_extract() {
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/monero-${_monero_version}.tar.gz --strip-components 1 -C monero
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz --strip-components 1 -C monero/external/rapidjson
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_supercop_gitrev}.tar.gz --strip-components 1 -C monero/external/supercop
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_randomx_version}.tar.gz --strip-components 1 -C monero/external/randomx
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_randomx_gitrev}.tar.gz --strip-components 1 -C monero/external/randomx
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_quirc_gitrev}.tar.gz --strip-components 1 -C external/quirc
}
```
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR PATCH] [Updated] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (8 preceding siblings ...)
2022-11-14 21:21 ` kruceter
@ 2022-11-14 22:03 ` kevcrumb
2022-11-14 22:37 ` kevcrumb
` (28 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-14 22:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by kevcrumb against master on the void-packages repository
https://github.com/kevcrumb/void-packages monero18
https://github.com/void-linux/void-packages/pull/39721
monero: update to 0.18.1.2.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/39721.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-monero18-39721.patch --]
[-- Type: text/x-diff, Size: 10092 bytes --]
From 62af359f0852e59e0cced35d5e5a90797dedd994 Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Tue, 4 Oct 2022 17:38:25 +0000
Subject: [PATCH 1/2] monero: update to 0.18.1.2.
---
srcpkgs/monero/files/monerod/log/run | 3 +
srcpkgs/monero/patches/system-miniupnpc.patch | 68 ++++++++++---------
srcpkgs/monero/template | 16 ++---
3 files changed, 47 insertions(+), 40 deletions(-)
create mode 100644 srcpkgs/monero/files/monerod/log/run
diff --git a/srcpkgs/monero/files/monerod/log/run b/srcpkgs/monero/files/monerod/log/run
new file mode 100644
index 000000000000..afcb02949c66
--- /dev/null
+++ b/srcpkgs/monero/files/monerod/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec logger -p daemon.notice -t monerod
diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch
index 3d9c8bb08bbc..6da9a92d491e 100644
--- a/srcpkgs/monero/patches/system-miniupnpc.patch
+++ b/srcpkgs/monero/patches/system-miniupnpc.patch
@@ -1,6 +1,9 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b05c087cf..4f1a20101 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -527,5 +527,13 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
+@@ -676,6 +676,14 @@ ExternalProject_Add(generate_translations_header
+ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
add_subdirectory(external)
+# Final setup for miniupnpc
@@ -12,38 +15,13 @@
+endif()
+
# Final setup for libunbound
- include_directories(${UNBOUND_INCLUDE})
- link_directories(${UNBOUND_LIBRARY_DIRS})
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 9b21705e..76340a22 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -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>
--#include <miniupnp/miniupnpc/upnperrors.h>
-+// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
-+#ifdef UPNP_STATIC
-+ #include <miniupnp/miniupnpc/miniupnpc.h>
-+ #include <miniupnp/miniupnpc/upnpcommands.h>
-+ #include <miniupnp/miniupnpc/upnperrors.h>
-+#else
-+ #include "miniupnpc.h"
-+ #include "upnpcommands.h"
-+ #include "upnperrors.h"
-+#endif
+ include_directories(${UNBOUND_INCLUDE_DIR})
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
---
-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 @@
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index 5b7f69a56..00ef3f43d 100644
+--- a/external/CMakeLists.txt
++++ b/external/CMakeLists.txt
+@@ -34,24 +34,47 @@
# 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 +32,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)
@@ -100,3 +80,27 @@ index 9b21705e..76340a22 100644
find_package(Unbound)
+diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
+index f33ce977d..87d23a1e1 100644
+--- a/src/p2p/net_node.inl
++++ b/src/p2p/net_node.inl
+@@ -60,9 +60,16 @@
+ #include "cryptonote_core/cryptonote_core.h"
+ #include "net/parse.h"
+
+-#include <miniupnp/miniupnpc/miniupnpc.h>
+-#include <miniupnp/miniupnpc/upnpcommands.h>
+-#include <miniupnp/miniupnpc/upnperrors.h>
++// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
++#ifdef UPNP_STATIC
++ #include <miniupnp/miniupnpc/miniupnpc.h>
++ #include <miniupnp/miniupnpc/upnpcommands.h>
++ #include <miniupnp/miniupnpc/upnperrors.h>
++#else
++ #include "miniupnpc.h"
++ #include "upnpcommands.h"
++ #include "upnperrors.h"
++#endif
+
+ #undef MONERO_DEFAULT_LOG_CATEGORY
+ #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index eebce3d0a551..dd80d75e7091 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,9 +1,9 @@
# Template file for 'monero'
pkgname=monero
-version=0.17.2.3
-revision=3
-_randomx_version="1.1.9"
+version=0.18.1.2
+revision=1
# the revision monero uses as a submodule for the specific version
+_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
build_style=cmake
@@ -20,14 +20,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://getmonero.org"
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/tevador/RandomX/archive/${_randomx_gitrev}.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
- b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5
+checksum="f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
+ 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7"
-skip_extraction="v${_randomx_version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz"
+skip_extraction="${_randomx_gitrev}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz"
system_accounts="monero"
case "$XBPS_TARGET_MACHINE" in
@@ -52,7 +52,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_randomx_version}.tar.gz \
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_randomx_gitrev}.tar.gz \
--strip-components=1 -C ${wrksrc}/external/randomx
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz \
--strip-components=1 -C ${wrksrc}/external/rapidjson
From fb652aa752224e447618f545d3f2b5d10e695056 Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Mon, 14 Nov 2022 22:02:41 +0000
Subject: [PATCH 2/2] monero-gui: update to 0.18.1.2.
---
srcpkgs/monero-gui/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 61e5dd9da1b7..c63c46145ba2 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,10 +1,10 @@
# Template file for 'monero-gui'
pkgname=monero-gui
-version=0.17.2.3
+version=0.18.1.2
revision=2
-_monero_version=0.17.2.3
-_randomx_version="1.1.9"
+_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
+_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
_quirc_gitrev="7e7ab596e4d0988faf1c12ae89c354b114181c40"
@@ -22,17 +22,17 @@ license="BSD-3-Clause"
homepage="https://getmonero.org"
distfiles="https://github.com/monero-project/monero-gui/archive/v${version}.tar.gz
https://github.com/monero-project/monero/archive/v${_monero_version}.tar.gz>monero-${_monero_version}.tar.gz
- https://github.com/tevador/RandomX/archive/v${_randomx_version}.tar.gz
+ https://github.com/tevador/RandomX/archive/${_randomx_gitrev}.tar.gz
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
- b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5
+checksum="b5494830e917231aa7515992c69bcbb495f532fefde42530b265f9fd590e1702
+ f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
+ 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7
c8366aecb6ba48ec50a7e579a4fa18eb55c3c4be7d3efb2a83726157977f4ca6"
-skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz v${_randomx_version}.tar.gz
+skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz ${_randomx_gitrev}.tar.gz
${_quirc_gitrev}.tar.gz"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -60,7 +60,7 @@ post_extract() {
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/monero-${_monero_version}.tar.gz --strip-components 1 -C monero
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz --strip-components 1 -C monero/external/rapidjson
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_supercop_gitrev}.tar.gz --strip-components 1 -C monero/external/supercop
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_randomx_version}.tar.gz --strip-components 1 -C monero/external/randomx
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_randomx_gitrev}.tar.gz --strip-components 1 -C monero/external/randomx
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_quirc_gitrev}.tar.gz --strip-components 1 -C external/quirc
}
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR PATCH] [Updated] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (9 preceding siblings ...)
2022-11-14 22:03 ` [PR PATCH] [Updated] " kevcrumb
@ 2022-11-14 22:37 ` kevcrumb
2022-11-14 22:39 ` kevcrumb
` (27 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-14 22:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by kevcrumb against master on the void-packages repository
https://github.com/kevcrumb/void-packages monero18
https://github.com/void-linux/void-packages/pull/39721
monero: update to 0.18.1.2.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/39721.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-monero18-39721.patch --]
[-- Type: text/x-diff, Size: 10092 bytes --]
From 62af359f0852e59e0cced35d5e5a90797dedd994 Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Tue, 4 Oct 2022 17:38:25 +0000
Subject: [PATCH 1/2] monero: update to 0.18.1.2.
---
srcpkgs/monero/files/monerod/log/run | 3 +
srcpkgs/monero/patches/system-miniupnpc.patch | 68 ++++++++++---------
srcpkgs/monero/template | 16 ++---
3 files changed, 47 insertions(+), 40 deletions(-)
create mode 100644 srcpkgs/monero/files/monerod/log/run
diff --git a/srcpkgs/monero/files/monerod/log/run b/srcpkgs/monero/files/monerod/log/run
new file mode 100644
index 000000000000..afcb02949c66
--- /dev/null
+++ b/srcpkgs/monero/files/monerod/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec logger -p daemon.notice -t monerod
diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch
index 3d9c8bb08bbc..6da9a92d491e 100644
--- a/srcpkgs/monero/patches/system-miniupnpc.patch
+++ b/srcpkgs/monero/patches/system-miniupnpc.patch
@@ -1,6 +1,9 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b05c087cf..4f1a20101 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -527,5 +527,13 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
+@@ -676,6 +676,14 @@ ExternalProject_Add(generate_translations_header
+ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
add_subdirectory(external)
+# Final setup for miniupnpc
@@ -12,38 +15,13 @@
+endif()
+
# Final setup for libunbound
- include_directories(${UNBOUND_INCLUDE})
- link_directories(${UNBOUND_LIBRARY_DIRS})
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 9b21705e..76340a22 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -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>
--#include <miniupnp/miniupnpc/upnperrors.h>
-+// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
-+#ifdef UPNP_STATIC
-+ #include <miniupnp/miniupnpc/miniupnpc.h>
-+ #include <miniupnp/miniupnpc/upnpcommands.h>
-+ #include <miniupnp/miniupnpc/upnperrors.h>
-+#else
-+ #include "miniupnpc.h"
-+ #include "upnpcommands.h"
-+ #include "upnperrors.h"
-+#endif
+ include_directories(${UNBOUND_INCLUDE_DIR})
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
---
-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 @@
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index 5b7f69a56..00ef3f43d 100644
+--- a/external/CMakeLists.txt
++++ b/external/CMakeLists.txt
+@@ -34,24 +34,47 @@
# 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 +32,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)
@@ -100,3 +80,27 @@ index 9b21705e..76340a22 100644
find_package(Unbound)
+diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
+index f33ce977d..87d23a1e1 100644
+--- a/src/p2p/net_node.inl
++++ b/src/p2p/net_node.inl
+@@ -60,9 +60,16 @@
+ #include "cryptonote_core/cryptonote_core.h"
+ #include "net/parse.h"
+
+-#include <miniupnp/miniupnpc/miniupnpc.h>
+-#include <miniupnp/miniupnpc/upnpcommands.h>
+-#include <miniupnp/miniupnpc/upnperrors.h>
++// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
++#ifdef UPNP_STATIC
++ #include <miniupnp/miniupnpc/miniupnpc.h>
++ #include <miniupnp/miniupnpc/upnpcommands.h>
++ #include <miniupnp/miniupnpc/upnperrors.h>
++#else
++ #include "miniupnpc.h"
++ #include "upnpcommands.h"
++ #include "upnperrors.h"
++#endif
+
+ #undef MONERO_DEFAULT_LOG_CATEGORY
+ #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index eebce3d0a551..dd80d75e7091 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,9 +1,9 @@
# Template file for 'monero'
pkgname=monero
-version=0.17.2.3
-revision=3
-_randomx_version="1.1.9"
+version=0.18.1.2
+revision=1
# the revision monero uses as a submodule for the specific version
+_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
build_style=cmake
@@ -20,14 +20,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://getmonero.org"
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/tevador/RandomX/archive/${_randomx_gitrev}.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
- b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5
+checksum="f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
+ 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7"
-skip_extraction="v${_randomx_version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz"
+skip_extraction="${_randomx_gitrev}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz"
system_accounts="monero"
case "$XBPS_TARGET_MACHINE" in
@@ -52,7 +52,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_randomx_version}.tar.gz \
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_randomx_gitrev}.tar.gz \
--strip-components=1 -C ${wrksrc}/external/randomx
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz \
--strip-components=1 -C ${wrksrc}/external/rapidjson
From 50af75f179573f55e1a6140ebae4f5723cf81a85 Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Mon, 14 Nov 2022 22:02:41 +0000
Subject: [PATCH 2/2] monero-gui: update to 0.18.1.2.
---
srcpkgs/monero-gui/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 61e5dd9da1b7..c63c46145ba2 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,10 +1,10 @@
# Template file for 'monero-gui'
pkgname=monero-gui
-version=0.17.2.3
+version=0.18.1.2
revision=2
-_monero_version=0.17.2.3
-_randomx_version="1.1.9"
+_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
+_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
_quirc_gitrev="7e7ab596e4d0988faf1c12ae89c354b114181c40"
@@ -22,17 +22,17 @@ license="BSD-3-Clause"
homepage="https://getmonero.org"
distfiles="https://github.com/monero-project/monero-gui/archive/v${version}.tar.gz
https://github.com/monero-project/monero/archive/v${_monero_version}.tar.gz>monero-${_monero_version}.tar.gz
- https://github.com/tevador/RandomX/archive/v${_randomx_version}.tar.gz
+ https://github.com/tevador/RandomX/archive/${_randomx_gitrev}.tar.gz
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
- b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5
+checksum="b5494830e917231aa7515992c69bcbb495f532fefde42530b265f9fd590e1702
+ f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
+ 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7
c8366aecb6ba48ec50a7e579a4fa18eb55c3c4be7d3efb2a83726157977f4ca6"
-skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz v${_randomx_version}.tar.gz
+skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz ${_randomx_gitrev}.tar.gz
${_quirc_gitrev}.tar.gz"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -60,7 +60,7 @@ post_extract() {
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/monero-${_monero_version}.tar.gz --strip-components 1 -C monero
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz --strip-components 1 -C monero/external/rapidjson
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_supercop_gitrev}.tar.gz --strip-components 1 -C monero/external/supercop
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_randomx_version}.tar.gz --strip-components 1 -C monero/external/randomx
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_randomx_gitrev}.tar.gz --strip-components 1 -C monero/external/randomx
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_quirc_gitrev}.tar.gz --strip-components 1 -C external/quirc
}
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (10 preceding siblings ...)
2022-11-14 22:37 ` kevcrumb
@ 2022-11-14 22:39 ` kevcrumb
2022-11-14 23:02 ` kruceter
` (26 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-14 22:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 373 bytes --]
New comment by kevcrumb on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#issuecomment-1314502153
Comment:
Oh, mine was just building `monero-gui x86_64 musl` as you sent that.
That one worked and I do not see any particular differences between your template and mine. Regardless, the CI is failing on other archs.
Any suggestions?
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (11 preceding siblings ...)
2022-11-14 22:39 ` kevcrumb
@ 2022-11-14 23:02 ` kruceter
2022-11-14 23:33 ` kruceter
` (25 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kruceter @ 2022-11-14 23:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 541 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#issuecomment-1314519388
Comment:
> Regardless, the CI is failing on other archs.
I noticed armv6l-musl only. There is a condition for including libatomic into `monero/CMakeLists.txt` provided that the line containing `include(version.cmake)` exists, but it is not.
As for why it did not happen with monero is because `sed` was used instead of `vsed`. While I look for solutions, please replace `sed` with `vsed` on your side.
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (12 preceding siblings ...)
2022-11-14 23:02 ` kruceter
@ 2022-11-14 23:33 ` kruceter
2022-11-14 23:49 ` kruceter
` (24 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kruceter @ 2022-11-14 23:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2313 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#issuecomment-1314547850
Comment:
@kevcrumb, here is the patch.
```diff
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index c63c46145b..6aab84641c 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -12,7 +12,7 @@ build_style=cmake
configure_args="-DVERSION_IS_RELEASE=true -DQt5_LRELEASE_EXECUTABLE=/usr/bin/lrelease"
hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-quickcontrols qt5-declarative-devel
qt5-svg-devel"
-makedepends="boost-devel libatomic-devel libunwind-devel miniupnpc-devel
+makedepends="boost-devel libunwind-devel miniupnpc-devel
qt5-declarative-devel readline-devel unbound-devel libsodium-devel hidapi-devel
qt5-svg-devel libgcrypt-devel zeromq-devel"
depends="qt5-graphicaleffects qt5-quickcontrols qt5-quickcontrols2 qt5-xmlpatterns"
@@ -76,7 +76,8 @@ pre_configure() {
echo "var GUI_VERSION = \"${version}\"" > version.js
echo "var GUI_MONERO_VERSION = \"${version}\"" >> version.js
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- vsed -i monero/CMakeLists.txt -e '/include(version.cmake)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
+ vsed -i monero/CMakeLists.txt -e \
+ '/if(ANDROID)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
fi
}
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index dd80d75e70..9ae8710d48 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -62,8 +62,8 @@ post_extract() {
pre_configure() {
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- sed -i CMakeLists.txt -e \
- '/include(version.cmake)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
+ vsed -i CMakeLists.txt -e \
+ '/if(ANDROID)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
fi
}
```
I believe it should work. I cannot build monero on my hardware, unfortunately.
I chose to match `if (ANDROID)` because it is the condition for including libatomics for android, but not suited for void. Perfect place to include this library above that control flow construction.
For the side note: I checked whether 0.17.2.3's `CMakeLists.txt` has `include(version.cmake)` or not. And it does not. No clue since when this line was gone from the source code.
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (13 preceding siblings ...)
2022-11-14 23:33 ` kruceter
@ 2022-11-14 23:49 ` kruceter
2022-11-15 7:53 ` [PR PATCH] [Updated] " kevcrumb
` (23 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kruceter @ 2022-11-14 23:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#issuecomment-1314519388
Comment:
> Regardless, the CI is failing on other archs.
I noticed armv6l-musl only. There is a condition for including libatomic into `monero/CMakeLists.txt` provided that the line containing `include(version.cmake)` exists, but it is not.
As for why it did not happen with monero is because `sed` was used instead of `vsed`. ~While I look for solutions, please replace `sed` with `vsed` on your side.~
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR PATCH] [Updated] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (14 preceding siblings ...)
2022-11-14 23:49 ` kruceter
@ 2022-11-15 7:53 ` kevcrumb
2022-11-16 0:33 ` kruceter
` (22 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-15 7:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by kevcrumb against master on the void-packages repository
https://github.com/kevcrumb/void-packages monero18
https://github.com/void-linux/void-packages/pull/39721
monero: update to 0.18.1.2.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/39721.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-monero18-39721.patch --]
[-- Type: text/x-diff, Size: 11097 bytes --]
From 62af359f0852e59e0cced35d5e5a90797dedd994 Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Tue, 4 Oct 2022 17:38:25 +0000
Subject: [PATCH 1/2] monero: update to 0.18.1.2.
---
srcpkgs/monero/files/monerod/log/run | 3 +
srcpkgs/monero/patches/system-miniupnpc.patch | 68 ++++++++++---------
srcpkgs/monero/template | 16 ++---
3 files changed, 47 insertions(+), 40 deletions(-)
create mode 100644 srcpkgs/monero/files/monerod/log/run
diff --git a/srcpkgs/monero/files/monerod/log/run b/srcpkgs/monero/files/monerod/log/run
new file mode 100644
index 000000000000..afcb02949c66
--- /dev/null
+++ b/srcpkgs/monero/files/monerod/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec logger -p daemon.notice -t monerod
diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch
index 3d9c8bb08bbc..6da9a92d491e 100644
--- a/srcpkgs/monero/patches/system-miniupnpc.patch
+++ b/srcpkgs/monero/patches/system-miniupnpc.patch
@@ -1,6 +1,9 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b05c087cf..4f1a20101 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -527,5 +527,13 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
+@@ -676,6 +676,14 @@ ExternalProject_Add(generate_translations_header
+ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
add_subdirectory(external)
+# Final setup for miniupnpc
@@ -12,38 +15,13 @@
+endif()
+
# Final setup for libunbound
- include_directories(${UNBOUND_INCLUDE})
- link_directories(${UNBOUND_LIBRARY_DIRS})
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 9b21705e..76340a22 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -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>
--#include <miniupnp/miniupnpc/upnperrors.h>
-+// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
-+#ifdef UPNP_STATIC
-+ #include <miniupnp/miniupnpc/miniupnpc.h>
-+ #include <miniupnp/miniupnpc/upnpcommands.h>
-+ #include <miniupnp/miniupnpc/upnperrors.h>
-+#else
-+ #include "miniupnpc.h"
-+ #include "upnpcommands.h"
-+ #include "upnperrors.h"
-+#endif
+ include_directories(${UNBOUND_INCLUDE_DIR})
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
---
-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 @@
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index 5b7f69a56..00ef3f43d 100644
+--- a/external/CMakeLists.txt
++++ b/external/CMakeLists.txt
+@@ -34,24 +34,47 @@
# 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 +32,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)
@@ -100,3 +80,27 @@ index 9b21705e..76340a22 100644
find_package(Unbound)
+diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
+index f33ce977d..87d23a1e1 100644
+--- a/src/p2p/net_node.inl
++++ b/src/p2p/net_node.inl
+@@ -60,9 +60,16 @@
+ #include "cryptonote_core/cryptonote_core.h"
+ #include "net/parse.h"
+
+-#include <miniupnp/miniupnpc/miniupnpc.h>
+-#include <miniupnp/miniupnpc/upnpcommands.h>
+-#include <miniupnp/miniupnpc/upnperrors.h>
++// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
++#ifdef UPNP_STATIC
++ #include <miniupnp/miniupnpc/miniupnpc.h>
++ #include <miniupnp/miniupnpc/upnpcommands.h>
++ #include <miniupnp/miniupnpc/upnperrors.h>
++#else
++ #include "miniupnpc.h"
++ #include "upnpcommands.h"
++ #include "upnperrors.h"
++#endif
+
+ #undef MONERO_DEFAULT_LOG_CATEGORY
+ #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index eebce3d0a551..dd80d75e7091 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,9 +1,9 @@
# Template file for 'monero'
pkgname=monero
-version=0.17.2.3
-revision=3
-_randomx_version="1.1.9"
+version=0.18.1.2
+revision=1
# the revision monero uses as a submodule for the specific version
+_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
build_style=cmake
@@ -20,14 +20,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://getmonero.org"
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/tevador/RandomX/archive/${_randomx_gitrev}.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
- b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5
+checksum="f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
+ 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7"
-skip_extraction="v${_randomx_version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz"
+skip_extraction="${_randomx_gitrev}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz"
system_accounts="monero"
case "$XBPS_TARGET_MACHINE" in
@@ -52,7 +52,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_randomx_version}.tar.gz \
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_randomx_gitrev}.tar.gz \
--strip-components=1 -C ${wrksrc}/external/randomx
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz \
--strip-components=1 -C ${wrksrc}/external/rapidjson
From 5606a220f30efea2f4b11c0cc7b27c74434c4897 Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Mon, 14 Nov 2022 22:02:41 +0000
Subject: [PATCH 2/2] monero-gui: update to 0.18.1.2.
---
srcpkgs/monero-gui/template | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 61e5dd9da1b7..4480a19743d5 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,10 +1,10 @@
# Template file for 'monero-gui'
pkgname=monero-gui
-version=0.17.2.3
-revision=2
-_monero_version=0.17.2.3
-_randomx_version="1.1.9"
+version=0.18.1.2
+revision=1
+_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
+_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
_quirc_gitrev="7e7ab596e4d0988faf1c12ae89c354b114181c40"
@@ -12,7 +12,7 @@ build_style=cmake
configure_args="-DVERSION_IS_RELEASE=true -DQt5_LRELEASE_EXECUTABLE=/usr/bin/lrelease"
hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-quickcontrols qt5-declarative-devel
qt5-svg-devel"
-makedepends="boost-devel libatomic-devel libunwind-devel miniupnpc-devel
+makedepends="boost-devel libunwind-devel miniupnpc-devel
qt5-declarative-devel readline-devel unbound-devel libsodium-devel hidapi-devel
qt5-svg-devel libgcrypt-devel zeromq-devel"
depends="qt5-graphicaleffects qt5-quickcontrols qt5-quickcontrols2 qt5-xmlpatterns"
@@ -22,17 +22,17 @@ license="BSD-3-Clause"
homepage="https://getmonero.org"
distfiles="https://github.com/monero-project/monero-gui/archive/v${version}.tar.gz
https://github.com/monero-project/monero/archive/v${_monero_version}.tar.gz>monero-${_monero_version}.tar.gz
- https://github.com/tevador/RandomX/archive/v${_randomx_version}.tar.gz
+ https://github.com/tevador/RandomX/archive/${_randomx_gitrev}.tar.gz
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
- b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5
+checksum="b5494830e917231aa7515992c69bcbb495f532fefde42530b265f9fd590e1702
+ f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
+ 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7
c8366aecb6ba48ec50a7e579a4fa18eb55c3c4be7d3efb2a83726157977f4ca6"
-skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz v${_randomx_version}.tar.gz
+skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz ${_randomx_gitrev}.tar.gz
${_quirc_gitrev}.tar.gz"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -60,7 +60,7 @@ post_extract() {
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/monero-${_monero_version}.tar.gz --strip-components 1 -C monero
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz --strip-components 1 -C monero/external/rapidjson
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_supercop_gitrev}.tar.gz --strip-components 1 -C monero/external/supercop
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_randomx_version}.tar.gz --strip-components 1 -C monero/external/randomx
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_randomx_gitrev}.tar.gz --strip-components 1 -C monero/external/randomx
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_quirc_gitrev}.tar.gz --strip-components 1 -C external/quirc
}
@@ -76,7 +76,8 @@ pre_configure() {
echo "var GUI_VERSION = \"${version}\"" > version.js
echo "var GUI_MONERO_VERSION = \"${version}\"" >> version.js
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- vsed -i monero/CMakeLists.txt -e '/include(version.cmake)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
+ vsed -i monero/CMakeLists.txt -e \
+ '/if(ANDROID)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
fi
}
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (15 preceding siblings ...)
2022-11-15 7:53 ` [PR PATCH] [Updated] " kevcrumb
@ 2022-11-16 0:33 ` kruceter
2022-11-16 15:04 ` kevcrumb
` (21 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kruceter @ 2022-11-16 0:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#issuecomment-1316084482
Comment:
I could build monero (and even monero-gui) with GCC 12.
Both of them work for me on x86_64-musl.
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (16 preceding siblings ...)
2022-11-16 0:33 ` kruceter
@ 2022-11-16 15:04 ` kevcrumb
2022-11-17 11:46 ` [PR REVIEW] " paper42
` (20 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-16 15:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New comment by kevcrumb on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#issuecomment-1317163824
Comment:
Great. It seems this package is ready for merge, @paper42.
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (17 preceding siblings ...)
2022-11-16 15:04 ` kevcrumb
@ 2022-11-17 11:46 ` paper42
2022-11-17 11:46 ` paper42
` (19 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: paper42 @ 2022-11-17 11:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 664 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1025085140
Comment:
```suggestion
https://github.com/tevador/RandomX/archive/${_randomx_gitrev}.tar.gz>randomx-${_randomx_gitrev}.tar.gz
https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz>rapidjson-${_rapidjson_gitrev}.tar.gz
https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz>supercop-${_supercop_gitrev}.tar.gz
https://github.com/dlbeer/quirc/archive/${_quirc_gitrev}.tar.gz>quirc-${_quirc_gitrev}.tar.gz"
```
and I would do the same in the monero package and for monero-gui.
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (18 preceding siblings ...)
2022-11-17 11:46 ` [PR REVIEW] " paper42
@ 2022-11-17 11:46 ` paper42
2022-11-17 11:46 ` paper42
` (18 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: paper42 @ 2022-11-17 11:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1025082789
Comment:
can we add a comment to both packages to keep them in sync?
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (19 preceding siblings ...)
2022-11-17 11:46 ` paper42
@ 2022-11-17 11:46 ` paper42
2022-11-17 11:46 ` paper42
` (17 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: paper42 @ 2022-11-17 11:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 306 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1025086795
Comment:
I think this should work and it's shorter
```suggestion
bsdtar xzf ${wrksrc}/${_randomx_gitrev}.tar.gz --strip-components 1 -C monero/external/randomx
```
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (20 preceding siblings ...)
2022-11-17 11:46 ` paper42
@ 2022-11-17 11:46 ` paper42
2022-11-17 16:33 ` kevcrumb
` (16 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: paper42 @ 2022-11-17 11:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1025083029
Comment:
this should always be the same as $version, no?
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (21 preceding siblings ...)
2022-11-17 11:46 ` paper42
@ 2022-11-17 16:33 ` kevcrumb
2022-11-17 16:38 ` kevcrumb
` (15 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-17 16:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 286 bytes --]
New review comment by kevcrumb on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1025426721
Comment:
It happens (quite frequently, actually) that GUI gets a point release while CLI doesn't. Makes sense, given the difference in complexity.
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (22 preceding siblings ...)
2022-11-17 16:33 ` kevcrumb
@ 2022-11-17 16:38 ` kevcrumb
2022-11-17 17:15 ` paper42
` (14 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-17 16:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 308 bytes --]
New review comment by kevcrumb on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1025431609
Comment:
Not sure what you mean here. https://github.com/Tencent/rapidjson/archive/rapidjson-129d19ba7f496df5e33658527a7158c79b99c21c.tar.gz would be a broken link/404?
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (23 preceding siblings ...)
2022-11-17 16:38 ` kevcrumb
@ 2022-11-17 17:15 ` paper42
2022-11-17 17:31 ` [PR PATCH] [Updated] " kevcrumb
` (13 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: paper42 @ 2022-11-17 17:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 630 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1025472593
Comment:
`URL>FILENAME` will download from URL and call the result FILENAME. the `monero` distfile in this package already does this. This is not usually necessary because sources are stored under hostdir/sources/$pkgname-$version/FILENAME, so clashes can only happen if a package has multiple distfiles that happen to have the same filename. This will not happen here, but it will be quite messy, so I suggested to use `rapidjson-${_rapidjson_gitrev}.tar.gz` instead of just `<hash>.tar.gz`
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR PATCH] [Updated] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (24 preceding siblings ...)
2022-11-17 17:15 ` paper42
@ 2022-11-17 17:31 ` kevcrumb
2022-11-17 18:44 ` [PR REVIEW] " paper42
` (12 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-17 17:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by kevcrumb against master on the void-packages repository
https://github.com/kevcrumb/void-packages monero18
https://github.com/void-linux/void-packages/pull/39721
monero: update to 0.18.1.2.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/39721.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-monero18-39721.patch --]
[-- Type: text/x-diff, Size: 12781 bytes --]
From e15cb31b698fe208a3c86c057d36453e21afc124 Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Tue, 4 Oct 2022 17:38:25 +0000
Subject: [PATCH 1/2] monero: update to 0.18.1.2.
---
srcpkgs/monero/files/monerod/log/run | 3 +
srcpkgs/monero/patches/system-miniupnpc.patch | 68 ++++++++++---------
srcpkgs/monero/template | 26 +++----
3 files changed, 52 insertions(+), 45 deletions(-)
create mode 100644 srcpkgs/monero/files/monerod/log/run
diff --git a/srcpkgs/monero/files/monerod/log/run b/srcpkgs/monero/files/monerod/log/run
new file mode 100644
index 000000000000..afcb02949c66
--- /dev/null
+++ b/srcpkgs/monero/files/monerod/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec logger -p daemon.notice -t monerod
diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch
index 3d9c8bb08bbc..6da9a92d491e 100644
--- a/srcpkgs/monero/patches/system-miniupnpc.patch
+++ b/srcpkgs/monero/patches/system-miniupnpc.patch
@@ -1,6 +1,9 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b05c087cf..4f1a20101 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -527,5 +527,13 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
+@@ -676,6 +676,14 @@ ExternalProject_Add(generate_translations_header
+ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
add_subdirectory(external)
+# Final setup for miniupnpc
@@ -12,38 +15,13 @@
+endif()
+
# Final setup for libunbound
- include_directories(${UNBOUND_INCLUDE})
- link_directories(${UNBOUND_LIBRARY_DIRS})
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 9b21705e..76340a22 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -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>
--#include <miniupnp/miniupnpc/upnperrors.h>
-+// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
-+#ifdef UPNP_STATIC
-+ #include <miniupnp/miniupnpc/miniupnpc.h>
-+ #include <miniupnp/miniupnpc/upnpcommands.h>
-+ #include <miniupnp/miniupnpc/upnperrors.h>
-+#else
-+ #include "miniupnpc.h"
-+ #include "upnpcommands.h"
-+ #include "upnperrors.h"
-+#endif
+ include_directories(${UNBOUND_INCLUDE_DIR})
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
---
-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 @@
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index 5b7f69a56..00ef3f43d 100644
+--- a/external/CMakeLists.txt
++++ b/external/CMakeLists.txt
+@@ -34,24 +34,47 @@
# 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 +32,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)
@@ -100,3 +80,27 @@ index 9b21705e..76340a22 100644
find_package(Unbound)
+diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
+index f33ce977d..87d23a1e1 100644
+--- a/src/p2p/net_node.inl
++++ b/src/p2p/net_node.inl
+@@ -60,9 +60,16 @@
+ #include "cryptonote_core/cryptonote_core.h"
+ #include "net/parse.h"
+
+-#include <miniupnp/miniupnpc/miniupnpc.h>
+-#include <miniupnp/miniupnpc/upnpcommands.h>
+-#include <miniupnp/miniupnpc/upnperrors.h>
++// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
++#ifdef UPNP_STATIC
++ #include <miniupnp/miniupnpc/miniupnpc.h>
++ #include <miniupnp/miniupnpc/upnpcommands.h>
++ #include <miniupnp/miniupnpc/upnperrors.h>
++#else
++ #include "miniupnpc.h"
++ #include "upnpcommands.h"
++ #include "upnperrors.h"
++#endif
+
+ #undef MONERO_DEFAULT_LOG_CATEGORY
+ #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index eebce3d0a551..ddc915299bcb 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,9 +1,9 @@
# Template file for 'monero'
pkgname=monero
-version=0.17.2.3
-revision=3
-_randomx_version="1.1.9"
+version=0.18.1.2
+revision=1
# the revision monero uses as a submodule for the specific version
+_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
build_style=cmake
@@ -16,18 +16,18 @@ makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
readline-devel unbound-devel miniupnpc-devel expat-devel
cppzmq czmq-devel libsodium-devel"
short_desc="Private, secure, untraceable, decentralised digital currency"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Kevin Crumb <kevcrumb@splitlinux.org>"
license="BSD-3-Clause"
homepage="https://getmonero.org"
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
- b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5
+ https://github.com/tevador/RandomX/archive/${_randomx_gitrev}.tar.gz>randomx-${_randomx_gitrev}.tar.gz
+ https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz>rapidjson-${_rapidjson_gitrev}.tar.gz
+ https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz>supercop-${_supercop_gitrev}.tar.gz"
+checksum="f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
+ 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7"
-skip_extraction="v${_randomx_version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz"
+skip_extraction="${_randomx_gitrev}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz"
system_accounts="monero"
case "$XBPS_TARGET_MACHINE" in
@@ -52,11 +52,11 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_randomx_version}.tar.gz \
+ bsdtar xzf ${wrksrc}/${_randomx_gitrev}.tar.gz \
--strip-components=1 -C ${wrksrc}/external/randomx
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz \
+ bsdtar xzf ${wrksrc}/${_rapidjson_gitrev}.tar.gz \
--strip-components=1 -C ${wrksrc}/external/rapidjson
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_supercop_gitrev}.tar.gz \
+ bsdtar xzf ${wrksrc}/${_supercop_gitrev}.tar.gz \
--strip-components=1 -C ${wrksrc}/external/supercop
}
From 8bb888ad70e08730d1addd4ba700f62b49b50874 Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Thu, 17 Nov 2022 17:30:28 +0000
Subject: [PATCH 2/2] monero-gui: update to 0.18.1.2.
---
srcpkgs/monero-gui/template | 41 +++++++++++++++++++------------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 61e5dd9da1b7..4912361c94dc 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,10 +1,10 @@
# Template file for 'monero-gui'
pkgname=monero-gui
-version=0.17.2.3
-revision=2
-_monero_version=0.17.2.3
-_randomx_version="1.1.9"
+version=0.18.1.2
+revision=1
+_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
+_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
_quirc_gitrev="7e7ab596e4d0988faf1c12ae89c354b114181c40"
@@ -12,27 +12,27 @@ build_style=cmake
configure_args="-DVERSION_IS_RELEASE=true -DQt5_LRELEASE_EXECUTABLE=/usr/bin/lrelease"
hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-quickcontrols qt5-declarative-devel
qt5-svg-devel"
-makedepends="boost-devel libatomic-devel libunwind-devel miniupnpc-devel
+makedepends="boost-devel libunwind-devel miniupnpc-devel
qt5-declarative-devel readline-devel unbound-devel libsodium-devel hidapi-devel
qt5-svg-devel libgcrypt-devel zeromq-devel"
depends="qt5-graphicaleffects qt5-quickcontrols qt5-quickcontrols2 qt5-xmlpatterns"
short_desc="GUI for the core Monero implementation"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Kevin Crumb <kevcrumb@splitlinux.org>"
license="BSD-3-Clause"
homepage="https://getmonero.org"
distfiles="https://github.com/monero-project/monero-gui/archive/v${version}.tar.gz
https://github.com/monero-project/monero/archive/v${_monero_version}.tar.gz>monero-${_monero_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
- https://github.com/dlbeer/quirc/archive/${_quirc_gitrev}.tar.gz"
-checksum="aeab35380282b0403be926b78d5249df2f97f9cbe36bb374ac39daf4f02bb349
- e4462f8909bdc5e66d76f4023374ff759159c15fe7d407f0c21619769e87c35d
- b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5
+ https://github.com/tevador/RandomX/archive/${_randomx_gitrev}.tar.gz>randomx-${_randomx_gitrev}.tar.gz
+ https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz>rapidjson-${_rapidjson_gitrev}.tar.gz
+ https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz>supercop-${_supercop_gitrev}.tar.gz
+ https://github.com/dlbeer/quirc/archive/${_quirc_gitrev}.tar.gz>quirc-${_quirc_gitrev}.tar.gz"
+checksum="b5494830e917231aa7515992c69bcbb495f532fefde42530b265f9fd590e1702
+ f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
+ 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7
c8366aecb6ba48ec50a7e579a4fa18eb55c3c4be7d3efb2a83726157977f4ca6"
-skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz v${_randomx_version}.tar.gz
+skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz ${_randomx_gitrev}.tar.gz
${_quirc_gitrev}.tar.gz"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,11 +57,11 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/monero-${_monero_version}.tar.gz --strip-components 1 -C monero
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz --strip-components 1 -C monero/external/rapidjson
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_supercop_gitrev}.tar.gz --strip-components 1 -C monero/external/supercop
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_randomx_version}.tar.gz --strip-components 1 -C monero/external/randomx
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_quirc_gitrev}.tar.gz --strip-components 1 -C external/quirc
+ bsdtar xzf ${wrksrc}/monero-${_monero_version}.tar.gz --strip-components 1 -C monero
+ bsdtar xzf ${wrksrc}/${_rapidjson_gitrev}.tar.gz --strip-components 1 -C monero/external/rapidjson
+ bsdtar xzf ${wrksrc}/${_supercop_gitrev}.tar.gz --strip-components 1 -C monero/external/supercop
+ bsdtar xzf ${wrksrc}/${_randomx_gitrev}.tar.gz --strip-components 1 -C monero/external/randomx
+ bsdtar xzf ${wrksrc}/${_quirc_gitrev}.tar.gz --strip-components 1 -C external/quirc
}
post_patch() {
@@ -76,7 +76,8 @@ pre_configure() {
echo "var GUI_VERSION = \"${version}\"" > version.js
echo "var GUI_MONERO_VERSION = \"${version}\"" >> version.js
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- vsed -i monero/CMakeLists.txt -e '/include(version.cmake)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
+ vsed -i monero/CMakeLists.txt -e \
+ '/if(ANDROID)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
fi
}
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (25 preceding siblings ...)
2022-11-17 17:31 ` [PR PATCH] [Updated] " kevcrumb
@ 2022-11-17 18:44 ` paper42
2022-11-17 19:43 ` kevcrumb
` (11 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: paper42 @ 2022-11-17 18:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1025570909
Comment:
this has to be adjusted now that the filenames are different
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (26 preceding siblings ...)
2022-11-17 18:44 ` [PR REVIEW] " paper42
@ 2022-11-17 19:43 ` kevcrumb
2022-11-17 19:45 ` kevcrumb
` (10 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-17 19:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
New review comment by kevcrumb on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1025631273
Comment:
At post_extract, there are two locations where the tarballs are availble:
/void-packages/hostdir/sources/monero-gui-0.18.1.2/rapidjson-129d19ba7f496df5e33658527a7158c79b99c21c.tar.gz
/host/sources/monero-gui-0.18.1.2/rapidjson-129d19ba7f496df5e33658527a7158c79b99c21c.tar.gz
`$wrksrc` is `/builddir/monero-gui-0.18.1.2`
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (27 preceding siblings ...)
2022-11-17 19:43 ` kevcrumb
@ 2022-11-17 19:45 ` kevcrumb
2022-11-17 21:16 ` [PR PATCH] [Updated] " kevcrumb
` (9 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-17 19:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 249 bytes --]
New review comment by kevcrumb on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1025634650
Comment:
Any argument against removing `skip_extract` and using `mv`'s instead of `bsdtar` in `post_extract`?
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR PATCH] [Updated] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (28 preceding siblings ...)
2022-11-17 19:45 ` kevcrumb
@ 2022-11-17 21:16 ` kevcrumb
2022-11-17 21:21 ` [PR REVIEW] " kruceter
` (8 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-17 21:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by kevcrumb against master on the void-packages repository
https://github.com/kevcrumb/void-packages monero18
https://github.com/void-linux/void-packages/pull/39721
monero: update to 0.18.1.2.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/39721.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-monero18-39721.patch --]
[-- Type: text/x-diff, Size: 12808 bytes --]
From 633587ec41d45a2644a1a18d7aafe54e9a9faf84 Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Tue, 4 Oct 2022 17:38:25 +0000
Subject: [PATCH 1/2] monero: update to 0.18.1.2.
---
srcpkgs/monero/files/monerod/log/run | 3 +
srcpkgs/monero/patches/system-miniupnpc.patch | 68 ++++++++++---------
srcpkgs/monero/template | 26 +++----
3 files changed, 52 insertions(+), 45 deletions(-)
create mode 100644 srcpkgs/monero/files/monerod/log/run
diff --git a/srcpkgs/monero/files/monerod/log/run b/srcpkgs/monero/files/monerod/log/run
new file mode 100644
index 000000000000..afcb02949c66
--- /dev/null
+++ b/srcpkgs/monero/files/monerod/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec logger -p daemon.notice -t monerod
diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch
index 3d9c8bb08bbc..6da9a92d491e 100644
--- a/srcpkgs/monero/patches/system-miniupnpc.patch
+++ b/srcpkgs/monero/patches/system-miniupnpc.patch
@@ -1,6 +1,9 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b05c087cf..4f1a20101 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -527,5 +527,13 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
+@@ -676,6 +676,14 @@ ExternalProject_Add(generate_translations_header
+ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
add_subdirectory(external)
+# Final setup for miniupnpc
@@ -12,38 +15,13 @@
+endif()
+
# Final setup for libunbound
- include_directories(${UNBOUND_INCLUDE})
- link_directories(${UNBOUND_LIBRARY_DIRS})
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 9b21705e..76340a22 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -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>
--#include <miniupnp/miniupnpc/upnperrors.h>
-+// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
-+#ifdef UPNP_STATIC
-+ #include <miniupnp/miniupnpc/miniupnpc.h>
-+ #include <miniupnp/miniupnpc/upnpcommands.h>
-+ #include <miniupnp/miniupnpc/upnperrors.h>
-+#else
-+ #include "miniupnpc.h"
-+ #include "upnpcommands.h"
-+ #include "upnperrors.h"
-+#endif
+ include_directories(${UNBOUND_INCLUDE_DIR})
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
---
-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 @@
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index 5b7f69a56..00ef3f43d 100644
+--- a/external/CMakeLists.txt
++++ b/external/CMakeLists.txt
+@@ -34,24 +34,47 @@
# 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 +32,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)
@@ -100,3 +80,27 @@ index 9b21705e..76340a22 100644
find_package(Unbound)
+diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
+index f33ce977d..87d23a1e1 100644
+--- a/src/p2p/net_node.inl
++++ b/src/p2p/net_node.inl
+@@ -60,9 +60,16 @@
+ #include "cryptonote_core/cryptonote_core.h"
+ #include "net/parse.h"
+
+-#include <miniupnp/miniupnpc/miniupnpc.h>
+-#include <miniupnp/miniupnpc/upnpcommands.h>
+-#include <miniupnp/miniupnpc/upnperrors.h>
++// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
++#ifdef UPNP_STATIC
++ #include <miniupnp/miniupnpc/miniupnpc.h>
++ #include <miniupnp/miniupnpc/upnpcommands.h>
++ #include <miniupnp/miniupnpc/upnperrors.h>
++#else
++ #include "miniupnpc.h"
++ #include "upnpcommands.h"
++ #include "upnperrors.h"
++#endif
+
+ #undef MONERO_DEFAULT_LOG_CATEGORY
+ #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index eebce3d0a551..e4e91537d2da 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,9 +1,9 @@
# Template file for 'monero'
pkgname=monero
-version=0.17.2.3
-revision=3
-_randomx_version="1.1.9"
+version=0.18.1.2
+revision=1
# the revision monero uses as a submodule for the specific version
+_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
build_style=cmake
@@ -16,18 +16,18 @@ makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
readline-devel unbound-devel miniupnpc-devel expat-devel
cppzmq czmq-devel libsodium-devel"
short_desc="Private, secure, untraceable, decentralised digital currency"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Kevin Crumb <kevcrumb@splitlinux.org>"
license="BSD-3-Clause"
homepage="https://getmonero.org"
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
- b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5
+ https://github.com/tevador/RandomX/archive/${_randomx_gitrev}.tar.gz>RandomX-${_randomx_gitrev}.tar.gz
+ https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz>rapidjson-${_rapidjson_gitrev}.tar.gz
+ https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz>supercop-${_supercop_gitrev}.tar.gz"
+checksum="f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
+ 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7"
-skip_extraction="v${_randomx_version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz"
+skip_extraction="RandomX-${_randomx_gitrev}.tar.gz rapidjson-${_rapidjson_gitrev}.tar.gz supercop-${_supercop_gitrev}.tar.gz"
system_accounts="monero"
case "$XBPS_TARGET_MACHINE" in
@@ -52,11 +52,11 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_randomx_version}.tar.gz \
+ bsdtar xzf ${wrksrc}/${_randomx_gitrev}.tar.gz \
--strip-components=1 -C ${wrksrc}/external/randomx
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz \
+ bsdtar xzf ${wrksrc}/${_rapidjson_gitrev}.tar.gz \
--strip-components=1 -C ${wrksrc}/external/rapidjson
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_supercop_gitrev}.tar.gz \
+ bsdtar xzf ${wrksrc}/${_supercop_gitrev}.tar.gz \
--strip-components=1 -C ${wrksrc}/external/supercop
}
From a746e26210cde7479d851ad8b444051f55f2226b Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Thu, 17 Nov 2022 21:16:07 +0000
Subject: [PATCH 2/2] monero-gui: update to 0.18.1.2.
---
srcpkgs/monero-gui/template | 38 ++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 61e5dd9da1b7..13f4c41d21a6 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,10 +1,10 @@
# Template file for 'monero-gui'
pkgname=monero-gui
-version=0.17.2.3
-revision=2
-_monero_version=0.17.2.3
-_randomx_version="1.1.9"
+version=0.18.1.2
+revision=1
+_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
+_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
_quirc_gitrev="7e7ab596e4d0988faf1c12ae89c354b114181c40"
@@ -12,7 +12,7 @@ build_style=cmake
configure_args="-DVERSION_IS_RELEASE=true -DQt5_LRELEASE_EXECUTABLE=/usr/bin/lrelease"
hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-quickcontrols qt5-declarative-devel
qt5-svg-devel"
-makedepends="boost-devel libatomic-devel libunwind-devel miniupnpc-devel
+makedepends="boost-devel libunwind-devel miniupnpc-devel
qt5-declarative-devel readline-devel unbound-devel libsodium-devel hidapi-devel
qt5-svg-devel libgcrypt-devel zeromq-devel"
depends="qt5-graphicaleffects qt5-quickcontrols qt5-quickcontrols2 qt5-xmlpatterns"
@@ -22,18 +22,17 @@ license="BSD-3-Clause"
homepage="https://getmonero.org"
distfiles="https://github.com/monero-project/monero-gui/archive/v${version}.tar.gz
https://github.com/monero-project/monero/archive/v${_monero_version}.tar.gz>monero-${_monero_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
- https://github.com/dlbeer/quirc/archive/${_quirc_gitrev}.tar.gz"
-checksum="aeab35380282b0403be926b78d5249df2f97f9cbe36bb374ac39daf4f02bb349
- e4462f8909bdc5e66d76f4023374ff759159c15fe7d407f0c21619769e87c35d
- b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5
+ https://github.com/tevador/RandomX/archive/${_randomx_gitrev}.tar.gz>RandomX-${_randomx_gitrev}.tar.gz
+ https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz>rapidjson-${_rapidjson_gitrev}.tar.gz
+ https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz>supercop-${_supercop_gitrev}.tar.gz
+ https://github.com/dlbeer/quirc/archive/${_quirc_gitrev}.tar.gz>quirc-${_quirc_gitrev}.tar.gz"
+checksum="b5494830e917231aa7515992c69bcbb495f532fefde42530b265f9fd590e1702
+ f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
+ 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7
c8366aecb6ba48ec50a7e579a4fa18eb55c3c4be7d3efb2a83726157977f4ca6"
-skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz v${_randomx_version}.tar.gz
- ${_quirc_gitrev}.tar.gz"
+skip_extraction="monero-${version}.tar.gz rapidjson-${_rapidjson_gitrev}.tar.gz supercop-${_supercop_gitrev}.tar.gz RandomX-${_randomx_gitrev}.tar.gz quirc-${_quirc_gitrev}.tar.gz"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
@@ -58,10 +57,10 @@ esac
post_extract() {
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/monero-${_monero_version}.tar.gz --strip-components 1 -C monero
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz --strip-components 1 -C monero/external/rapidjson
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_supercop_gitrev}.tar.gz --strip-components 1 -C monero/external/supercop
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_randomx_version}.tar.gz --strip-components 1 -C monero/external/randomx
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_quirc_gitrev}.tar.gz --strip-components 1 -C external/quirc
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/rapidjson-${_rapidjson_gitrev}.tar.gz --strip-components 1 -C monero/external/rapidjson
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/supercop-${_supercop_gitrev}.tar.gz --strip-components 1 -C monero/external/supercop
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/RandomX-${_randomx_gitrev}.tar.gz --strip-components 1 -C monero/external/randomx
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/quirc-${_quirc_gitrev}.tar.gz --strip-components 1 -C external/quirc
}
post_patch() {
@@ -76,7 +75,8 @@ pre_configure() {
echo "var GUI_VERSION = \"${version}\"" > version.js
echo "var GUI_MONERO_VERSION = \"${version}\"" >> version.js
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- vsed -i monero/CMakeLists.txt -e '/include(version.cmake)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
+ vsed -i monero/CMakeLists.txt -e \
+ '/if(ANDROID)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
fi
}
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (29 preceding siblings ...)
2022-11-17 21:16 ` [PR PATCH] [Updated] " kevcrumb
@ 2022-11-17 21:21 ` kruceter
2022-11-17 21:40 ` kevcrumb
` (7 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kruceter @ 2022-11-17 21:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1025744341
Comment:
> Any argument against removing `skip_extract` and using `mv`'s instead of `bsdtar` in `post_extract`?
I think there is no problem if you do just like you described.
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (30 preceding siblings ...)
2022-11-17 21:21 ` [PR REVIEW] " kruceter
@ 2022-11-17 21:40 ` kevcrumb
2022-11-17 21:46 ` [PR PATCH] [Updated] " kevcrumb
` (6 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-17 21:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 491 bytes --]
New review comment by kevcrumb on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1025759523
Comment:
Manual explains that if there are multiple distfiles unpacked, each gets another level of directory, so the monero source would go to `/builddir/monero-gui-0.18.1.2/monero-gui-0.18.1.2` instead of `/builddir/monero-gui-0.18.1.2`. I actually tried the `mv` variant, but due to that difference in behavior, the rest of the template became ugly.
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR PATCH] [Updated] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (31 preceding siblings ...)
2022-11-17 21:40 ` kevcrumb
@ 2022-11-17 21:46 ` kevcrumb
2022-11-18 10:40 ` [PR REVIEW] " kevcrumb
` (5 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-17 21:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by kevcrumb against master on the void-packages repository
https://github.com/kevcrumb/void-packages monero18
https://github.com/void-linux/void-packages/pull/39721
monero: update to 0.18.1.2.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/39721.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-monero18-39721.patch --]
[-- Type: text/x-diff, Size: 12928 bytes --]
From 76022b4324af65cd984d5d3bdb0fb514bc1a9d5e Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Tue, 4 Oct 2022 17:38:25 +0000
Subject: [PATCH 1/2] monero: update to 0.18.1.2.
---
srcpkgs/monero/files/monerod/log/run | 3 +
srcpkgs/monero/patches/system-miniupnpc.patch | 68 ++++++++++---------
srcpkgs/monero/template | 26 +++----
3 files changed, 52 insertions(+), 45 deletions(-)
create mode 100644 srcpkgs/monero/files/monerod/log/run
diff --git a/srcpkgs/monero/files/monerod/log/run b/srcpkgs/monero/files/monerod/log/run
new file mode 100644
index 000000000000..afcb02949c66
--- /dev/null
+++ b/srcpkgs/monero/files/monerod/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec logger -p daemon.notice -t monerod
diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch
index 3d9c8bb08bbc..6da9a92d491e 100644
--- a/srcpkgs/monero/patches/system-miniupnpc.patch
+++ b/srcpkgs/monero/patches/system-miniupnpc.patch
@@ -1,6 +1,9 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b05c087cf..4f1a20101 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -527,5 +527,13 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
+@@ -676,6 +676,14 @@ ExternalProject_Add(generate_translations_header
+ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
add_subdirectory(external)
+# Final setup for miniupnpc
@@ -12,38 +15,13 @@
+endif()
+
# Final setup for libunbound
- include_directories(${UNBOUND_INCLUDE})
- link_directories(${UNBOUND_LIBRARY_DIRS})
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 9b21705e..76340a22 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -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>
--#include <miniupnp/miniupnpc/upnperrors.h>
-+// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
-+#ifdef UPNP_STATIC
-+ #include <miniupnp/miniupnpc/miniupnpc.h>
-+ #include <miniupnp/miniupnpc/upnpcommands.h>
-+ #include <miniupnp/miniupnpc/upnperrors.h>
-+#else
-+ #include "miniupnpc.h"
-+ #include "upnpcommands.h"
-+ #include "upnperrors.h"
-+#endif
+ include_directories(${UNBOUND_INCLUDE_DIR})
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
---
-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 @@
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index 5b7f69a56..00ef3f43d 100644
+--- a/external/CMakeLists.txt
++++ b/external/CMakeLists.txt
+@@ -34,24 +34,47 @@
# 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 +32,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)
@@ -100,3 +80,27 @@ index 9b21705e..76340a22 100644
find_package(Unbound)
+diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
+index f33ce977d..87d23a1e1 100644
+--- a/src/p2p/net_node.inl
++++ b/src/p2p/net_node.inl
+@@ -60,9 +60,16 @@
+ #include "cryptonote_core/cryptonote_core.h"
+ #include "net/parse.h"
+
+-#include <miniupnp/miniupnpc/miniupnpc.h>
+-#include <miniupnp/miniupnpc/upnpcommands.h>
+-#include <miniupnp/miniupnpc/upnperrors.h>
++// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
++#ifdef UPNP_STATIC
++ #include <miniupnp/miniupnpc/miniupnpc.h>
++ #include <miniupnp/miniupnpc/upnpcommands.h>
++ #include <miniupnp/miniupnpc/upnperrors.h>
++#else
++ #include "miniupnpc.h"
++ #include "upnpcommands.h"
++ #include "upnperrors.h"
++#endif
+
+ #undef MONERO_DEFAULT_LOG_CATEGORY
+ #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index eebce3d0a551..89b398d29781 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,9 +1,9 @@
# Template file for 'monero'
pkgname=monero
-version=0.17.2.3
-revision=3
-_randomx_version="1.1.9"
+version=0.18.1.2
+revision=1
# the revision monero uses as a submodule for the specific version
+_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
build_style=cmake
@@ -16,18 +16,18 @@ makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
readline-devel unbound-devel miniupnpc-devel expat-devel
cppzmq czmq-devel libsodium-devel"
short_desc="Private, secure, untraceable, decentralised digital currency"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Kevin Crumb <kevcrumb@splitlinux.org>"
license="BSD-3-Clause"
homepage="https://getmonero.org"
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
- b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5
+ https://github.com/tevador/RandomX/archive/${_randomx_gitrev}.tar.gz>RandomX-${_randomx_gitrev}.tar.gz
+ https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz>rapidjson-${_rapidjson_gitrev}.tar.gz
+ https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz>supercop-${_supercop_gitrev}.tar.gz"
+checksum="f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
+ 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7"
-skip_extraction="v${_randomx_version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz"
+skip_extraction="RandomX-${_randomx_gitrev}.tar.gz rapidjson-${_rapidjson_gitrev}.tar.gz supercop-${_supercop_gitrev}.tar.gz"
system_accounts="monero"
case "$XBPS_TARGET_MACHINE" in
@@ -52,11 +52,11 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_randomx_version}.tar.gz \
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/RandomX-${_randomx_gitrev}.tar.gz \
--strip-components=1 -C ${wrksrc}/external/randomx
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz \
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/rapidjson-${_rapidjson_gitrev}.tar.gz \
--strip-components=1 -C ${wrksrc}/external/rapidjson
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_supercop_gitrev}.tar.gz \
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/supercop-${_supercop_gitrev}.tar.gz \
--strip-components=1 -C ${wrksrc}/external/supercop
}
From ef6d3d12f55c4e2eb9e83e72d4a9c439cd74ecc4 Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Thu, 17 Nov 2022 21:45:45 +0000
Subject: [PATCH 2/2] monero-gui: update to 0.18.1.2.
---
srcpkgs/monero-gui/template | 38 ++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 61e5dd9da1b7..13f4c41d21a6 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,10 +1,10 @@
# Template file for 'monero-gui'
pkgname=monero-gui
-version=0.17.2.3
-revision=2
-_monero_version=0.17.2.3
-_randomx_version="1.1.9"
+version=0.18.1.2
+revision=1
+_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
+_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
_quirc_gitrev="7e7ab596e4d0988faf1c12ae89c354b114181c40"
@@ -12,7 +12,7 @@ build_style=cmake
configure_args="-DVERSION_IS_RELEASE=true -DQt5_LRELEASE_EXECUTABLE=/usr/bin/lrelease"
hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-quickcontrols qt5-declarative-devel
qt5-svg-devel"
-makedepends="boost-devel libatomic-devel libunwind-devel miniupnpc-devel
+makedepends="boost-devel libunwind-devel miniupnpc-devel
qt5-declarative-devel readline-devel unbound-devel libsodium-devel hidapi-devel
qt5-svg-devel libgcrypt-devel zeromq-devel"
depends="qt5-graphicaleffects qt5-quickcontrols qt5-quickcontrols2 qt5-xmlpatterns"
@@ -22,18 +22,17 @@ license="BSD-3-Clause"
homepage="https://getmonero.org"
distfiles="https://github.com/monero-project/monero-gui/archive/v${version}.tar.gz
https://github.com/monero-project/monero/archive/v${_monero_version}.tar.gz>monero-${_monero_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
- https://github.com/dlbeer/quirc/archive/${_quirc_gitrev}.tar.gz"
-checksum="aeab35380282b0403be926b78d5249df2f97f9cbe36bb374ac39daf4f02bb349
- e4462f8909bdc5e66d76f4023374ff759159c15fe7d407f0c21619769e87c35d
- b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5
+ https://github.com/tevador/RandomX/archive/${_randomx_gitrev}.tar.gz>RandomX-${_randomx_gitrev}.tar.gz
+ https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz>rapidjson-${_rapidjson_gitrev}.tar.gz
+ https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz>supercop-${_supercop_gitrev}.tar.gz
+ https://github.com/dlbeer/quirc/archive/${_quirc_gitrev}.tar.gz>quirc-${_quirc_gitrev}.tar.gz"
+checksum="b5494830e917231aa7515992c69bcbb495f532fefde42530b265f9fd590e1702
+ f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
+ 4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7
c8366aecb6ba48ec50a7e579a4fa18eb55c3c4be7d3efb2a83726157977f4ca6"
-skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz v${_randomx_version}.tar.gz
- ${_quirc_gitrev}.tar.gz"
+skip_extraction="monero-${version}.tar.gz rapidjson-${_rapidjson_gitrev}.tar.gz supercop-${_supercop_gitrev}.tar.gz RandomX-${_randomx_gitrev}.tar.gz quirc-${_quirc_gitrev}.tar.gz"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
@@ -58,10 +57,10 @@ esac
post_extract() {
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/monero-${_monero_version}.tar.gz --strip-components 1 -C monero
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz --strip-components 1 -C monero/external/rapidjson
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_supercop_gitrev}.tar.gz --strip-components 1 -C monero/external/supercop
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_randomx_version}.tar.gz --strip-components 1 -C monero/external/randomx
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_quirc_gitrev}.tar.gz --strip-components 1 -C external/quirc
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/rapidjson-${_rapidjson_gitrev}.tar.gz --strip-components 1 -C monero/external/rapidjson
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/supercop-${_supercop_gitrev}.tar.gz --strip-components 1 -C monero/external/supercop
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/RandomX-${_randomx_gitrev}.tar.gz --strip-components 1 -C monero/external/randomx
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/quirc-${_quirc_gitrev}.tar.gz --strip-components 1 -C external/quirc
}
post_patch() {
@@ -76,7 +75,8 @@ pre_configure() {
echo "var GUI_VERSION = \"${version}\"" > version.js
echo "var GUI_MONERO_VERSION = \"${version}\"" >> version.js
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- vsed -i monero/CMakeLists.txt -e '/include(version.cmake)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
+ vsed -i monero/CMakeLists.txt -e \
+ '/if(ANDROID)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
fi
}
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (32 preceding siblings ...)
2022-11-17 21:46 ` [PR PATCH] [Updated] " kevcrumb
@ 2022-11-18 10:40 ` kevcrumb
2022-11-18 10:41 ` kevcrumb
` (4 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-18 10:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New review comment by kevcrumb on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1026277893
Comment:
(releases aren't always in sync - see other comment)
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (33 preceding siblings ...)
2022-11-18 10:40 ` [PR REVIEW] " kevcrumb
@ 2022-11-18 10:41 ` kevcrumb
2022-11-18 10:43 ` kevcrumb
` (3 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-18 10:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 199 bytes --]
New review comment by kevcrumb on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1026278661
Comment:
Understood and all occurances adapted accordingly.
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (34 preceding siblings ...)
2022-11-18 10:41 ` kevcrumb
@ 2022-11-18 10:43 ` kevcrumb
2022-11-18 10:43 ` kevcrumb
` (2 subsequent siblings)
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-18 10:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
New review comment by kevcrumb on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1026280875
Comment:
@paper42 I reverted this to the original path. Let me know if there's a better I'm unaware of.
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR REVIEW] monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (35 preceding siblings ...)
2022-11-18 10:43 ` kevcrumb
@ 2022-11-18 10:43 ` kevcrumb
2022-11-18 11:14 ` [PR PATCH] [Merged]: " paper42
2022-12-21 19:13 ` kruceter
38 siblings, 0 replies; 40+ messages in thread
From: kevcrumb @ 2022-11-18 10:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New review comment by kevcrumb on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#discussion_r1026280875
Comment:
@paper42 I reverted this to the original path. Let me know if there's a better way I'm unaware of.
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PR PATCH] [Merged]: monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (36 preceding siblings ...)
2022-11-18 10:43 ` kevcrumb
@ 2022-11-18 11:14 ` paper42
2022-12-21 19:13 ` kruceter
38 siblings, 0 replies; 40+ messages in thread
From: paper42 @ 2022-11-18 11:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 330 bytes --]
There's a merged pull request on the void-packages repository
monero: update to 0.18.1.2.
https://github.com/void-linux/void-packages/pull/39721
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: monero: update to 0.18.1.2.
2022-10-04 19:36 [PR PATCH] monero: update to 0.18.1.2 kevcrumb
` (37 preceding siblings ...)
2022-11-18 11:14 ` [PR PATCH] [Merged]: " paper42
@ 2022-12-21 19:13 ` kruceter
38 siblings, 0 replies; 40+ messages in thread
From: kruceter @ 2022-12-21 19:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 545 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#issuecomment-1314519388
Comment:
> Regardless, the CI is failing on other archs.
I noticed armv6l-musl only. There is a condition for including libatomic into `monero/CMakeLists.txt` provided that the line containing `include(version.cmake)` exists, yet it does not.
As for why it did not happen with monero is because `sed` was used instead of `vsed`. ~While I look for solutions, please replace `sed` with `vsed` on your side.~
^ permalink raw reply [flat|nested] 40+ messages in thread