Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] gnome-tour: fix cross building
@ 2022-07-08  1:29 oreo639
  2022-07-08  7:39 ` [PR PATCH] [Merged]: " paper42
  0 siblings, 1 reply; 2+ messages in thread
From: oreo639 @ 2022-07-08  1:29 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages gtour
https://github.com/void-linux/void-packages/pull/37920

gnome-tour: fix cross building
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/37920.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gtour-37920.patch --]
[-- Type: text/x-diff, Size: 1424 bytes --]

From 63ff85ab84c36ba8212b6b6b17e77169dd54cccd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 7 Jul 2022 18:29:01 -0700
Subject: [PATCH] gnome-tour: fix cross building

---
 srcpkgs/gnome-tour/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-tour/template b/srcpkgs/gnome-tour/template
index adb289c3e0d4..0fcd74daf2bd 100644
--- a/srcpkgs/gnome-tour/template
+++ b/srcpkgs/gnome-tour/template
@@ -4,8 +4,9 @@ version=42.0
 revision=1
 build_style=meson
 build_helper=rust
-hostmakedepends="pkg-config cargo rust glib-devel gettext desktop-file-utils"
-makedepends="gtk4-devel libadwaita-devel libglib-devel"
+hostmakedepends="pkg-config cargo glib-devel gettext
+ desktop-file-utils gtk-update-icon-cache"
+makedepends="gtk4-devel libadwaita-devel libglib-devel rust-std"
 short_desc="GNOME Tour & Greeter"
 maintainer="oreo639 <oreo6391@gmail.com>"
 license="GPL-3.0-or-later"
@@ -13,3 +14,9 @@ homepage="https://gitlab.gnome.org/GNOME/gnome-tour/"
 changelog="https://gitlab.gnome.org/GNOME/gnome-tour/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=fcf1ac689057da86596970ec3da8355521c0a72e95063eb059d5fee4dea82f4f
+
+post_patch() {
+	[ -z "$CROSS_BUILD" ] && return 0
+	vsed -i src/meson.build \
+		 -e "s%rust_target /%'${RUST_TARGET}' / rust_target /%"
+}

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: gnome-tour: fix cross building
  2022-07-08  1:29 [PR PATCH] gnome-tour: fix cross building oreo639
@ 2022-07-08  7:39 ` paper42
  0 siblings, 0 replies; 2+ messages in thread
From: paper42 @ 2022-07-08  7:39 UTC (permalink / raw)
  To: ml

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

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

gnome-tour: fix cross building
https://github.com/void-linux/void-packages/pull/37920

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-07-08  7:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-08  1:29 [PR PATCH] gnome-tour: fix cross building oreo639
2022-07-08  7:39 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).