diff options
| author |   Romain Perier <mrpouet@gentoo.org> | 2009-10-29 15:47:09 +0000 |
|---|---|---|
| committer | Romain Perier <mrpouet@gentoo.org> | 2009-10-29 15:47:09 +0000 |
| commit | 0dbbca9bb1794657b6839b234e8b35935c27fde2 (patch) | |
| tree | f91f0fcb288464e3745481f222eb661b952a41a6 /dev-libs/libindicate/files | |
| parent | amd64/x86 stable, bug #289311 (diff) | |
| download | gentoo-2-0dbbca9bb1794657b6839b234e8b35935c27fde2.tar.gz gentoo-2-0dbbca9bb1794657b6839b234e8b35935c27fde2.tar.bz2 gentoo-2-0dbbca9bb1794657b6839b234e8b35935c27fde2.zip | |
New package, necessary for libindicate-qt (kde team)
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/libindicate/files')
| -rw-r--r-- | dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch | 126 |
1 files changed, 126 insertions, 0 deletions
diff --git a/dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch b/dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch new file mode 100644 index 000000000000..306e654ce7c5 --- /dev/null +++ b/dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch @@ -0,0 +1,126 @@ +From: Romain Perier <mrpouet@gentoo.org> +Date: Thu, 29 Oct 2009 16:21:56 +0100 +Subject: Make gtk support optional + +--- + Makefile.am | 13 +++++++---- + configure.ac | 17 +++++++++++---- + examples/Makefile.am | 52 +++++++++++++++++++++++++------------------------ + 3 files changed, 47 insertions(+), 35 deletions(-) + +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,9 +1,12 @@ ++SUBDIRS = libindicate + +-SUBDIRS = \ +- libindicate \ +- libindicate-gtk \ +- examples \ +- tests \ ++if HAVE_LIBINDICATEGTK ++SUBDIRS += libindicate-gtk ++endif ++ ++SUBDIRS += \ ++ examples \ ++ tests \ + docs + + EXTRA_DIST = \ +--- a/configure.ac ++++ b/configure.ac +@@ -63,11 +63,18 @@ AC_SUBST(LIBINDICATE_LIBS) + + GDK_PIXBUF_REQUIRED_VERSION=2.12 + +-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 +- dbus-glib-1 >= $DBUS_REQUIRED_VERSION) ++AC_ARG_ENABLE([gtk], ++ AC_HELP_STRING([--disable-gtk], [Disable libindicator-gtk library]), ++ [enable_gtk=$enableval], enable_gtk=auto) ++ ++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 ++ dbus-glib-1 >= $DBUS_REQUIRED_VERSION) ++fi ++AM_CONDITIONAL([HAVE_LIBINDICATEGTK], [test "x$enable_gtk" != "xno"]) + AC_SUBST(LIBINDICATEGTK_CFLAGS) + AC_SUBST(LIBINDICATEGTK_LIBS) + +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -2,32 +2,11 @@ + libexec_PROGRAMS = \ + indicate-and-crash \ + indicate-alot \ +- listen-and-print \ +- im-client \ + show-hide-server +- +-indicate_and_crash_SOURCES = \ +- indicate-and-crash.c +- +-indicate_and_crash_CFLAGS = \ +- -I $(srcdir)/.. \ +- $(LIBINDICATE_CFLAGS) +- +-indicate_and_crash_LDADD = \ +- ../libindicate/libindicate.la \ +- $(LIBINDICATE_LIBS) +- +-indicate_alot_SOURCES = \ +- indicate-alot.c +- +-indicate_alot_CFLAGS = \ +- -I $(srcdir)/.. \ +- $(LIBINDICATE_CFLAGS) +- +-indicate_alot_LDADD = \ +- ../libindicate/libindicate.la \ +- $(LIBINDICATE_LIBS) +- ++if HAVE_LIBINDICATEGTK ++libexec_PROGRAMS += \ ++ listen-and-print \ ++ im-client + listen_and_print_SOURCES = \ + listen-and-print.c + +@@ -55,6 +34,29 @@ im_client_LDADD = \ + ../libindicate-gtk/libindicate-gtk.la \ + $(LIBINDICATE_LIBS) \ + $(LIBINDICATEGTK_LIBS) ++endif ++ ++indicate_and_crash_SOURCES = \ ++ indicate-and-crash.c ++ ++indicate_and_crash_CFLAGS = \ ++ -I $(srcdir)/.. \ ++ $(LIBINDICATE_CFLAGS) ++ ++indicate_and_crash_LDADD = \ ++ ../libindicate/libindicate.la \ ++ $(LIBINDICATE_LIBS) ++ ++indicate_alot_SOURCES = \ ++ indicate-alot.c ++ ++indicate_alot_CFLAGS = \ ++ -I $(srcdir)/.. \ ++ $(LIBINDICATE_CFLAGS) ++ ++indicate_alot_LDADD = \ ++ ../libindicate/libindicate.la \ ++ $(LIBINDICATE_LIBS) + + show_hide_server_SOURCES = \ + show-hide-server.c + |