* [gentoo-commits] gentoo-x86 commit in dev-libs/libindicate/files: libindicate-0.3.6-no-gobject-introspection.patch libindicate-0.3.6-optional-gtk-support.patch
@ 2010-03-31 17:43 Theo Chatzimichos (tampakrap)
0 siblings, 0 replies; only message in thread
From: Theo Chatzimichos (tampakrap) @ 2010-03-31 17:43 UTC (permalink / raw
To: gentoo-commits
tampakrap 10/03/31 17:43:34
Added: libindicate-0.3.6-no-gobject-introspection.patch
libindicate-0.3.6-optional-gtk-support.patch
Log:
Version bump, moved from kde overlay, thanks to Dennis Schridde. Reference launchpad bugs for the patches
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.1 dev-libs/libindicate/files/libindicate-0.3.6-no-gobject-introspection.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libindicate/files/libindicate-0.3.6-no-gobject-introspection.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libindicate/files/libindicate-0.3.6-no-gobject-introspection.patch?rev=1.1&content-type=text/plain
Index: libindicate-0.3.6-no-gobject-introspection.patch
===================================================================
--- configure.ac.orig 2010-03-31 12:42:16.497596552 +0200
+++ configure.ac 2010-03-31 12:42:47.001595062 +0200
@@ -87,6 +87,6 @@
###########################
-GOBJECT_INTROSPECTION_CHECK([0.6.3])
+AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
###########################
# GTK Doc
1.1 dev-libs/libindicate/files/libindicate-0.3.6-optional-gtk-support.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libindicate/files/libindicate-0.3.6-optional-gtk-support.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libindicate/files/libindicate-0.3.6-optional-gtk-support.patch?rev=1.1&content-type=text/plain
Index: libindicate-0.3.6-optional-gtk-support.patch
===================================================================
Date: Mon, 23 Nov 2009 23:14:01 +0100
Subject: Make gtk support optional, Fix some QA
---
Makefile.am | 17 +++++++----
configure.ac | 23 +++++++++++----
examples/Makefile.am | 64 ++++++++++++++++++++++---------------------
libindicate-gtk/Makefile.am | 2 +-
tests/Makefile.am | 2 +-
5 files changed, 63 insertions(+), 45 deletions(-)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,15 @@
+SUBDIRS = libindicate
-SUBDIRS = \
- libindicate \
- libindicate-gtk \
- examples \
- tests \
- docs
+if HAVE_LIBINDICATEGTK
+SUBDIRS += libindicate-gtk
+endif
+
+SUBDIRS += \
+ examples \
+ tests
+if INSTALL_DOC
+SUBDIRS += docs
+endif
EXTRA_DIST = \
COPYING.LGPL.2.1 \
--- a/configure.ac
+++ b/configure.ac
@@ -66,12 +66,19 @@ AC_SUBST(LIBINDICATE_LIBS)
GDK_PIXBUF_REQUIRED_VERSION=2.12
+AC_ARG_ENABLE([gtk],
+ AC_HELP_STRING([--disable-gtk], [Disable libindicate-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
dbusmenu-glib >= $DBUSMENU_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)
@@ -85,8 +92,12 @@ AM_CONDITIONAL(USE_GIR, test "x$gir_ok" = "xyes")
# GTK Doc
###########################
+AC_ARG_ENABLE([doc],
+ AC_HELP_STRING([--disable-doc], [Do not install API doc]),
+ [enable_doc=$enableval], [enable_doc=auto])
+AM_CONDITIONAL([INSTALL_DOC], [test "x$enable_doc" != "xno"])
GTK_DOC_CHECK([1.4])
-GNOME_DOC_INIT
+#GNOME_DOC_INIT
GNOME_COMPILE_WARNINGS
##############################
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,35 +1,12 @@
-libexec_PROGRAMS = \
+EXTRA_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)/.. \
- -Wall -Werror \
- $(LIBINDICATE_CFLAGS)
-
-indicate_and_crash_LDADD = \
- ../libindicate/libindicate.la \
- $(LIBINDICATE_LIBS)
-
-indicate_alot_SOURCES = \
- indicate-alot.c
-
-indicate_alot_CFLAGS = \
- -I $(srcdir)/.. \
- -Wall -Werror \
- $(LIBINDICATE_CFLAGS)
-
-indicate_alot_LDADD = \
- ../libindicate/libindicate.la \
- $(LIBINDICATE_LIBS)
-
+if HAVE_LIBINDICATEGTK
+EXTRA_PROGRAMS += \
+ listen-and-print \
+ im-client
listen_and_print_SOURCES = \
listen-and-print.c
@@ -40,8 +16,8 @@ listen_and_print_CFLAGS = \
$(LIBINDICATEGTK_CFLAGS)
listen_and_print_LDADD = \
- ../libindicate/libindicate.la \
- ../libindicate-gtk/libindicate-gtk.la \
+ $(top_srcdir)/libindicate/libindicate.la \
+ $(top_srcdir)/libindicate-gtk/libindicate-gtk.la \
$(LIBINDICATE_LIBS) \
$(LIBINDICATEGTK_LIBS)
@@ -55,10 +30,33 @@ im_client_CFLAGS = \
$(LIBINDICATEGTK_CFLAGS)
im_client_LDADD = \
- ../libindicate/libindicate.la \
- ../libindicate-gtk/libindicate-gtk.la \
+ $(top_srcdir)/libindicate/libindicate.la \
+ $(top_srcdir)/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 = \
+ $(top_srcdir)/libindicate/libindicate.la \
+ $(LIBINDICATE_LIBS)
+
+indicate_alot_SOURCES = \
+ indicate-alot.c
+
+indicate_alot_CFLAGS = \
+ -I $(srcdir)/.. \
+ $(LIBINDICATE_CFLAGS)
+
+indicate_alot_LDADD = \
+ $(top_srcdir)/libindicate/libindicate.la \
+ $(LIBINDICATE_LIBS)
show_hide_server_SOURCES = \
show-hide-server.c
@@ -69,7 +66,7 @@ show_hide_server_CFLAGS = \
$(LIBINDICATE_CFLAGS)
show_hide_server_LDADD = \
- ../libindicate/libindicate.la \
+ $(top_srcdir)/libindicate/libindicate.la \
$(LIBINDICATE_LIBS)
examplesdir = $(docdir)/examples/
--- a/libindicate-gtk/Makefile.am
+++ b/libindicate-gtk/Makefile.am
@@ -33,7 +33,7 @@ libindicate_gtk_la_CFLAGS = \
$(LIBINDICATEGTK_CFLAGS)
libindicate_gtk_la_LIBADD = \
- ../libindicate/libindicate.la \
+ $(top_srcdir)/libindicate/libindicate.la \
$(LIBINDICATEGTK_LIBS)
pkgconfig_DATA = indicate-gtk.pc
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-03-31 17:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-31 17:43 [gentoo-commits] gentoo-x86 commit in dev-libs/libindicate/files: libindicate-0.3.6-no-gobject-introspection.patch libindicate-0.3.6-optional-gtk-support.patch Theo Chatzimichos (tampakrap)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox