[PR PATCH] monero-gui: fix cross.

[PR PATCH] monero-gui: fix cross.

[fosslinux]

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

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

https://github.com/fosslinux/void-packages monero-gui-fix
https://github.com/void-linux/void-packages/pull/29266

monero-gui: fix cross.
Upstream had moved to ninja so generate_translation_headers was not
being generated properly in the makefiles. Moving to ninja for the
building command solves this issue.

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

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

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

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


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

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

From 3b807454072dd1ff718be5c1a75e83f54ba0bbac Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 6 Mar 2021 13:00:27 +1100
Subject: [PATCH] monero-gui: fix cross.

Upstream had moved to ninja so generate_translation_headers was not
being generated properly in the makefiles. Moving to ninja for the
building command solves this issue.
---
 srcpkgs/monero-gui/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..6ed3b0f5ce6 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
@@ -56,8 +56,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DARCH=default" ;;
 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
@@ -93,7 +91,7 @@ pre_build() {
 		# but is not included in the binary package. It thus needs to be
 		# built for the host
 		CC=${CC_host} CFLAGS="${XBPS_CFLAGS}" LDFLAGS="${XBPS_LDFLAGS}" \
-			make -C build/monero ${makejobs} generate_translations_header
+			ninja -C build ${makejobs} generate_translations_header
 
 	fi
 	make ${makejobs} -C src/zxcvbn-c

Re: [PR PATCH] [Updated] monero-gui: fix cross.

[fosslinux]

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

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages monero-gui-fix
https://github.com/void-linux/void-packages/pull/29266

monero-gui: fix cross.
Upstream had moved to ninja so generate_translation_headers was not
being generated properly in the makefiles. Moving to ninja for the
building command solves this issue.

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

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

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

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


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

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

From ae463ea2b3e0cbf54a4b39a12d3d9d4487bc127c Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 6 Mar 2021 13:00:27 +1100
Subject: [PATCH] monero-gui: fix cross.

Upstream had moved to ninja so generate_translation_headers was not
being generated properly in the makefiles. Moving to ninja for the
building command solves this issue.
---
 srcpkgs/monero-gui/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index f6e08f8bef8..6ed3b0f5ce6 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -35,8 +35,6 @@ checksum="3a924b4e08b557d93337a0c05826a9fa95e5cf8c503aff0ecb3676be45db1d14
 skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz v${_randomx_version}.tar.gz
  ${_quirc_gitrev}.tar.gz"
 
-nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/31154/steps/shell_3/logs/stdio"
-
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	CFLAGS+=" -latomic"
@@ -58,8 +56,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DARCH=default" ;;
 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
@@ -95,7 +91,7 @@ pre_build() {
 		# but is not included in the binary package. It thus needs to be
 		# built for the host
 		CC=${CC_host} CFLAGS="${XBPS_CFLAGS}" LDFLAGS="${XBPS_LDFLAGS}" \
-			make -C build/monero ${makejobs} generate_translations_header
+			ninja -C build ${makejobs} generate_translations_header
 
 	fi
 	make ${makejobs} -C src/zxcvbn-c

Re: [PR PATCH] [Updated] monero-gui: fix cross.

[fosslinux]

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

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages monero-gui-fix
https://github.com/void-linux/void-packages/pull/29266

monero-gui: fix cross.
Upstream had moved to ninja so generate_translation_headers was not
being generated properly in the makefiles. Moving to ninja for the
building command solves this issue.

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

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

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

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


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

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

From 94221dc2d7de79fa7396aa6a8f8f340ef4fc42a6 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 6 Mar 2021 13:00:27 +1100
Subject: [PATCH] monero-gui: fix cross.

We moved to ninja cmake generator so generate_translation_headers was not
being generated properly as a makefile. Moving to ninja for the
building command solves this issue.
---
 srcpkgs/monero-gui/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index f6e08f8bef8..6ed3b0f5ce6 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -35,8 +35,6 @@ checksum="3a924b4e08b557d93337a0c05826a9fa95e5cf8c503aff0ecb3676be45db1d14
 skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz v${_randomx_version}.tar.gz
  ${_quirc_gitrev}.tar.gz"
 
-nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/31154/steps/shell_3/logs/stdio"
-
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	CFLAGS+=" -latomic"
@@ -58,8 +56,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DARCH=default" ;;
 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
@@ -95,7 +91,7 @@ pre_build() {
 		# but is not included in the binary package. It thus needs to be
 		# built for the host
 		CC=${CC_host} CFLAGS="${XBPS_CFLAGS}" LDFLAGS="${XBPS_LDFLAGS}" \
-			make -C build/monero ${makejobs} generate_translations_header
+			ninja -C build ${makejobs} generate_translations_header
 
 	fi
 	make ${makejobs} -C src/zxcvbn-c

Re: [PR PATCH] [Merged]: monero-gui: fix cross.

[ericonr]

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

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

monero-gui: fix cross.
https://github.com/void-linux/void-packages/pull/29266

Description:
Upstream had moved to ninja so generate_translation_headers was not
being generated properly in the makefiles. Moving to ninja for the
building command solves this issue.

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

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

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

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