1 |
tampakrap 10/03/31 17:43:34 |
2 |
|
3 |
Added: libindicate-0.3.6-no-gobject-introspection.patch |
4 |
libindicate-0.3.6-optional-gtk-support.patch |
5 |
Log: |
6 |
Version bump, moved from kde overlay, thanks to Dennis Schridde. Reference launchpad bugs for the patches |
7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-libs/libindicate/files/libindicate-0.3.6-no-gobject-introspection.patch |
11 |
|
12 |
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 |
13 |
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 |
14 |
|
15 |
Index: libindicate-0.3.6-no-gobject-introspection.patch |
16 |
=================================================================== |
17 |
--- configure.ac.orig 2010-03-31 12:42:16.497596552 +0200 |
18 |
+++ configure.ac 2010-03-31 12:42:47.001595062 +0200 |
19 |
@@ -87,6 +87,6 @@ |
20 |
########################### |
21 |
|
22 |
-GOBJECT_INTROSPECTION_CHECK([0.6.3]) |
23 |
+AM_CONDITIONAL([HAVE_INTROSPECTION], [false]) |
24 |
|
25 |
########################### |
26 |
# GTK Doc |
27 |
|
28 |
|
29 |
|
30 |
1.1 dev-libs/libindicate/files/libindicate-0.3.6-optional-gtk-support.patch |
31 |
|
32 |
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 |
33 |
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 |
34 |
|
35 |
Index: libindicate-0.3.6-optional-gtk-support.patch |
36 |
=================================================================== |
37 |
Date: Mon, 23 Nov 2009 23:14:01 +0100 |
38 |
Subject: Make gtk support optional, Fix some QA |
39 |
|
40 |
--- |
41 |
Makefile.am | 17 +++++++---- |
42 |
configure.ac | 23 +++++++++++---- |
43 |
examples/Makefile.am | 64 ++++++++++++++++++++++--------------------- |
44 |
libindicate-gtk/Makefile.am | 2 +- |
45 |
tests/Makefile.am | 2 +- |
46 |
5 files changed, 63 insertions(+), 45 deletions(-) |
47 |
|
48 |
--- a/Makefile.am |
49 |
+++ b/Makefile.am |
50 |
@@ -1,10 +1,15 @@ |
51 |
+SUBDIRS = libindicate |
52 |
|
53 |
-SUBDIRS = \ |
54 |
- libindicate \ |
55 |
- libindicate-gtk \ |
56 |
- examples \ |
57 |
- tests \ |
58 |
- docs |
59 |
+if HAVE_LIBINDICATEGTK |
60 |
+SUBDIRS += libindicate-gtk |
61 |
+endif |
62 |
+ |
63 |
+SUBDIRS += \ |
64 |
+ examples \ |
65 |
+ tests |
66 |
+if INSTALL_DOC |
67 |
+SUBDIRS += docs |
68 |
+endif |
69 |
|
70 |
EXTRA_DIST = \ |
71 |
COPYING.LGPL.2.1 \ |
72 |
--- a/configure.ac |
73 |
+++ b/configure.ac |
74 |
@@ -66,12 +66,19 @@ AC_SUBST(LIBINDICATE_LIBS) |
75 |
|
76 |
GDK_PIXBUF_REQUIRED_VERSION=2.12 |
77 |
|
78 |
+AC_ARG_ENABLE([gtk], |
79 |
+ AC_HELP_STRING([--disable-gtk], [Disable libindicate-gtk library]), |
80 |
+ [enable_gtk=$enableval], enable_gtk=auto) |
81 |
+ |
82 |
+if test "x$enable_gtk" != "xno"; then |
83 |
PKG_CHECK_MODULES(LIBINDICATEGTK, glib-2.0 >= $GLIB_REQUIRED_VERSION |
84 |
gio-2.0 >= $GIO_REQUIRED_VERSION |
85 |
gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION |
86 |
gtk+-2.0 >= $GTK_REQUIRED_VERSION |
87 |
dbusmenu-glib >= $DBUSMENU_REQUIRED_VERSION |
88 |
dbus-glib-1 >= $DBUS_REQUIRED_VERSION) |
89 |
+fi |
90 |
+AM_CONDITIONAL([HAVE_LIBINDICATEGTK], [test "x$enable_gtk" != "xno"]) |
91 |
AC_SUBST(LIBINDICATEGTK_CFLAGS) |
92 |
AC_SUBST(LIBINDICATEGTK_LIBS) |
93 |
|
94 |
@@ -85,8 +92,12 @@ AM_CONDITIONAL(USE_GIR, test "x$gir_ok" = "xyes") |
95 |
# GTK Doc |
96 |
########################### |
97 |
|
98 |
+AC_ARG_ENABLE([doc], |
99 |
+ AC_HELP_STRING([--disable-doc], [Do not install API doc]), |
100 |
+ [enable_doc=$enableval], [enable_doc=auto]) |
101 |
+AM_CONDITIONAL([INSTALL_DOC], [test "x$enable_doc" != "xno"]) |
102 |
GTK_DOC_CHECK([1.4]) |
103 |
-GNOME_DOC_INIT |
104 |
+#GNOME_DOC_INIT |
105 |
GNOME_COMPILE_WARNINGS |
106 |
|
107 |
############################## |
108 |
--- a/examples/Makefile.am |
109 |
+++ b/examples/Makefile.am |
110 |
@@ -1,35 +1,12 @@ |
111 |
|
112 |
-libexec_PROGRAMS = \ |
113 |
+EXTRA_PROGRAMS = \ |
114 |
indicate-and-crash \ |
115 |
indicate-alot \ |
116 |
- listen-and-print \ |
117 |
- im-client \ |
118 |
show-hide-server |
119 |
- |
120 |
-indicate_and_crash_SOURCES = \ |
121 |
- indicate-and-crash.c |
122 |
- |
123 |
-indicate_and_crash_CFLAGS = \ |
124 |
- -I $(srcdir)/.. \ |
125 |
- -Wall -Werror \ |
126 |
- $(LIBINDICATE_CFLAGS) |
127 |
- |
128 |
-indicate_and_crash_LDADD = \ |
129 |
- ../libindicate/libindicate.la \ |
130 |
- $(LIBINDICATE_LIBS) |
131 |
- |
132 |
-indicate_alot_SOURCES = \ |
133 |
- indicate-alot.c |
134 |
- |
135 |
-indicate_alot_CFLAGS = \ |
136 |
- -I $(srcdir)/.. \ |
137 |
- -Wall -Werror \ |
138 |
- $(LIBINDICATE_CFLAGS) |
139 |
- |
140 |
-indicate_alot_LDADD = \ |
141 |
- ../libindicate/libindicate.la \ |
142 |
- $(LIBINDICATE_LIBS) |
143 |
- |
144 |
+if HAVE_LIBINDICATEGTK |
145 |
+EXTRA_PROGRAMS += \ |
146 |
+ listen-and-print \ |
147 |
+ im-client |
148 |
listen_and_print_SOURCES = \ |
149 |
listen-and-print.c |
150 |
|
151 |
@@ -40,8 +16,8 @@ listen_and_print_CFLAGS = \ |
152 |
$(LIBINDICATEGTK_CFLAGS) |
153 |
|
154 |
listen_and_print_LDADD = \ |
155 |
- ../libindicate/libindicate.la \ |
156 |
- ../libindicate-gtk/libindicate-gtk.la \ |
157 |
+ $(top_srcdir)/libindicate/libindicate.la \ |
158 |
+ $(top_srcdir)/libindicate-gtk/libindicate-gtk.la \ |
159 |
$(LIBINDICATE_LIBS) \ |
160 |
$(LIBINDICATEGTK_LIBS) |
161 |
|
162 |
@@ -55,10 +30,33 @@ im_client_CFLAGS = \ |
163 |
$(LIBINDICATEGTK_CFLAGS) |
164 |
|
165 |
im_client_LDADD = \ |
166 |
- ../libindicate/libindicate.la \ |
167 |
- ../libindicate-gtk/libindicate-gtk.la \ |
168 |
+ $(top_srcdir)/libindicate/libindicate.la \ |
169 |
+ $(top_srcdir)/libindicate-gtk/libindicate-gtk.la \ |
170 |
$(LIBINDICATE_LIBS) \ |
171 |
$(LIBINDICATEGTK_LIBS) |
172 |
+endif |
173 |
+ |
174 |
+indicate_and_crash_SOURCES = \ |
175 |
+ indicate-and-crash.c |
176 |
+ |
177 |
+indicate_and_crash_CFLAGS = \ |
178 |
+ -I $(srcdir)/.. \ |
179 |
+ $(LIBINDICATE_CFLAGS) |
180 |
+ |
181 |
+indicate_and_crash_LDADD = \ |
182 |
+ $(top_srcdir)/libindicate/libindicate.la \ |
183 |
+ $(LIBINDICATE_LIBS) |
184 |
+ |
185 |
+indicate_alot_SOURCES = \ |
186 |
+ indicate-alot.c |
187 |
+ |
188 |
+indicate_alot_CFLAGS = \ |
189 |
+ -I $(srcdir)/.. \ |
190 |
+ $(LIBINDICATE_CFLAGS) |
191 |
+ |
192 |
+indicate_alot_LDADD = \ |
193 |
+ $(top_srcdir)/libindicate/libindicate.la \ |
194 |
+ $(LIBINDICATE_LIBS) |
195 |
|
196 |
show_hide_server_SOURCES = \ |
197 |
show-hide-server.c |
198 |
@@ -69,7 +66,7 @@ show_hide_server_CFLAGS = \ |
199 |
$(LIBINDICATE_CFLAGS) |
200 |
|
201 |
show_hide_server_LDADD = \ |
202 |
- ../libindicate/libindicate.la \ |
203 |
+ $(top_srcdir)/libindicate/libindicate.la \ |
204 |
$(LIBINDICATE_LIBS) |
205 |
|
206 |
examplesdir = $(docdir)/examples/ |
207 |
--- a/libindicate-gtk/Makefile.am |
208 |
+++ b/libindicate-gtk/Makefile.am |
209 |
@@ -33,7 +33,7 @@ libindicate_gtk_la_CFLAGS = \ |
210 |
$(LIBINDICATEGTK_CFLAGS) |
211 |
|
212 |
libindicate_gtk_la_LIBADD = \ |
213 |
- ../libindicate/libindicate.la \ |
214 |
+ $(top_srcdir)/libindicate/libindicate.la \ |
215 |
$(LIBINDICATEGTK_LIBS) |
216 |
|
217 |
pkgconfig_DATA = indicate-gtk.pc |