From 679729c0273b51fb19924f0ce33ddf1f888fa1f1 Mon Sep 17 00:00:00 2001 From: Ali MJ Al-Nasrawy Date: Thu, 9 May 2019 07:05:28 +0300 Subject: extra/gnome-desktop: Revert "remove /lib64 bind mount - we don't have that!" This reverts commit 488ecda588e55d2fa1fb63a98c60ff24f5988161. Problem was fixed upstream as of v3.31.3: https://gitlab.gnome.org/GNOME/gnome-desktop/commit/259e7e4edb0d9b84fb7cf0847149ff8d42ab9a56 --- extra/gnome-desktop/PKGBUILD | 15 +-------------- extra/gnome-desktop/lib64.diff | 13 ------------- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 extra/gnome-desktop/lib64.diff diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index b6194988..bca870d3 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,14 +1 @@ -eval "$( - declare -f build | \ - sed ' - s|./configure|./configure --disable-Werror| - ' -)" -eval "$( - declare -f prepare | \ - sed ' - 3 a patch -Np1 -i ../lib64.diff - ' -)" -source+=('lib64.diff') -sha256sums+=('a1ba9b12d71afea5dd713cdbc0c3297ee3df38f5004f5ee02dd2d90adfcffc5b') +eval "$(declare -f build | sed 's|./configure|./configure --disable-Werror|')" diff --git a/extra/gnome-desktop/lib64.diff b/extra/gnome-desktop/lib64.diff deleted file mode 100644 index c3f1e442..00000000 --- a/extra/gnome-desktop/lib64.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c -b/libgnome-desktop/gnome-desktop-thumbnail-script.c -index 14e2fed3..dac7b210 100644 ---- a/libgnome-desktop/gnome-desktop-thumbnail-script.c -+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c -@@ -517,7 +517,6 @@ add_bwrap (GPtrArray *array, - "bwrap", - "--ro-bind", "/usr", "/usr", - "--ro-bind", "/lib", "/lib", -- "--ro-bind", "/lib64", "/lib64", - "--proc", "/proc", - "--dev", "/dev", - "--symlink", "usr/bin", "/bin", -- cgit v1.2.3-54-g00ecf