diff options
| author | Dennis Schridde <devurandom@gmx.net> | 2011-01-30 01:13:32 +0100 |
|---|---|---|
| committer | Dennis Schridde <devurandom@gmx.net> | 2011-01-30 01:14:27 +0100 |
| commit | cbf3d470baef26b0f05f81dacf869e7f005d8465 (patch) | |
| tree | 47969df6baea51c2b01356acaf40a6ae6ead9e84 /dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch | |
| parent | ebf1803c76933056efe3516e0658e419bda86b00 (diff) | |
| download | kde-cbf3d470baef26b0f05f81dacf869e7f005d8465.tar.gz kde-cbf3d470baef26b0f05f81dacf869e7f005d8465.tar.bz2 kde-cbf3d470baef26b0f05f81dacf869e7f005d8465.zip | |
[dev-libs/libindicate] Version bump to 0.4.91, fix patches to preserve SUBDIR order, update metadata.xml, fix parallel-build for mono bindings
(Portage version: 2.2.0_alpha19/git/Linux x86_64, signed Manifest commit with key 50ED256E)
Diffstat (limited to 'dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch')
| -rw-r--r-- | dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch b/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch index 6376b46d708..90272e341da 100644 --- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch +++ b/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch @@ -1,8 +1,6 @@ --- configure.ac.orig 2010-09-20 23:15:36.692289201 +0200 +++ configure.ac 2010-09-20 23:17:50.380918143 +0200 -@@ -66,12 +66,20 @@ - - GDK_PIXBUF_REQUIRED_VERSION=2.12 +@@ -66,3 +66,9 @@ +AC_ARG_ENABLE([gtk], + AC_HELP_STRING([--disable-gtk], [Disable libindicate-gtk library]), @@ -10,33 +8,23 @@ +AM_CONDITIONAL([WANT_LIBINDICATEGTK], [test "x$enable_gtk" != "xno"]) + +if test "x$enable_gtk" != "xno" ; then - PKG_CHECK_MODULES(LIBINDICATEGTK, glib-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GIO_REQUIRED_VERSION - gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION - dbusmenu-glib >= $DBUSMENU_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION) -+fi -+ + GDK_PIXBUF_REQUIRED_VERSION=2.12 + +@@ -75,3 +66,4 @@ AC_SUBST(LIBINDICATEGTK_CFLAGS) AC_SUBST(LIBINDICATEGTK_LIBS) ++fi --- Makefile.am.orig 2010-09-20 23:12:10.442903362 +0200 +++ Makefile.am 2010-09-20 23:17:35.141406450 +0200 -@@ -1,12 +1,15 @@ +@@ -1,5 +1,9 @@ ++if WANT_LIBINDICATEGTK ++LIBINDICATEGTK_SUBDIR = libindicate-gtk ++endif ++ SUBDIRS = \ libindicate \ - libindicate-gtk \ ++ $(LIBINDICATEGTK_SUBDIR) \ bindings \ - examples \ - tests \ - docs - -+if WANT_LIBINDICATEGTK -+SUBDIRS += libindicate-gtk -+endif -+ - EXTRA_DIST = \ - COPYING.LGPL.2.1 \ - gtk-doc.make \ |