From 04337db9fa2057fcdebe1c3f2c9a3704c9ed47eb Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Wed, 5 Dec 2012 07:54:02 -0500
Subject: Add gnubiff-2.2.15-glib.patch in gnudiff-gtk

---
 community/gnubiff-gtk/PKGBUILD                  |  7 +++++--
 community/gnubiff-gtk/gnubiff-2.2.15-glib.patch | 12 ++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 community/gnubiff-gtk/gnubiff-2.2.15-glib.patch

(limited to 'community/gnubiff-gtk')

diff --git a/community/gnubiff-gtk/PKGBUILD b/community/gnubiff-gtk/PKGBUILD
index c5fa45ae0..1b092cd5c 100644
--- a/community/gnubiff-gtk/PKGBUILD
+++ b/community/gnubiff-gtk/PKGBUILD
@@ -13,11 +13,14 @@ license=("GPL")
 depends=('libglade' 'gtk3' 'openssl' 'popt')
 makedepends=('intltool')
 conflicts=('gnubiff')
-source=(http://downloads.sourceforge.net/sourceforge/gnubiff/gnubiff-$pkgver.tar.gz)
-md5sums=('c705e1135b0bd4c8d8f7ce72ca7b5443')
+source=(http://downloads.sourceforge.net/sourceforge/gnubiff/gnubiff-$pkgver.tar.gz
+	gnubiff-2.2.15-glib.patch)
+md5sums=('c705e1135b0bd4c8d8f7ce72ca7b5443'
+	 '31bce3b8b43decf0a1df9492cd807024')
 
 build() {
   cd $srcdir/gnubiff-$pkgver
+  patch -Np1 -i ${srcdir}/gnubiff-2.2.15-glib.patch
   export LDFLAGS=-lX11
   ./configure --prefix=/usr --disable-gnome --disable-fam --with-password --with-password-string="65423957eb027b94c9e661611c0e4271"
   make
diff --git a/community/gnubiff-gtk/gnubiff-2.2.15-glib.patch b/community/gnubiff-gtk/gnubiff-2.2.15-glib.patch
new file mode 100644
index 000000000..ed4b0cc5b
--- /dev/null
+++ b/community/gnubiff-gtk/gnubiff-2.2.15-glib.patch
@@ -0,0 +1,12 @@
+--- gnubiff-2.2.15.orig/src/gnubiff.cc	2012-01-08 15:55:47.000000000 -0500
++++ gnubiff-2.2.15/src/gnubiff.cc	2012-12-05 06:43:35.161272119 -0500
+@@ -60,7 +60,9 @@
+ #endif
+ 
+ 	// Thread initialization
++        #if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++        #endif
+ 	gdk_threads_init ();
+ 
+ 	//
-- 
cgit v1.2.3-54-g00ecf