| 1 |
mrpouet 09/10/29 16:27:20 |
| 2 |
|
| 3 |
Modified: libindicate-0.2.3-optional-gtk-support.patch |
| 4 |
Log: |
| 5 |
Fix some QA : do not ever use ../something/something.la, it is prone to breakage(parallel build). Add a missing || die to dodoc. Thanks to EvaSDK |
| 6 |
(Portage version: 2.2_rc46/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 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.2&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.2&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.1&r2=1.2 |
| 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.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- libindicate-0.2.3-optional-gtk-support.patch 29 Oct 2009 15:47:09 -0000 1.1 |
| 22 |
+++ libindicate-0.2.3-optional-gtk-support.patch 29 Oct 2009 16:27:19 -0000 1.2 |
| 23 |
@@ -1,12 +1,13 @@ |
| 24 |
From: Romain Perier <mrpouet@g.o> |
| 25 |
-Date: Thu, 29 Oct 2009 16:21:56 +0100 |
| 26 |
-Subject: Make gtk support optional |
| 27 |
+Date: Thu, 29 Oct 2009 17:19:31 +0100 |
| 28 |
+Subject: Make gtk support optional and fix some QA: do not ever use ../something/something.la, it is prone to breakage (parallel build) |
| 29 |
|
| 30 |
--- |
| 31 |
- Makefile.am | 13 +++++++---- |
| 32 |
- configure.ac | 17 +++++++++++---- |
| 33 |
- examples/Makefile.am | 52 +++++++++++++++++++++++++------------------------ |
| 34 |
- 3 files changed, 47 insertions(+), 35 deletions(-) |
| 35 |
+ Makefile.am | 13 +++++--- |
| 36 |
+ configure.ac | 17 ++++++++--- |
| 37 |
+ examples/Makefile.am | 62 ++++++++++++++++++++++-------------------- |
| 38 |
+ libindicate-gtk/Makefile.am | 2 +- |
| 39 |
+ 4 files changed, 53 insertions(+), 41 deletions(-) |
| 40 |
|
| 41 |
--- a/Makefile.am |
| 42 |
+++ b/Makefile.am |
| 43 |
@@ -93,8 +94,25 @@ |
| 44 |
listen_and_print_SOURCES = \ |
| 45 |
listen-and-print.c |
| 46 |
|
| 47 |
-@@ -55,6 +34,29 @@ im_client_LDADD = \ |
| 48 |
- ../libindicate-gtk/libindicate-gtk.la \ |
| 49 |
+@@ -37,8 +16,8 @@ listen_and_print_CFLAGS = \ |
| 50 |
+ $(LIBINDICATEGTK_CFLAGS) |
| 51 |
+ |
| 52 |
+ listen_and_print_LDADD = \ |
| 53 |
+- ../libindicate/libindicate.la \ |
| 54 |
+- ../libindicate-gtk/libindicate-gtk.la \ |
| 55 |
++ $(top_srcdir)/libindicate/libindicate.la \ |
| 56 |
++ $(top_srcdir)/libindicate-gtk/libindicate-gtk.la \ |
| 57 |
+ $(LIBINDICATE_LIBS) \ |
| 58 |
+ $(LIBINDICATEGTK_LIBS) |
| 59 |
+ |
| 60 |
+@@ -51,10 +30,33 @@ im_client_CFLAGS = \ |
| 61 |
+ $(LIBINDICATEGTK_CFLAGS) |
| 62 |
+ |
| 63 |
+ im_client_LDADD = \ |
| 64 |
+- ../libindicate/libindicate.la \ |
| 65 |
+- ../libindicate-gtk/libindicate-gtk.la \ |
| 66 |
++ $(top_srcdir)/libindicate/libindicate.la \ |
| 67 |
++ $(top_srcdir)/libindicate-gtk/libindicate-gtk.la \ |
| 68 |
$(LIBINDICATE_LIBS) \ |
| 69 |
$(LIBINDICATEGTK_LIBS) |
| 70 |
+endif |
| 71 |
@@ -107,7 +125,7 @@ |
| 72 |
+ $(LIBINDICATE_CFLAGS) |
| 73 |
+ |
| 74 |
+indicate_and_crash_LDADD = \ |
| 75 |
-+ ../libindicate/libindicate.la \ |
| 76 |
++ $(top_srcdir)/libindicate/libindicate.la \ |
| 77 |
+ $(LIBINDICATE_LIBS) |
| 78 |
+ |
| 79 |
+indicate_alot_SOURCES = \ |
| 80 |
@@ -118,9 +136,31 @@ |
| 81 |
+ $(LIBINDICATE_CFLAGS) |
| 82 |
+ |
| 83 |
+indicate_alot_LDADD = \ |
| 84 |
-+ ../libindicate/libindicate.la \ |
| 85 |
++ $(top_srcdir)/libindicate/libindicate.la \ |
| 86 |
+ $(LIBINDICATE_LIBS) |
| 87 |
|
| 88 |
show_hide_server_SOURCES = \ |
| 89 |
show-hide-server.c |
| 90 |
+@@ -64,7 +66,7 @@ show_hide_server_CFLAGS = \ |
| 91 |
+ $(LIBINDICATE_CFLAGS) |
| 92 |
+ |
| 93 |
+ show_hide_server_LDADD = \ |
| 94 |
+- ../libindicate/libindicate.la \ |
| 95 |
++ $(top_srcdir)/libindicate/libindicate.la \ |
| 96 |
+ $(LIBINDICATE_LIBS) |
| 97 |
+ |
| 98 |
+ examplesdir = $(docdir)/examples/ |
| 99 |
+--- a/libindicate-gtk/Makefile.am |
| 100 |
++++ b/libindicate-gtk/Makefile.am |
| 101 |
+@@ -32,7 +32,7 @@ libindicate_gtk_la_CFLAGS = \ |
| 102 |
+ $(LIBINDICATEGTK_CFLAGS) |
| 103 |
+ |
| 104 |
+ libindicate_gtk_la_LIBADD = \ |
| 105 |
+- ../libindicate/libindicate.la \ |
| 106 |
++ $(top_srcdir)/libindicate/libindicate.la \ |
| 107 |
+ $(LIBINDICATEGTK_LIBS) |
| 108 |
+ |
| 109 |
+ pkgconfig_DATA = indicate-gtk.pc |
| 110 |
+-- |
| 111 |
+1.6.5.1 |
Archives