From unknown Sun Jun 15 08:52:48 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36259] [PATCH 2/2] gnu: monero-gui: Update to 0.14.1.0. Resent-From: Guillaume LE VAILLANT Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Jun 2019 08:46:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 36259 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36259@debbugs.gnu.org Cc: Guillaume LE VAILLANT X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156076114710429 (code B ref -1); Mon, 17 Jun 2019 08:46:03 +0000 Received: (at submit) by debbugs.gnu.org; 17 Jun 2019 08:45:47 +0000 Received: from localhost ([127.0.0.1]:41926 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hcnGs-0002i8-HU for submit@debbugs.gnu.org; Mon, 17 Jun 2019 04:45:47 -0400 Received: from lists.gnu.org ([209.51.188.17]:52047) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hcnGq-0002hz-SI for submit@debbugs.gnu.org; Mon, 17 Jun 2019 04:45:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46888) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcnGo-0008GK-VS for guix-patches@gnu.org; Mon, 17 Jun 2019 04:45:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hcnGn-0005t7-Je for guix-patches@gnu.org; Mon, 17 Jun 2019 04:45:42 -0400 Received: from mout02.posteo.de ([185.67.36.66]:58239) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hcnGn-0005qU-B7 for guix-patches@gnu.org; Mon, 17 Jun 2019 04:45:41 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 615052400FC for ; Mon, 17 Jun 2019 10:45:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1560761138; bh=KP+spjAToT5pa57NeRuPjuXVfmOuNc1XPRaK3ffS0Yo=; h=From:To:Cc:Subject:Date:From; b=BHwXmAIKLoohTeBSYtGi7YlUA6SrBo+xQPElNdb3Oz6x1Co1PpMAo6F4cz8etaM5E VJVQ7tL+DjuY7DYkjJmU5m6qi9L86YFS5EAp+vNXTYg2a5FczaXs8VHouJg4OoONaE kxvZDFWh4UuirDZAePTQdsQBrp3UenR943dS9go/+yKfnowLijKP+FjhT7raixGzcs TM2GuyzTPCn3Zb1GpU8Uy3VAUS8PMiHdbYosls3VcgW772x1B0kaelNjsqSsyb9BIZ Ajg1GC9qOQYeCsgGh5gFZzCeKUDfHomYffjn8RtuUCVRf8WII6xDdPgdYTK4Bf1fHU kbqDQmgFoeqkg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 45S4YF59rrz9rxb; Mon, 17 Jun 2019 10:45:37 +0200 (CEST) From: Guillaume LE VAILLANT Date: Mon, 17 Jun 2019 10:44:36 +0200 Message-Id: <20190617084436.12311-2-glv@posteo.net> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190617084436.12311-1-glv@posteo.net> References: <20190617084436.12311-1-glv@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 185.67.36.66 X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/finance.scm (monero-gui): Update to 0.14.1.0. --- gnu/packages/finance.scm | 96 +++++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 41 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 50a96183f7..4e04916116 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -534,37 +534,48 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.12.2.0") + (version "0.14.1.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/monero-project/monero-gui") + (url "https://github.com/monero-project/monero-gui.git") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1cnrkwh7kp64lnzz1xfmkf1mhsgm5gls292gpqai3jr8jydpkahl")))) + "1ikr8g7vkbsf2251dzaivi0cla2yi3d8b7v0pih3410yrqsq2jka")))) (build-system gnu-build-system) (native-inputs - `(("doxygen" ,doxygen) - ("graphviz" ,graphviz) - ("pkg-config" ,pkg-config) + `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs `(("boost" ,boost) + ("hidapi" ,hidapi) ("libunwind" ,libunwind) + ("libsodium" ,libsodium) ("openssl" ,openssl) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtlocation" ,qtlocation) + ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols" ,qtquickcontrols) - ("readline" ,readline) + ("qtquickcontrols2",qtquickcontrols2) + ("qtsvg" ,qtsvg) + ("qtwebchannel" ,qtwebchannel) + ("qtx11extras" ,qtx11extras) + ("qtxmlpatterns" ,qtxmlpatterns) ("unbound" ,unbound))) (propagated-inputs `(("monero" ,monero))) (arguments - `(#:phases + `(#:modules ((guix build gnu-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build qt-utils)) + #:phases (modify-phases %standard-phases (delete 'configure) (delete 'check) @@ -576,32 +587,45 @@ the Monero command line client and daemon.") (add-after 'fix-makefile-vars 'fix-library-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "monero-wallet-gui.pro" - (("-L/usr/local/lib") "") + (("-L/usr/local/lib") + "") (("-L/usr/local/opt/openssl/lib") - (string-append "-L" - (assoc-ref inputs "openssl") - "/lib")) + (string-append "-L" (assoc-ref inputs "openssl") "/lib")= ) (("-L/usr/local/opt/boost/lib") - (string-append "-L" - (assoc-ref inputs "boost") - "/lib"))) + (string-append "-L" (assoc-ref inputs "boost") "/lib"))) #t)) (add-after 'fix-library-paths 'fix-monerod-path (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/daemon/DaemonManager.cpp" (("QApplication::applicationDirPath\\(\\) \\+ \"/monerod"= ) - (string-append "\""(assoc-ref inputs "monero") + (string-append "\"" (assoc-ref inputs "monero") "/bin/monerod"))) #t)) (add-after 'fix-monerod-path 'fix-qt-paths (lambda* (#:key inputs #:allow-other-keys) - (let* ((qttools (assoc-ref inputs "qttools")) - (lrelease (string-append qttools "/bin/lrelease")) - (lupdate (string-append qttools "/bin/lupdate"))) - (substitute* "monero-wallet-gui.pro" - (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") lrelease) - (("\\$\\$\\[QT_INSTALL_BINS\\]/lupdate") lupdate)) - #t))) + (substitute* "monero-wallet-gui.pro" + (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") + (string-append (assoc-ref inputs "qttools") "/bin/lrelea= se")) + (("\\$\\$\\[QT_INSTALL_BINS\\]/lupdate") + (string-append (assoc-ref inputs "qttools") "/bin/lupdat= e"))) + #t)) + (add-after 'fix-qt-paths 'make-qt-deterministic + (lambda _ + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") + #t)) + (add-after 'make-qt-deterministic 'fix-version + (lambda _ + (substitute* "build.sh" + (("echo .*> version.js") + "")) + (with-output-to-file "version.js" + (lambda _ + (format #t + "var GUI_VERSION =3D \"~a\"~@ + var GUI_MONERO_VERSION =3D \"~a\"~%" + ,version + ,(package-version monero)))) + #t)) (replace 'build (lambda _ (invoke "./build.sh"))) @@ -613,28 +637,18 @@ the Monero command line client and daemon.") #t)) (add-before 'install 'change-dir (lambda _ - (chdir "build"))) - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) + (chdir "build") + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/monero-wallet-gui"= ) - `("QT_PLUGIN_PATH" ":" prefix - ,(map (lambda (label) - (string-append (assoc-ref inputs label) - "/lib/qt5/plugins")) - '("qtbase" "qtdeclarative"))) - `("QML2_IMPORT_PATH" ":" prefix - ,(map (lambda (label) - (string-append (assoc-ref inputs label) - "/lib/qt5/qml")) - '("qtdeclarative" "qtgraphicaleffects" - "qtquickcontrols")))) - #t)))))) + (wrap-qt-program out "monero-wallet-gui")) + #t))))) (home-page "https://getmonero.org/") (synopsis "Graphical user interface for the Monero currency") (description - "Monero is a secure, private, untraceable currency. This package p= rovides the -Monero GUI client.") + "Monero is a secure, private, untraceable currency. This package p= rovides +the Monero GUI client.") (license license:bsd-3))) =20 (define-public monero-core --=20 2.22.0 From unknown Sun Jun 15 08:52:48 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36259] [PATCH 2/2] gnu: monero-gui: Update to 0.14.1.0. Resent-From: Guillaume LE VAILLANT Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jun 2019 12:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36259 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36259@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156155093710666 (code B ref -1); Wed, 26 Jun 2019 12:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Jun 2019 12:08:57 +0000 Received: from localhost ([127.0.0.1]:34429 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hg6jR-0002ly-2V for submit@debbugs.gnu.org; Wed, 26 Jun 2019 08:08:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:40812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hg6jL-0002lm-Vt for submit@debbugs.gnu.org; Wed, 26 Jun 2019 08:08:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48831) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hg6jJ-00037z-Ov for guix-patches@gnu.org; Wed, 26 Jun 2019 08:08:51 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hg6jH-0001ZZ-SR for guix-patches@gnu.org; Wed, 26 Jun 2019 08:08:49 -0400 Received: from mout02.posteo.de ([185.67.36.66]:38143) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hg6jH-0001Rj-7t for guix-patches@gnu.org; Wed, 26 Jun 2019 08:08:47 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 2CC9C2400FB for ; Wed, 26 Jun 2019 14:08:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1561550924; bh=oct2o1+Aq5jVrRX0CbJPC5tzgSxoqb1L5GoQ1O7QXOo=; h=From:To:Subject:Date:From; b=MAdCLE/EsMAs2IcyHHtTljWw6p5ag/7ozW4gHnnguu6jx+nc9JUJ8GTeosJZrs0MB wKCQti8lO5wv6FDA5HQzwDmeIeiH1MtuooozcpA6kT4rVyYQKTZBvLNHReejXLDXDD K89lzatFi2du0ERXJdHt4JRt+piXFRms3ku2vXtVaQp9gaQTG9EBST2JcaVtCEbsEm YfaRQRFi+GRTm6k9MC7wO86xJK9DnnurCdprZJdnbA4Mg3dijwcq0rA22AThKpUka3 85+piq/zh8ytqiDAkeMADH/tsKovhpLXNIt5p5CL/29cAza60tpKvn3VncmDykKqOa GB/AjyYYup26A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 45YhdQ5R9xz9rxP for ; Wed, 26 Jun 2019 14:08:42 +0200 (CEST) References: <20190617084436.12311-1-glv@posteo.net> <20190617084436.12311-2-glv@posteo.net> User-agent: mu4e 1.2.0; emacs 26.2 From: Guillaume LE VAILLANT In-reply-to: <20190617084436.12311-2-glv@posteo.net> Date: Wed, 26 Jun 2019 14:08:41 +0200 Message-ID: <87zhm4wnue.fsf@yamatai> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 185.67.36.66 X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-=-= Content-Type: text/plain Upstream modified the v0.14.1.0 tag for monero-gui; updated patch with the new sources' hash attached. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-gnu-monero-gui-Update-to-0.14.1.0.patch Content-Description: 0002-gnu-monero-gui-Update-to-0.14.1.0.patch >From 921b431c80e5647871b9378d15c73979fd2150b0 Mon Sep 17 00:00:00 2001 From: Guillaume LE VAILLANT Date: Sat, 15 Jun 2019 10:33:41 +0200 Subject: [PATCH 2/2] gnu: monero-gui: Update to 0.14.1.0. * gnu/packages/finance.scm (monero-gui): Update to 0.14.1.0. --- gnu/packages/finance.scm | 96 +++++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 41 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 7cdb41b372..97f9942a33 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -535,37 +535,48 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.12.2.0") + (version "0.14.1.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/monero-project/monero-gui") + (url "https://github.com/monero-project/monero-gui.git") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1cnrkwh7kp64lnzz1xfmkf1mhsgm5gls292gpqai3jr8jydpkahl")))) + "0ilx47771faygf97wilm64xnqxgxa3b43q0g9v014npk0qj8pc31")))) (build-system gnu-build-system) (native-inputs - `(("doxygen" ,doxygen) - ("graphviz" ,graphviz) - ("pkg-config" ,pkg-config) + `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs `(("boost" ,boost) + ("hidapi" ,hidapi) ("libunwind" ,libunwind) + ("libsodium" ,libsodium) ("openssl" ,openssl) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtlocation" ,qtlocation) + ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols" ,qtquickcontrols) - ("readline" ,readline) + ("qtquickcontrols2",qtquickcontrols2) + ("qtsvg" ,qtsvg) + ("qtwebchannel" ,qtwebchannel) + ("qtx11extras" ,qtx11extras) + ("qtxmlpatterns" ,qtxmlpatterns) ("unbound" ,unbound))) (propagated-inputs `(("monero" ,monero))) (arguments - `(#:phases + `(#:modules ((guix build gnu-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build qt-utils)) + #:phases (modify-phases %standard-phases (delete 'configure) (delete 'check) @@ -577,32 +588,45 @@ the Monero command line client and daemon.") (add-after 'fix-makefile-vars 'fix-library-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "monero-wallet-gui.pro" - (("-L/usr/local/lib") "") + (("-L/usr/local/lib") + "") (("-L/usr/local/opt/openssl/lib") - (string-append "-L" - (assoc-ref inputs "openssl") - "/lib")) + (string-append "-L" (assoc-ref inputs "openssl") "/lib")) (("-L/usr/local/opt/boost/lib") - (string-append "-L" - (assoc-ref inputs "boost") - "/lib"))) + (string-append "-L" (assoc-ref inputs "boost") "/lib"))) #t)) (add-after 'fix-library-paths 'fix-monerod-path (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/daemon/DaemonManager.cpp" (("QApplication::applicationDirPath\\(\\) \\+ \"/monerod") - (string-append "\""(assoc-ref inputs "monero") + (string-append "\"" (assoc-ref inputs "monero") "/bin/monerod"))) #t)) (add-after 'fix-monerod-path 'fix-qt-paths (lambda* (#:key inputs #:allow-other-keys) - (let* ((qttools (assoc-ref inputs "qttools")) - (lrelease (string-append qttools "/bin/lrelease")) - (lupdate (string-append qttools "/bin/lupdate"))) - (substitute* "monero-wallet-gui.pro" - (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") lrelease) - (("\\$\\$\\[QT_INSTALL_BINS\\]/lupdate") lupdate)) - #t))) + (substitute* "monero-wallet-gui.pro" + (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") + (string-append (assoc-ref inputs "qttools") "/bin/lrelease")) + (("\\$\\$\\[QT_INSTALL_BINS\\]/lupdate") + (string-append (assoc-ref inputs "qttools") "/bin/lupdate"))) + #t)) + (add-after 'fix-qt-paths 'make-qt-deterministic + (lambda _ + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") + #t)) + (add-after 'make-qt-deterministic 'fix-version + (lambda _ + (substitute* "build.sh" + (("echo .*> version.js") + "")) + (with-output-to-file "version.js" + (lambda _ + (format #t + "var GUI_VERSION = \"~a\"~@ + var GUI_MONERO_VERSION = \"~a\"~%" + ,version + ,(package-version monero)))) + #t)) (replace 'build (lambda _ (invoke "./build.sh"))) @@ -614,28 +638,18 @@ the Monero command line client and daemon.") #t)) (add-before 'install 'change-dir (lambda _ - (chdir "build"))) - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) + (chdir "build") + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/monero-wallet-gui") - `("QT_PLUGIN_PATH" ":" prefix - ,(map (lambda (label) - (string-append (assoc-ref inputs label) - "/lib/qt5/plugins")) - '("qtbase" "qtdeclarative"))) - `("QML2_IMPORT_PATH" ":" prefix - ,(map (lambda (label) - (string-append (assoc-ref inputs label) - "/lib/qt5/qml")) - '("qtdeclarative" "qtgraphicaleffects" - "qtquickcontrols")))) - #t)))))) + (wrap-qt-program out "monero-wallet-gui")) + #t))))) (home-page "https://getmonero.org/") (synopsis "Graphical user interface for the Monero currency") (description - "Monero is a secure, private, untraceable currency. This package provides the -Monero GUI client.") + "Monero is a secure, private, untraceable currency. This package provides +the Monero GUI client.") (license license:bsd-3))) (define-public monero-core -- 2.22.0 --=-=-=-- From unknown Sun Jun 15 08:52:48 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36259] [PATCH 2/2] gnu: monero-gui: Update to 0.14.1.0. Resent-From: swedebugia Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jun 2019 22:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36259 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36259@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156158973729310 (code B ref -1); Wed, 26 Jun 2019 22:56:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Jun 2019 22:55:37 +0000 Received: from localhost ([127.0.0.1]:37161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hgGpF-0007cg-7a for submit@debbugs.gnu.org; Wed, 26 Jun 2019 18:55:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:52264) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hgGpC-0007cX-NT for submit@debbugs.gnu.org; Wed, 26 Jun 2019 18:55:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45813) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgGpB-0004Km-Kb for guix-patches@gnu.org; Wed, 26 Jun 2019 18:55:34 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hgGpA-00005Y-Qd for guix-patches@gnu.org; Wed, 26 Jun 2019 18:55:33 -0400 Received: from mx1.riseup.net ([198.252.153.129]:34122) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hgGpA-0008WG-Em for guix-patches@gnu.org; Wed, 26 Jun 2019 18:55:32 -0400 Received: from capuchin.riseup.net (capuchin-pn.riseup.net [10.0.1.176]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id 23EDF1A340F for ; Wed, 26 Jun 2019 15:55:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1561589731; bh=WdLjRXnefXwVyMPxD6kExONgz8Xkl8XS6xpq+BbZwNM=; h=Subject:To:References:From:Date:In-Reply-To:From; b=XzA3fv0FSQBVESgrH/yj+U/yMvogPwaw3GgpVjC7zdYwpi79qv36wrt3FLloMZUpt XiK2KRmBBR48FWitWl94r6hs9gFgViSg1RQLArgikWvhZRU/rlYst1grZGhXP14YcF JGVECEr12YuqHJfjmBxFZ7em+8NjaPz/NILLM0X0= X-Riseup-User-ID: 4F31E043C5BC475F4BA8A099CF445C2CA1AE48E9C41547F12AD9EE4641200D36 Received: from [127.0.0.1] (localhost [127.0.0.1]) by capuchin.riseup.net (Postfix) with ESMTPSA id D80FE1202C3 for ; Wed, 26 Jun 2019 15:55:29 -0700 (PDT) References: <20190617084436.12311-1-glv@posteo.net> <20190617084436.12311-2-glv@posteo.net> <87zhm4wnue.fsf@yamatai> From: swedebugia Message-ID: <02fe7616-936c-49d8-e6aa-8e5671cd047c@riseup.net> Date: Thu, 27 Jun 2019 00:55:19 +0200 MIME-Version: 1.0 In-Reply-To: <87zhm4wnue.fsf@yamatai> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 198.252.153.129 X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) On 2019-06-26 14:08, Guillaume LE VAILLANT wrote: > > Upstream modified the v0.14.1.0 tag for monero-gui; updated patch with > the new sources' hash attached. > Isn't this a bad sign (for us)? I see no stable tarball. Actually 0.14.1 seems to be a development version as it is not marked release on the page. -- Cheers Swedebugia From unknown Sun Jun 15 08:52:48 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Guillaume LE VAILLANT Subject: bug#36259: closed (Re: [bug#36259] [PATCH 2/2] gnu: monero-gui: Update to 0.14.1.0.) Message-ID: References: <87wogz2zz3.fsf@gnu.org> <20190617084436.12311-2-glv@posteo.net> X-Gnu-PR-Message: they-closed 36259 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 36259@debbugs.gnu.org Date: Wed, 03 Jul 2019 10:08:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1562148482-26098-1" This is a multi-part message in MIME format... ------------=_1562148482-26098-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #36259: [PATCH 2/2] gnu: monero-gui: Update to 0.14.1.0. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 36259@debbugs.gnu.org. --=20 36259: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D36259 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1562148482-26098-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 36259-done) by debbugs.gnu.org; 3 Jul 2019 10:07:39 +0000 Received: from localhost ([127.0.0.1]:48413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hicAt-0006mL-8M for submit@debbugs.gnu.org; Wed, 03 Jul 2019 06:07:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hicAr-0006m7-MR for 36259-done@debbugs.gnu.org; Wed, 03 Jul 2019 06:07:38 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:37873) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hicAm-00047T-By; Wed, 03 Jul 2019 06:07:32 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=35234 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1hicAk-0004lR-9s; Wed, 03 Jul 2019 06:07:32 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Guillaume LE VAILLANT Subject: Re: [bug#36259] [PATCH 2/2] gnu: monero-gui: Update to 0.14.1.0. References: <20190617084436.12311-1-glv@posteo.net> <20190617084436.12311-2-glv@posteo.net> <87zhm4wnue.fsf@yamatai> Date: Wed, 03 Jul 2019 12:07:28 +0200 In-Reply-To: <87zhm4wnue.fsf@yamatai> (Guillaume LE VAILLANT's message of "Wed, 26 Jun 2019 14:08:41 +0200") Message-ID: <87wogz2zz3.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 36259-done Cc: 36259-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Guillaume LE VAILLANT skribis: >>>From 921b431c80e5647871b9378d15c73979fd2150b0 Mon Sep 17 00:00:00 2001 > From: Guillaume LE VAILLANT > Date: Sat, 15 Jun 2019 10:33:41 +0200 > Subject: [PATCH 2/2] gnu: monero-gui: Update to 0.14.1.0. > > * gnu/packages/finance.scm (monero-gui): Update to 0.14.1.0. Applied, thanks! Ludo=E2=80=99. ------------=_1562148482-26098-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 17 Jun 2019 08:45:47 +0000 Received: from localhost ([127.0.0.1]:41926 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hcnGs-0002i8-HU for submit@debbugs.gnu.org; Mon, 17 Jun 2019 04:45:47 -0400 Received: from lists.gnu.org ([209.51.188.17]:52047) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hcnGq-0002hz-SI for submit@debbugs.gnu.org; Mon, 17 Jun 2019 04:45:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46888) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcnGo-0008GK-VS for guix-patches@gnu.org; Mon, 17 Jun 2019 04:45:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hcnGn-0005t7-Je for guix-patches@gnu.org; Mon, 17 Jun 2019 04:45:42 -0400 Received: from mout02.posteo.de ([185.67.36.66]:58239) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hcnGn-0005qU-B7 for guix-patches@gnu.org; Mon, 17 Jun 2019 04:45:41 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 615052400FC for ; Mon, 17 Jun 2019 10:45:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1560761138; bh=KP+spjAToT5pa57NeRuPjuXVfmOuNc1XPRaK3ffS0Yo=; h=From:To:Cc:Subject:Date:From; b=BHwXmAIKLoohTeBSYtGi7YlUA6SrBo+xQPElNdb3Oz6x1Co1PpMAo6F4cz8etaM5E VJVQ7tL+DjuY7DYkjJmU5m6qi9L86YFS5EAp+vNXTYg2a5FczaXs8VHouJg4OoONaE kxvZDFWh4UuirDZAePTQdsQBrp3UenR943dS9go/+yKfnowLijKP+FjhT7raixGzcs TM2GuyzTPCn3Zb1GpU8Uy3VAUS8PMiHdbYosls3VcgW772x1B0kaelNjsqSsyb9BIZ Ajg1GC9qOQYeCsgGh5gFZzCeKUDfHomYffjn8RtuUCVRf8WII6xDdPgdYTK4Bf1fHU kbqDQmgFoeqkg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 45S4YF59rrz9rxb; Mon, 17 Jun 2019 10:45:37 +0200 (CEST) From: Guillaume LE VAILLANT To: guix-patches@gnu.org Subject: [PATCH 2/2] gnu: monero-gui: Update to 0.14.1.0. Date: Mon, 17 Jun 2019 10:44:36 +0200 Message-Id: <20190617084436.12311-2-glv@posteo.net> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190617084436.12311-1-glv@posteo.net> References: <20190617084436.12311-1-glv@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 185.67.36.66 X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Guillaume LE VAILLANT X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/finance.scm (monero-gui): Update to 0.14.1.0. --- gnu/packages/finance.scm | 96 +++++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 41 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 50a96183f7..4e04916116 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -534,37 +534,48 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.12.2.0") + (version "0.14.1.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/monero-project/monero-gui") + (url "https://github.com/monero-project/monero-gui.git") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1cnrkwh7kp64lnzz1xfmkf1mhsgm5gls292gpqai3jr8jydpkahl")))) + "1ikr8g7vkbsf2251dzaivi0cla2yi3d8b7v0pih3410yrqsq2jka")))) (build-system gnu-build-system) (native-inputs - `(("doxygen" ,doxygen) - ("graphviz" ,graphviz) - ("pkg-config" ,pkg-config) + `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs `(("boost" ,boost) + ("hidapi" ,hidapi) ("libunwind" ,libunwind) + ("libsodium" ,libsodium) ("openssl" ,openssl) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtlocation" ,qtlocation) + ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols" ,qtquickcontrols) - ("readline" ,readline) + ("qtquickcontrols2",qtquickcontrols2) + ("qtsvg" ,qtsvg) + ("qtwebchannel" ,qtwebchannel) + ("qtx11extras" ,qtx11extras) + ("qtxmlpatterns" ,qtxmlpatterns) ("unbound" ,unbound))) (propagated-inputs `(("monero" ,monero))) (arguments - `(#:phases + `(#:modules ((guix build gnu-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build qt-utils)) + #:phases (modify-phases %standard-phases (delete 'configure) (delete 'check) @@ -576,32 +587,45 @@ the Monero command line client and daemon.") (add-after 'fix-makefile-vars 'fix-library-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "monero-wallet-gui.pro" - (("-L/usr/local/lib") "") + (("-L/usr/local/lib") + "") (("-L/usr/local/opt/openssl/lib") - (string-append "-L" - (assoc-ref inputs "openssl") - "/lib")) + (string-append "-L" (assoc-ref inputs "openssl") "/lib")= ) (("-L/usr/local/opt/boost/lib") - (string-append "-L" - (assoc-ref inputs "boost") - "/lib"))) + (string-append "-L" (assoc-ref inputs "boost") "/lib"))) #t)) (add-after 'fix-library-paths 'fix-monerod-path (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/daemon/DaemonManager.cpp" (("QApplication::applicationDirPath\\(\\) \\+ \"/monerod"= ) - (string-append "\""(assoc-ref inputs "monero") + (string-append "\"" (assoc-ref inputs "monero") "/bin/monerod"))) #t)) (add-after 'fix-monerod-path 'fix-qt-paths (lambda* (#:key inputs #:allow-other-keys) - (let* ((qttools (assoc-ref inputs "qttools")) - (lrelease (string-append qttools "/bin/lrelease")) - (lupdate (string-append qttools "/bin/lupdate"))) - (substitute* "monero-wallet-gui.pro" - (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") lrelease) - (("\\$\\$\\[QT_INSTALL_BINS\\]/lupdate") lupdate)) - #t))) + (substitute* "monero-wallet-gui.pro" + (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") + (string-append (assoc-ref inputs "qttools") "/bin/lrelea= se")) + (("\\$\\$\\[QT_INSTALL_BINS\\]/lupdate") + (string-append (assoc-ref inputs "qttools") "/bin/lupdat= e"))) + #t)) + (add-after 'fix-qt-paths 'make-qt-deterministic + (lambda _ + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") + #t)) + (add-after 'make-qt-deterministic 'fix-version + (lambda _ + (substitute* "build.sh" + (("echo .*> version.js") + "")) + (with-output-to-file "version.js" + (lambda _ + (format #t + "var GUI_VERSION =3D \"~a\"~@ + var GUI_MONERO_VERSION =3D \"~a\"~%" + ,version + ,(package-version monero)))) + #t)) (replace 'build (lambda _ (invoke "./build.sh"))) @@ -613,28 +637,18 @@ the Monero command line client and daemon.") #t)) (add-before 'install 'change-dir (lambda _ - (chdir "build"))) - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) + (chdir "build") + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/monero-wallet-gui"= ) - `("QT_PLUGIN_PATH" ":" prefix - ,(map (lambda (label) - (string-append (assoc-ref inputs label) - "/lib/qt5/plugins")) - '("qtbase" "qtdeclarative"))) - `("QML2_IMPORT_PATH" ":" prefix - ,(map (lambda (label) - (string-append (assoc-ref inputs label) - "/lib/qt5/qml")) - '("qtdeclarative" "qtgraphicaleffects" - "qtquickcontrols")))) - #t)))))) + (wrap-qt-program out "monero-wallet-gui")) + #t))))) (home-page "https://getmonero.org/") (synopsis "Graphical user interface for the Monero currency") (description - "Monero is a secure, private, untraceable currency. This package p= rovides the -Monero GUI client.") + "Monero is a secure, private, untraceable currency. This package p= rovides +the Monero GUI client.") (license license:bsd-3))) =20 (define-public monero-core --=20 2.22.0 ------------=_1562148482-26098-1--