[PR PATCH] Fix mutter rpath when cross compiling

[PR PATCH] Fix mutter rpath when cross compiling

[oreo639]

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

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

https://github.com/oreo639/void-packages mutter-rpath
https://github.com/void-linux/void-packages/pull/37924

Fix mutter rpath when cross compiling
<!-- 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/37924.patch is attached

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

From 0c1f21b9fd7512b69d2d180d6422bfa9bf9191e4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 8 Jul 2022 01:37:08 -0700
Subject: [PATCH 1/2] mutter: fix typelibdir variable

Previously we were using pc_sysrootdir which is an issue since this is used for
the rpath.
---
 srcpkgs/mutter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 4064972076d9..ff2532ceb43a 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
 # Template file for 'mutter'
 pkgname=mutter
 version=42.3
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -35,7 +35,7 @@ post_install() {
 	# modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
 	# meant to be called with 'pkg-config --variable'
 	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+		 -e 's|^typelibdir.*|typelibdir=${libdir}/mutter-10|g' \
 		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc
 }
 

From 1db152f62313af46880232e6366097a9f16fadac Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 8 Jul 2022 01:38:37 -0700
Subject: [PATCH 2/2] gnome-shell: Rebuild for rpaths

The typelibdir variable was including pc_sysrootdir, which breaks the rpath
when cross compiling.
---
 srcpkgs/gnome-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 3d2e3c5cd8ec..e0a73c48c1a5 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
 version=42.3
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false -Dtests=false"

Re: [PR PATCH] [Updated] Fix mutter rpath when cross compiling

[oreo639]

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

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

https://github.com/oreo639/void-packages mutter-rpath
https://github.com/void-linux/void-packages/pull/37924

Fix mutter rpath when cross compiling
<!-- 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/37924.patch is attached

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

From 1a7bffd81cd79d530ec9e4a6c35d4796f9d82ea4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 8 Jul 2022 01:37:08 -0700
Subject: [PATCH 1/3] mutter: fix typelibdir variable

Previously we were using pc_sysrootdir which is an issue since this is used for
the rpath.
---
 srcpkgs/mutter/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 4064972076d9..81c906209616 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
 # Template file for 'mutter'
 pkgname=mutter
 version=42.3
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -35,7 +35,6 @@ post_install() {
 	# modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
 	# meant to be called with 'pkg-config --variable'
 	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
 		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc
 }
 

From 6b835afba4726fa982216a938f3b26fe4bc9c57c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 8 Jul 2022 01:38:37 -0700
Subject: [PATCH 2/3] gnome-shell: rebuild for mutter rpath

The typelibdir variable was including pc_sysrootdir, which breaks the rpath
when cross compiling.
---
 srcpkgs/gnome-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 3d2e3c5cd8ec..e0a73c48c1a5 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
 version=42.3
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false -Dtests=false"

From d13d58dbe5c8bb26b1b6f5db4b006f2a4bc57b09 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 8 Jul 2022 02:02:47 -0700
Subject: [PATCH 3/3] budgie-desktop: rebuild for mutter rpath

The typelibdir variable was including pc_sysrootdir, which breaks the rpath
when cross compiling.
---
 srcpkgs/budgie-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index de5b3305ee9f..16052df13583 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'budgie-desktop'
 pkgname=budgie-desktop
 version=10.6.1
-revision=3
+revision=4
 build_style=meson
 build_helper=gir
 configure_args="-Dwith-gtk-doc=false"

Re: [PR PATCH] [Merged]: Fix mutter rpath when cross compiling

[paper42]

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

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

Fix mutter rpath when cross compiling
https://github.com/void-linux/void-packages/pull/37924

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

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

Not sure why we are running into this issue *now* since we have been patching it like this since forever, but typelibdir is just used for the rpath and currently it is returning stuff like `/usr/aarch64-linux-musl//usr/lib64/mutter-10` when cross compiling due to `pc_sysrootdir`.

<!--
#### 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
-->