[arch-commits] Commit in gnome-desktop/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Monday, December 25, 2017 @ 02:53:06
  Author: heftig
Revision: 313599

archrelease: copy trunk to extra-x86_64

Added:
  gnome-desktop/repos/extra-x86_64/PKGBUILD
    (from rev 313598, gnome-desktop/trunk/PKGBUILD)
  gnome-desktop/repos/extra-x86_64/bwrap-var.diff
    (from rev 313598, gnome-desktop/trunk/bwrap-var.diff)
Deleted:
  gnome-desktop/repos/extra-x86_64/PKGBUILD

----------------+
 PKGBUILD       |   83 ++++++++++++++++++++++++++++---------------------------
 bwrap-var.diff |   15 +++++++++
 2 files changed, 58 insertions(+), 40 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-25 02:52:17 UTC (rev 313598)
+++ PKGBUILD	2017-12-25 02:53:06 UTC (rev 313599)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer:  Jan de Groot <jan at archlinux.org>
-
-pkgname=gnome-desktop
-pkgver=3.26.2
-pkgrel=1
-epoch=1
-pkgdesc="Library with common API for various GNOME modules"
-url="https://git.gnome.org/browse/gnome-desktop"
-arch=(i686 x86_64)
-license=(GPL LGPL)
-depends=(gsettings-desktop-schemas gtk3 libxkbfile xkeyboard-config iso-codes libseccomp bubblewrap)
-makedepends=(intltool gobject-introspection git gnome-common gtk-doc)
-_commit=0815eb8084da82526d1ab0aaf4ed7dd412234a4f  # tags/3.26.2^0
-source=("git+https://git.gnome.org/browse/gnome-desktop#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib --disable-static --enable-gtk-doc \
-    --with-gnome-distributor="Arch Linux"
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
-}

Copied: gnome-desktop/repos/extra-x86_64/PKGBUILD (from rev 313598, gnome-desktop/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-12-25 02:53:06 UTC (rev 313599)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer:  Jan de Groot <jan at archlinux.org>
+
+pkgname=gnome-desktop
+pkgver=3.26.2
+pkgrel=2
+epoch=1
+pkgdesc="Library with common API for various GNOME modules"
+url="https://git.gnome.org/browse/gnome-desktop"
+arch=(x86_64)
+license=(GPL LGPL)
+depends=(gsettings-desktop-schemas gtk3 libxkbfile xkeyboard-config iso-codes libseccomp bubblewrap)
+makedepends=(intltool gobject-introspection git gnome-common gtk-doc)
+_commit=0815eb8084da82526d1ab0aaf4ed7dd412234a4f  # tags/3.26.2^0
+source=("git+https://git.gnome.org/browse/gnome-desktop#commit=$_commit"
+        bwrap-var.diff)
+sha256sums=('SKIP'
+            '701bfa5779ced0f50241d4370068fc58246d47088c6e95be27d204847866f106')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+  patch -Np1 -i ../bwrap-var.diff  # evince-thumbnailer needs fontconfig cache
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $pkgname
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib --disable-static --enable-gtk-doc \
+    --with-gnome-distributor="Arch Linux"
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+}

Copied: gnome-desktop/repos/extra-x86_64/bwrap-var.diff (from rev 313598, gnome-desktop/trunk/bwrap-var.diff)
===================================================================
--- bwrap-var.diff	                        (rev 0)
+++ bwrap-var.diff	2017-12-25 02:53:06 UTC (rev 313599)
@@ -0,0 +1,15 @@
+ libgnome-desktop/gnome-desktop-thumbnail-script.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git c/libgnome-desktop/gnome-desktop-thumbnail-script.c i/libgnome-desktop/gnome-desktop-thumbnail-script.c
+index 99d83ac25d4cb449..7f85da2dec60f454 100644
+--- c/libgnome-desktop/gnome-desktop-thumbnail-script.c
++++ i/libgnome-desktop/gnome-desktop-thumbnail-script.c
+@@ -505,6 +505,7 @@ add_bwrap (GPtrArray   *array,
+ 
+   add_args (array,
+ 	    "bwrap",
++	    "--ro-bind", "/var", "/var",
+ 	    "--ro-bind", "/usr", "/usr",
+ 	    "--ro-bind", "/lib", "/lib",
+ 	    "--ro-bind", "/lib64", "/lib64",