| 1 |
scarabeus 09/10/30 00:03:01 |
| 2 |
|
| 3 |
Modified: libindicate-0.2.3-optional-gtk-support.patch |
| 4 |
Log: |
| 5 |
Update the gtk patch to exclude docs too. |
| 6 |
(Portage version: 2.2_rc46/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: libindicate-0.2.3-optional-gtk-support.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- libindicate-0.2.3-optional-gtk-support.patch 29 Oct 2009 16:27:19 -0000 1.2 |
| 22 |
+++ libindicate-0.2.3-optional-gtk-support.patch 30 Oct 2009 00:03:01 -0000 1.3 |
| 23 |
@@ -1,17 +1,17 @@ |
| 24 |
From: Romain Perier <mrpouet@g.o> |
| 25 |
-Date: Thu, 29 Oct 2009 17:19:31 +0100 |
| 26 |
-Subject: Make gtk support optional and fix some QA: do not ever use ../something/something.la, it is prone to breakage (parallel build) |
| 27 |
+Date: Thu, 29 Oct 2009 23:54:53 +0100 |
| 28 |
+Subject: Make gtk support optional, Fix some QA |
| 29 |
|
| 30 |
--- |
| 31 |
- Makefile.am | 13 +++++--- |
| 32 |
- configure.ac | 17 ++++++++--- |
| 33 |
+ Makefile.am | 17 +++++++---- |
| 34 |
+ configure.ac | 23 ++++++++++++---- |
| 35 |
examples/Makefile.am | 62 ++++++++++++++++++++++-------------------- |
| 36 |
libindicate-gtk/Makefile.am | 2 +- |
| 37 |
- 4 files changed, 53 insertions(+), 41 deletions(-) |
| 38 |
+ 4 files changed, 61 insertions(+), 43 deletions(-) |
| 39 |
|
| 40 |
--- a/Makefile.am |
| 41 |
+++ b/Makefile.am |
| 42 |
-@@ -1,9 +1,12 @@ |
| 43 |
+@@ -1,10 +1,15 @@ |
| 44 |
+SUBDIRS = libindicate |
| 45 |
|
| 46 |
-SUBDIRS = \ |
| 47 |
@@ -19,16 +19,20 @@ |
| 48 |
- libindicate-gtk \ |
| 49 |
- examples \ |
| 50 |
- tests \ |
| 51 |
+- docs |
| 52 |
+if HAVE_LIBINDICATEGTK |
| 53 |
+SUBDIRS += libindicate-gtk |
| 54 |
+endif |
| 55 |
+ |
| 56 |
+SUBDIRS += \ |
| 57 |
+ examples \ |
| 58 |
-+ tests \ |
| 59 |
- docs |
| 60 |
++ tests |
| 61 |
++if INSTALL_DOC |
| 62 |
++SUBDIRS += docs |
| 63 |
++endif |
| 64 |
|
| 65 |
EXTRA_DIST = \ |
| 66 |
+ COPYING.LGPL.2.1 \ |
| 67 |
--- a/configure.ac |
| 68 |
+++ b/configure.ac |
| 69 |
@@ -63,11 +63,18 @@ AC_SUBST(LIBINDICATE_LIBS) |
| 70 |
@@ -54,7 +58,21 @@ |
| 71 |
+AM_CONDITIONAL([HAVE_LIBINDICATEGTK], [test "x$enable_gtk" != "xno"]) |
| 72 |
AC_SUBST(LIBINDICATEGTK_CFLAGS) |
| 73 |
AC_SUBST(LIBINDICATEGTK_LIBS) |
| 74 |
- |
| 75 |
+ |
| 76 |
+@@ -103,8 +110,12 @@ AM_CONDITIONAL(USE_GIR, test "x$gir_ok" = "xyes") |
| 77 |
+ # GTK Doc |
| 78 |
+ ########################### |
| 79 |
+ |
| 80 |
++AC_ARG_ENABLE([doc], |
| 81 |
++ AC_HELP_STRING([--disable-doc], [Do not install API doc]), |
| 82 |
++ [enable_doc=$enableval], [enable_doc=auto]) |
| 83 |
++AM_CONDITIONAL([INSTALL_DOC], [test "x$enable_doc" != "xno"]) |
| 84 |
+ GTK_DOC_CHECK([1.4]) |
| 85 |
+-GNOME_DOC_INIT |
| 86 |
++#GNOME_DOC_INIT |
| 87 |
+ GNOME_COMPILE_WARNINGS |
| 88 |
+ |
| 89 |
+ ############################## |
| 90 |
--- a/examples/Makefile.am |
| 91 |
+++ b/examples/Makefile.am |
| 92 |
@@ -2,32 +2,11 @@ |
| 93 |
@@ -161,6 +179,3 @@ |
| 94 |
$(LIBINDICATEGTK_LIBS) |
| 95 |
|
| 96 |
pkgconfig_DATA = indicate-gtk.pc |
| 97 |
--- |
| 98 |
-1.6.5.1 |
| 99 |
- |
Archives