add another patch

1 files changed, 11 insertions, 2 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d663e4f26e6e..be6c18968e4a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,33 +5,42 @@ pkgbase=glib2-patched-thumbnailer
 pkgname=glib2-patched-thumbnailer
 pkgver=2.46.0
 _patchver=d0edf118e1c27700300038c1d82b3ff775c0216b
-pkgrel=1
+pkgrel=2
 pkgdesc="GLib2 patched with ahodesuka's thumbnailer patch."
 url="http://gist.github.com/ahodesuka/49c1d0eea4b64f24c4c7"
 arch=(i686 x86_64)
 provides=(glib2)
 conflicts=(glib2)
-makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils')
+makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'libelf')
 depends=('pcre' 'libffi' 'tumbler')
 optdepends=('python2: for gdbus-codegen and gtester-report'
             'elfutils: gresource inspection tool')
 options=('!docs' '!emptydirs')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver:0:4}/glib-$pkgver.tar.xz
+        0001-Revert-list-store-Fix-a-parameter-check.patch
         revert-warn-glib-compile-schemas.patch
         https://gist.githubusercontent.com/ahodesuka/49c1d0eea4b64f24c4c7/raw/$_patchver/glib-thumbnailer.patch)
 sha256sums=('b1cee83469ae7d80f17c267c37f090414e93960bd62d2b254a5a96fbc5baacb4'
+            '261ae2d2c7b94460f33ab569540313e21c9a50af38a7ebe8412e49f5b309af35'
             '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
             '1a4673380fbdf8e8e5de3367089de6c97025633e54010575de63c5ab6c8a044d')
 
 prepare() {
   cd glib-$pkgver
+  patch -Np1 -i ../0001-Revert-list-store-Fix-a-parameter-check.patch
   patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
   patch -Np1 -i ${srcdir}/glib-thumbnailer.patch
 }
   
 build() {
   cd glib-$pkgver
+
+  ## Prevent runtime unloading of glib
+  # https://bugs.archlinux.org/task/46619
+  # https://bugzilla.gnome.org/show_bug.cgi?id=755609
+  LDFLAGS+=" -Wl,-z,nodelete"
+
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
       --sysconfdir=/etc \
       --with-pcre=system \