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"