From 98353673239a2304cb6d5551bb61f7419fdd1f40 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Thu, 28 Sep 2017 11:45:38 +0200 Subject: [PATCH 1/2] monero: add -devel subpackage Install the static libraries and header file which was left out of the package earlier and put it in the -devel package so it can be used to build other software against it. --- srcpkgs/monero-devel | 1 + srcpkgs/monero/template | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) create mode 120000 srcpkgs/monero-devel diff --git a/srcpkgs/monero-devel b/srcpkgs/monero-devel new file mode 120000 index 00000000000..772084db020 --- /dev/null +++ b/srcpkgs/monero-devel @@ -0,0 +1 @@ +monero \ No newline at end of file diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template index b079b165591..36b78eefe0b 100644 --- a/srcpkgs/monero/template +++ b/srcpkgs/monero/template @@ -1,7 +1,7 @@ # Template file for 'monero' pkgname=monero version=0.11.0.0 -revision=1 +revision=2 conf_files="/etc/monerod.conf" build_style=cmake hostmakedepends="pkg-config" @@ -34,15 +34,20 @@ case "$XBPS_TARGET_MACHINE" in ;; esac -do_install() { - vbin build/bin/monerod - vbin build/bin/monero-wallet-cli +post_install() { + vlicense LICENSE vbin build/bin/monero-blockchain-import vbin build/bin/monero-blockchain-export vinstall utils/conf/monerod.conf 644 etc vsv monerod } -post_install() { - vlicense LICENSE +monero-devel_package() { + short_desc+=" - development files" + pkg_install() { + vlicense LICENSE + vmove usr/include + vmove "usr/lib/*.a" + } } + From 4b6fa3867064d3f10b552392414518b00b6eff92 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Thu, 28 Sep 2017 11:49:13 +0200 Subject: [PATCH 2/2] New package: monero-core-0.11.0.0 --- srcpkgs/monero-core/patches/readline.patch | 12 +++++++ srcpkgs/monero-core/template | 37 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 srcpkgs/monero-core/patches/readline.patch create mode 100644 srcpkgs/monero-core/template diff --git a/srcpkgs/monero-core/patches/readline.patch b/srcpkgs/monero-core/patches/readline.patch new file mode 100644 index 00000000000..604724f48e2 --- /dev/null +++ b/srcpkgs/monero-core/patches/readline.patch @@ -0,0 +1,12 @@ +--- monero-wallet-gui.pro.orig 2017-09-28 10:51:59.106105235 +0200 ++++ monero-wallet-gui.pro 2017-09-28 10:52:18.144866232 +0200 +@@ -91,7 +91,8 @@ + -lwallet_merged \ + -lepee \ + -lunbound \ +- -leasylogging ++ -leasylogging \ ++ -lreadline + } + + diff --git a/srcpkgs/monero-core/template b/srcpkgs/monero-core/template new file mode 100644 index 00000000000..646656e0cdf --- /dev/null +++ b/srcpkgs/monero-core/template @@ -0,0 +1,37 @@ +# Template file for 'monero-core' +pkgname=monero-core +version=0.11.0.0 +revision=1 +build_style=qmake +hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-quickcontrols qt5-declarative-devel" +makedepends="monero-devel boost-devel libunwind-devel miniupnpc-devel + libressl-devel readline-devel qt5-devel qt5-declarative-devel + unbound-devel" +depends="qt5-graphicaleffects qt5-quickcontrols" +short_desc="GUI for the core Monero implementation" +maintainer="Helmut Pozimski " +license="3-clause-BSD" +homepage="https://getmonero.org" +distfiles="https://github.com/monero-project/monero-core/archive/v${version}.tar.gz" +checksum=ef63cfee677eccbebeb4cbb5449016d7c54fd67ea27ac9ee316aebb0f89bd942 + +pre_configure() { + echo "var GUI_VERSION = \"${version}\"" > version.js + echo "var GUI_MONERO_VERSION = \"${version}\"" >> version.js +} + +pre_build() { + if [ -n "$CROSS_BUILD" ]; then + # The dictgen binary is executed during the build to generate code + # but is not included in the binary package. It thus needs to be + # built for the host + CXX=${CXX_host} CXXFLAGS=${XBPS_CXXFLAGS} LDFLAGS=${XBPS_LDFLAGS} make -j ${XBPS_MAKEJOBS} -C src/zxcvbn-c dictgen + + fi + make -j ${XBPS_MAKEJOBS} -C src/zxcvbn-c +} + +do_install() { + vbin release/bin/monero-wallet-gui + vlicense LICENSE +}