summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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.patch52
1 files changed, 27 insertions, 25 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 6376b46d7089..2c5b2592a3b0 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,42 +1,44 @@
--- 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]),
-+ [enable_gtk=$enableval], enable_gtk=auto)
++ [enable_gtk=$enableval], [enable_gtk=auto])
+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
-+
++AS_IF([test "x$enable_gtk" != "xno"],[
+ GDK_PIXBUF_REQUIRED_VERSION=2.12
+
+@@ -74,4 +80,7 @@
+- dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
++ dbus-glib-1 >= $DBUS_REQUIRED_VERSION,
++ [have_gtk=yes]
++)
AC_SUBST(LIBINDICATEGTK_CFLAGS)
AC_SUBST(LIBINDICATEGTK_LIBS)
++])
+@@ -271,2 +280,7 @@
+- GObject Introspection: $enable_introspection
+-])
++ GObject Introspection: $enable_introspection
++])
++
++AS_IF([test "x$have_gtk" = "xyes"],
++ [AC_MSG_NOTICE([ Gtk: yes])],
++ [AC_MSG_NOTICE([ Gtk: no])]
++)
--- 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 \