From cdf84506d9a341e473573d87d446c9aea4b4a24f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?=
 <coadde@parabola.nu>
Date: Sat, 23 Apr 2016 17:27:23 -0300
Subject: glib2-static: fix PKGBUILD

---
 libre/glib2-static/PKGBUILD      | 13 ++++---------
 libre/glib2-static/memleak.patch | 25 -------------------------
 2 files changed, 4 insertions(+), 34 deletions(-)
 delete mode 100644 libre/glib2-static/memleak.patch

(limited to 'libre/glib2-static')

diff --git a/libre/glib2-static/PKGBUILD b/libre/glib2-static/PKGBUILD
index 7cd113ba2..5f0c284f2 100644
--- a/libre/glib2-static/PKGBUILD
+++ b/libre/glib2-static/PKGBUILD
@@ -4,11 +4,11 @@
 pkgbase=glib2
 pkgname=glib2-static
 pkgver=2.48.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Common C routines used by GTK+ and other libs (static libraries only)"
 url="http://www.gtk.org/"
 arch=(i686 x86_64 armv7h)
-makedepends=('pkg-config' 'python' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'libelf')
+makedepends=('python')
 source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver:0:4}/glib-$pkgver.tar.xz
         revert-warn-glib-compile-schemas.patch)
 sha256sums=('744be6931ca914c68af98dc38ff6b0cf8381d65e335060faddfbf04c17147c34'
@@ -22,7 +22,6 @@ prepare() {
 build() {
   cd glib-$pkgver
   ./configure --prefix=/usr --libdir=/usr/lib \
-      --with-pcre=system \
       --disable-fam --enable-static
   make
 }
@@ -33,17 +32,13 @@ check() {
 }
 
 package() {
-  depends=('pcre-static' 'libffi-static' 'glib2')
-  options=('!docs' '!emptydirs' 'staticlibs')
+  depends=('glib2')
+  options=('staticlibs')
   license=('LGPL')
 
   cd glib-$pkgver
   make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
 
-  for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do
-      chmod -x "$_i"
-  done
-
   # remove conflicting files
   rm -vr ${pkgdir}/usr/{bin,lib/{glib-*,pkgconfig},include,share}
   rm -v ${pkgdir}/usr/lib/lib*.so*
diff --git a/libre/glib2-static/memleak.patch b/libre/glib2-static/memleak.patch
deleted file mode 100644
index 2b927a101..000000000
--- a/libre/glib2-static/memleak.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From db641e32920ee8b553ab6f2d318aafa156e4390c Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Wed, 25 Nov 2015 23:29:18 +0200
-Subject: GDBusProxy: Fix a memory leak during initialization
-
-https://bugzilla.gnome.org/show_bug.cgi?id=758641
----
- gio/gdbusproxy.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
-index 52a22fb..7b1140f 100644
---- a/gio/gdbusproxy.c
-+++ b/gio/gdbusproxy.c
-@@ -1720,6 +1720,7 @@ async_initable_init_second_finish (GAsyncInitable  *initable,
-   if (result != NULL)
-     {
-       process_get_all_reply (proxy, result);
-+      g_variant_unref (result);
-     }
- 
-   proxy->priv->initialized = TRUE;
--- 
-cgit v0.11.2
-
-- 
cgit v1.2.2