Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Theo Chatzimichos (tampakrap)" <tampakrap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/libindicate/files: libindicate-0.4.4-fix-out-of-source-build.patch libindicate-0.4.4-fix-aclocal.patch libindicate-0.4.4-fix-python-version.patch libindicate-0.4.4-fix-introspection.patch libindicate-0.4.4-optional-examples.patch libindicate-0.4.4-optional-gtk.patch libindicate-0.4.4-optional-mono-example.patch libindicate-0.4.4-optional-doc.patch libindicate-0.3.6-optional-gtk-support.patch libindicate-0.3.6-no-gobject-introspection.patch
Date: Mon, 17 Jan 2011 09:34:29
Message-Id: 20110117093419.ED80420054@flycatcher.gentoo.org
1 tampakrap 11/01/17 09:34:19
2
3 Added: libindicate-0.4.4-fix-out-of-source-build.patch
4 libindicate-0.4.4-fix-aclocal.patch
5 libindicate-0.4.4-fix-python-version.patch
6 libindicate-0.4.4-fix-introspection.patch
7 libindicate-0.4.4-optional-examples.patch
8 libindicate-0.4.4-optional-gtk.patch
9 libindicate-0.4.4-optional-mono-example.patch
10 libindicate-0.4.4-optional-doc.patch
11 Removed: libindicate-0.3.6-optional-gtk-support.patch
12 libindicate-0.3.6-no-gobject-introspection.patch
13 Log:
14 Version bump, remove old, ebuild and patches by Dennis Schridde, bug 332375
15
16 (Portage version: 2.2.0_alpha14/cvs/Linux x86_64)
17
18 Revision Changes Path
19 1.1 dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch
20
21 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch?rev=1.1&view=markup
22 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch?rev=1.1&content-type=text/plain
23
24 Index: libindicate-0.4.4-fix-out-of-source-build.patch
25 ===================================================================
26 --- examples/Makefile.am.orig 2010-09-20 23:42:07.380545155 +0200
27 +++ examples/Makefile.am 2010-09-20 23:43:31.231899979 +0200
28 @@ -18,7 +18,7 @@
29 $(LIBINDICATE_CFLAGS)
30
31 indicate_and_crash_LDADD = \
32 - ../libindicate/libindicate.la \
33 + $(top_srcdir)/libindicate/libindicate.la \
34 $(LIBINDICATE_LIBS)
35
36 indicate_alot_SOURCES = \
37 @@ -30,7 +30,7 @@
38 $(LIBINDICATE_CFLAGS)
39
40 indicate_alot_LDADD = \
41 - ../libindicate/libindicate.la \
42 + $(top_srcdir)/libindicate/libindicate.la \
43 $(LIBINDICATE_LIBS)
44
45 listen_and_print_SOURCES = \
46 @@ -43,8 +43,8 @@
47 $(LIBINDICATEGTK_CFLAGS)
48
49 listen_and_print_LDADD = \
50 - ../libindicate/libindicate.la \
51 - ../libindicate-gtk/libindicate-gtk.la \
52 + $(top_srcdir)/libindicate/libindicate.la \
53 + $(top_srcdir)/libindicate-gtk/libindicate-gtk.la \
54 $(LIBINDICATE_LIBS) \
55 $(LIBINDICATEGTK_LIBS)
56
57 @@ -58,8 +58,8 @@
58 $(LIBINDICATEGTK_CFLAGS)
59
60 im_client_LDADD = \
61 - ../libindicate/libindicate.la \
62 - ../libindicate-gtk/libindicate-gtk.la \
63 + $(top_srcdir)/libindicate/libindicate.la \
64 + $(top_srcdir)/libindicate-gtk/libindicate-gtk.la \
65 $(LIBINDICATE_LIBS) \
66 $(LIBINDICATEGTK_LIBS)
67
68 @@ -72,7 +72,7 @@
69 $(LIBINDICATE_CFLAGS)
70
71 show_hide_server_LDADD = \
72 - ../libindicate/libindicate.la \
73 + $(top_srcdir)/libindicate/libindicate.la \
74 $(LIBINDICATE_LIBS)
75
76 python_examples = \
77
78
79
80 1.1 dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch?rev=1.1&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch?rev=1.1&content-type=text/plain
84
85 Index: libindicate-0.4.4-fix-aclocal.patch
86 ===================================================================
87 --- Makefile.am.orig 2010-09-20 23:12:10.442903362 +0200
88 +++ Makefile.am 2010-09-20 23:12:20.591583239 +0200
89 @@ -1,3 +1,4 @@
90 +ACLOCAL_AMFLAGS = -I m4
91
92 SUBDIRS = \
93 libindicate \
94
95
96
97 1.1 dev-libs/libindicate/files/libindicate-0.4.4-fix-python-version.patch
98
99 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-fix-python-version.patch?rev=1.1&view=markup
100 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-fix-python-version.patch?rev=1.1&content-type=text/plain
101
102 Index: libindicate-0.4.4-fix-python-version.patch
103 ===================================================================
104 --- bindings/python/Makefile.am.orig 2010-12-01 11:02:01.089105608 +0100
105 +++ bindings/python/Makefile.am 2010-12-01 11:02:32.619126150 +0100
106 @@ -21,7 +21,7 @@
107 indicatedir = $(pkgpyexecdir)/indicate
108 indicate_LTLIBRARIES = _indicate.la
109
110 -_indicate_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_indicate -lpyglib-2.0-python2.6 -lpython2.6
111 +_indicate_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_indicate -lpyglib-2.0-python@PYTHON_VERSION@ -lpython@PYTHON_VERSION@
112 _indicate_la_LIBADD = $(INDICATE_PYTHON_LIBS) -L$(top_builddir)/libindicate/.libs/ -lindicate -L$(top_builddir)/libindicate-gtk/.libs -lindicate-gtk $(LIBINDICATEGTK_LIBS)
113 _indicate_la_SOURCES = indicatemodule.c
114 nodist__indicate_la_SOURCES = indicate.c
115
116
117
118 1.1 dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch
119
120 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch?rev=1.1&view=markup
121 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch?rev=1.1&content-type=text/plain
122
123 Index: libindicate-0.4.4-fix-introspection.patch
124 ===================================================================
125 --- /dev/null 1970-01-01 01:00:00.000000000 +0100
126 +++ m4//introspection.m4 2010-09-20 23:33:07.134254070 +0200
127 @@ -0,0 +1,94 @@
128 +dnl -*- mode: autoconf -*-
129 +dnl Copyright 2009 Johan Dahlin
130 +dnl
131 +dnl This file is free software; the author(s) gives unlimited
132 +dnl permission to copy and/or distribute it, with or without
133 +dnl modifications, as long as this notice is preserved.
134 +dnl
135 +
136 +# serial 1
137 +
138 +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
139 +[
140 + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
141 + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
142 + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
143 +
144 + dnl enable/disable introspection
145 + m4_if([$2], [require],
146 + [dnl
147 + enable_introspection=yes
148 + ],[dnl
149 + AC_ARG_ENABLE(introspection,
150 + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
151 + [Enable introspection for this build]),,
152 + [enable_introspection=auto])
153 + ])dnl
154 +
155 + AC_MSG_CHECKING([for gobject-introspection])
156 +
157 + dnl presence/version checking
158 + AS_CASE([$enable_introspection],
159 + [no], [dnl
160 + found_introspection="no (disabled, use --enable-introspection to enable)"
161 + ],dnl
162 + [yes],[dnl
163 + PKG_CHECK_EXISTS([gobject-introspection-1.0],,
164 + AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
165 + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
166 + found_introspection=yes,
167 + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
168 + ],dnl
169 + [auto],[dnl
170 + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
171 + ],dnl
172 + [dnl
173 + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
174 + ])dnl
175 +
176 + AC_MSG_RESULT([$found_introspection])
177 +
178 + INTROSPECTION_SCANNER=
179 + INTROSPECTION_COMPILER=
180 + INTROSPECTION_GENERATE=
181 + INTROSPECTION_GIRDIR=
182 + INTROSPECTION_TYPELIBDIR=
183 + if test "x$found_introspection" = "xyes"; then
184 + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
185 + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
186 + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
187 + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
188 + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
189 + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
190 + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
191 + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
192 + fi
193 + AC_SUBST(INTROSPECTION_SCANNER)
194 + AC_SUBST(INTROSPECTION_COMPILER)
195 + AC_SUBST(INTROSPECTION_GENERATE)
196 + AC_SUBST(INTROSPECTION_GIRDIR)
197 + AC_SUBST(INTROSPECTION_TYPELIBDIR)
198 + AC_SUBST(INTROSPECTION_CFLAGS)
199 + AC_SUBST(INTROSPECTION_LIBS)
200 + AC_SUBST(INTROSPECTION_MAKEFILE)
201 +
202 + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
203 +])
204 +
205 +
206 +dnl Usage:
207 +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
208 +
209 +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
210 +[
211 + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
212 +])
213 +
214 +dnl Usage:
215 +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
216 +
217 +
218 +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
219 +[
220 + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
221 +])
222
223
224
225 1.1 dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch
226
227 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch?rev=1.1&view=markup
228 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch?rev=1.1&content-type=text/plain
229
230 Index: libindicate-0.4.4-optional-examples.patch
231 ===================================================================
232 --- examples/Makefile.am.orig 2010-09-20 23:42:07.380545155 +0200
233 +++ examples/Makefile.am 2010-09-20 23:57:17.405792954 +0200
234 @@ -2,7 +2,7 @@
235 CSFILES = IndicatorMonoExample.cs
236 CLEANFILES = $(ASSEMBLY)
237
238 -libexec_PROGRAMS = \
239 +EXTRA_PROGRAMS = \
240 indicate-and-crash \
241 indicate-alot \
242 listen-and-print \
243
244
245
246 1.1 dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch
247
248 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch?rev=1.1&view=markup
249 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch?rev=1.1&content-type=text/plain
250
251 Index: libindicate-0.4.4-optional-gtk.patch
252 ===================================================================
253 --- configure.ac.orig 2010-09-20 23:15:36.692289201 +0200
254 +++ configure.ac 2010-09-20 23:17:50.380918143 +0200
255 @@ -66,12 +66,20 @@
256
257 GDK_PIXBUF_REQUIRED_VERSION=2.12
258
259 +AC_ARG_ENABLE([gtk],
260 + AC_HELP_STRING([--disable-gtk], [Disable libindicate-gtk library]),
261 + [enable_gtk=$enableval], enable_gtk=auto)
262 +AM_CONDITIONAL([WANT_LIBINDICATEGTK], [test "x$enable_gtk" != "xno"])
263 +
264 +if test "x$enable_gtk" != "xno" ; then
265 PKG_CHECK_MODULES(LIBINDICATEGTK, glib-2.0 >= $GLIB_REQUIRED_VERSION
266 gio-2.0 >= $GIO_REQUIRED_VERSION
267 gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION
268 gtk+-2.0 >= $GTK_REQUIRED_VERSION
269 dbusmenu-glib >= $DBUSMENU_REQUIRED_VERSION
270 dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
271 +fi
272 +
273 AC_SUBST(LIBINDICATEGTK_CFLAGS)
274 AC_SUBST(LIBINDICATEGTK_LIBS)
275
276 --- Makefile.am.orig 2010-09-20 23:12:10.442903362 +0200
277 +++ Makefile.am 2010-09-20 23:17:35.141406450 +0200
278 @@ -1,12 +1,15 @@
279
280 SUBDIRS = \
281 libindicate \
282 - libindicate-gtk \
283 bindings \
284 examples \
285 tests \
286 docs
287
288 +if WANT_LIBINDICATEGTK
289 +SUBDIRS += libindicate-gtk
290 +endif
291 +
292 EXTRA_DIST = \
293 COPYING.LGPL.2.1 \
294 gtk-doc.make \
295
296
297
298 1.1 dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch
299
300 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch?rev=1.1&view=markup
301 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch?rev=1.1&content-type=text/plain
302
303 Index: libindicate-0.4.4-optional-mono-example.patch
304 ===================================================================
305 --- examples/Makefile.am.orig 2010-09-20 23:42:07.380545155 +0200
306 +++ examples/Makefile.am 2010-09-20 23:44:49.173431396 +0200
307 @@ -97,5 +97,3 @@
308 $(ASSEMBLY): $(CSFILES) Makefile.am
309 $(CSC) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(references) $(srcdir)/$(CSFILES)
310 chmod a+x indicator-mono-example
311 -
312 -all: $(ASSEMBLY)
313
314
315
316 1.1 dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
317
318 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch?rev=1.1&view=markup
319 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch?rev=1.1&content-type=text/plain
320
321 Index: libindicate-0.4.4-optional-doc.patch
322 ===================================================================
323 --- configure.ac.orig 2010-09-20 23:15:36.692289201 +0200
324 +++ configure.ac 2010-09-20 23:26:30.159014141 +0200
325 @@ -171,8 +171,18 @@
326 # GTK Doc
327 ###########################
328
329 +AC_ARG_ENABLE([doc],
330 + AC_HELP_STRING([--disable-doc], [Disable doc generation]),
331 + [enable_doc=$enableval], enable_doc=auto)
332 +AM_CONDITIONAL([WANT_DOC], [test "x$enable_doc" != "xno"])
333 +
334 GTK_DOC_CHECK([1.4])
335 +if test "x$enable_doc" != "xno" ; then
336 GNOME_DOC_INIT
337 +else
338 +# The initialisation is still needed for certain conditionals to be defined, just make it not output any error
339 +GNOME_DOC_INIT(,,[:])
340 +fi
341 GNOME_COMPILE_WARNINGS
342
343 ##############################
344 --- Makefile.am.orig 2010-09-20 23:12:10.442903362 +0200
345 +++ Makefile.am 2010-09-20 23:27:12.557785756 +0200
346 @@ -5,7 +5,10 @@
347 bindings \
348 examples \
349 - tests \
350 - docs
351 + tests
352 +
353 +if WANT_DOC
354 +SUBDIRS += docs
355 +endif
356
357 EXTRA_DIST = \
358 COPYING.LGPL.2.1 \
Report Message
Find on MARC Find on Google Groups