summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-08-28 16:15:18 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-08-28 16:15:18 +0200
commit2ee0812e0a3c8fe4a77249e6c7f3a615cd4c727c (patch)
treec61960929417371368ca53e8033dd776e2e6ee10
parent0cc6a0720f9505aaacfc247fa646d3e888f8e4aa (diff)
Use an upstream patch fixing #98.
-rw-r--r--community/giggle/PKGBUILD10
-rw-r--r--community/giggle/gmodule.patch23
2 files changed, 31 insertions, 2 deletions
diff --git a/community/giggle/PKGBUILD b/community/giggle/PKGBUILD
index c74572d99..243511dc2 100644
--- a/community/giggle/PKGBUILD
+++ b/community/giggle/PKGBUILD
@@ -11,14 +11,20 @@ url="http://live.gnome.org/giggle"
license=('GPL')
depends=('git' 'gtksourceview3' 'vte3')
makedepends=('intltool' 'itstool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.6/${pkgname}-${pkgver}.tar.xz)
+source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.6/${pkgname}-${pkgver}.tar.xz
+ gmodule.patch)
options=(!libtool)
install=giggle.install
-sha256sums=('6c0b5c2b417217509bf88096447afa4af70fd33e8a6db5caa0aa86b44c01a5b8')
+sha256sums=('6c0b5c2b417217509bf88096447afa4af70fd33e8a6db5caa0aa86b44c01a5b8'
+ 'f8ad37a5e533e24afe127e6d67f7baf055ebed93b822644d7a08d97c96079474')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ # An upstream build fix.
+ patch -p1 -i "$srcdir/gmodule.patch"
+ autoconf
+
./configure \
--prefix=/usr
make
diff --git a/community/giggle/gmodule.patch b/community/giggle/gmodule.patch
new file mode 100644
index 000000000..2716ea2cd
--- /dev/null
+++ b/community/giggle/gmodule.patch
@@ -0,0 +1,23 @@
+From 6a4d71af9920df76a15e427671c90952fddbb411 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Thu, 19 Jan 2012 13:48:40 +0000
+Subject: build: Explicitly link to gmodule-2.0
+
+gmodule-2.0 is now gone from the pkg-config files for GTK+ 3 and others.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=667350
+---
+diff --git a/configure.ac b/configure.ac
+index 07f5b7b..aa11046 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,6 +55,7 @@ GTKSOURCE_REQUIRED_VERSION=3.0
+ PKG_CHECK_MODULES(GIGGLE, [
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ glib-2.0 >= $GLIB_REQUIRED_VERSION
++ gmodule-2.0 >= $GLIB_REQUIRED_VERSION
+ gthread-2.0 >= $GLIB_REQUIRED_VERSION
+ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION
+ gdk-3.0 >= $GTK_REQUIRED_VERSION
+--
+cgit v0.9.0.2