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.91-optional-mono.patch libindicate-0.4.91-optional-python.patch libindicate-0.4.91-fix-python-version.patch libindicate-0.4.4-mono-parallel-make.patch libindicate-0.4.4-optional-gtk.patch libindicate-0.4.4-optional-doc.patch
Date: Mon, 07 Feb 2011 10:05:45
Message-Id: 20110207100534.ED3AE20054@flycatcher.gentoo.org
1 tampakrap 11/02/07 10:05:34
2
3 Modified: libindicate-0.4.4-optional-gtk.patch
4 libindicate-0.4.4-optional-doc.patch
5 Added: libindicate-0.4.91-optional-mono.patch
6 libindicate-0.4.91-optional-python.patch
7 libindicate-0.4.91-fix-python-version.patch
8 libindicate-0.4.4-mono-parallel-make.patch
9 Log:
10 Revision bump, improved patches, ebuild and patches by Dennis Schridde
11
12 (Portage version: 2.2.0_alpha20/cvs/Linux x86_64)
13
14 Revision Changes Path
15 1.2 dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch
16
17 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch?rev=1.2&view=markup
18 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch?rev=1.2&content-type=text/plain
19 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch?r1=1.1&r2=1.2
20
21 Index: libindicate-0.4.4-optional-gtk.patch
22 ===================================================================
23 RCS file: /var/cvsroot/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch,v
24 retrieving revision 1.1
25 retrieving revision 1.2
26 diff -u -r1.1 -r1.2
27 --- libindicate-0.4.4-optional-gtk.patch 17 Jan 2011 09:34:19 -0000 1.1
28 +++ libindicate-0.4.4-optional-gtk.patch 7 Feb 2011 10:05:34 -0000 1.2
29 @@ -1,42 +1,44 @@
30 --- configure.ac.orig 2010-09-20 23:15:36.692289201 +0200
31 +++ configure.ac 2010-09-20 23:17:50.380918143 +0200
32 -@@ -66,12 +66,20 @@
33 -
34 - GDK_PIXBUF_REQUIRED_VERSION=2.12
35 +@@ -66,3 +66,9 @@
36
37 +AC_ARG_ENABLE([gtk],
38 + AC_HELP_STRING([--disable-gtk], [Disable libindicate-gtk library]),
39 -+ [enable_gtk=$enableval], enable_gtk=auto)
40 ++ [enable_gtk=$enableval], [enable_gtk=auto])
41 +AM_CONDITIONAL([WANT_LIBINDICATEGTK], [test "x$enable_gtk" != "xno"])
42 +
43 -+if test "x$enable_gtk" != "xno" ; then
44 - PKG_CHECK_MODULES(LIBINDICATEGTK, glib-2.0 >= $GLIB_REQUIRED_VERSION
45 - gio-2.0 >= $GIO_REQUIRED_VERSION
46 - gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION
47 - gtk+-2.0 >= $GTK_REQUIRED_VERSION
48 - dbusmenu-glib >= $DBUSMENU_REQUIRED_VERSION
49 - dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
50 -+fi
51 -+
52 ++AS_IF([test "x$enable_gtk" != "xno"],[
53 + GDK_PIXBUF_REQUIRED_VERSION=2.12
54 +
55 +@@ -74,4 +80,7 @@
56 +- dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
57 ++ dbus-glib-1 >= $DBUS_REQUIRED_VERSION,
58 ++ [have_gtk=yes]
59 ++)
60 AC_SUBST(LIBINDICATEGTK_CFLAGS)
61 AC_SUBST(LIBINDICATEGTK_LIBS)
62 ++])
63
64 +@@ -271,2 +280,7 @@
65 +- GObject Introspection: $enable_introspection
66 +-])
67 ++ GObject Introspection: $enable_introspection
68 ++])
69 ++
70 ++AS_IF([test "x$have_gtk" = "xyes"],
71 ++ [AC_MSG_NOTICE([ Gtk: yes])],
72 ++ [AC_MSG_NOTICE([ Gtk: no])]
73 ++)
74 --- Makefile.am.orig 2010-09-20 23:12:10.442903362 +0200
75 +++ Makefile.am 2010-09-20 23:17:35.141406450 +0200
76 -@@ -1,12 +1,15 @@
77 +@@ -1,5 +1,9 @@
78
79 ++if WANT_LIBINDICATEGTK
80 ++LIBINDICATEGTK_SUBDIR = libindicate-gtk
81 ++endif
82 ++
83 SUBDIRS = \
84 libindicate \
85 - libindicate-gtk \
86 ++ $(LIBINDICATEGTK_SUBDIR) \
87 bindings \
88 - examples \
89 - tests \
90 - docs
91 -
92 -+if WANT_LIBINDICATEGTK
93 -+SUBDIRS += libindicate-gtk
94 -+endif
95 -+
96 - EXTRA_DIST = \
97 - COPYING.LGPL.2.1 \
98 - gtk-doc.make \
99
100
101
102 1.2 dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
103
104 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch?rev=1.2&view=markup
105 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch?rev=1.2&content-type=text/plain
106 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch?r1=1.1&r2=1.2
107
108 Index: libindicate-0.4.4-optional-doc.patch
109 ===================================================================
110 RCS file: /var/cvsroot/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch,v
111 retrieving revision 1.1
112 retrieving revision 1.2
113 diff -u -r1.1 -r1.2
114 --- libindicate-0.4.4-optional-doc.patch 17 Jan 2011 09:34:19 -0000 1.1
115 +++ libindicate-0.4.4-optional-doc.patch 7 Feb 2011 10:05:34 -0000 1.2
116 @@ -6,31 +6,40 @@
117
118 +AC_ARG_ENABLE([doc],
119 + AC_HELP_STRING([--disable-doc], [Disable doc generation]),
120 -+ [enable_doc=$enableval], enable_doc=auto)
121 ++ [enable_doc=$enableval], [enable_doc=auto])
122 +AM_CONDITIONAL([WANT_DOC], [test "x$enable_doc" != "xno"])
123 +
124 GTK_DOC_CHECK([1.4])
125 -+if test "x$enable_doc" != "xno" ; then
126 ++AS_IF([test "x$enable_doc" != "xno"],[
127 GNOME_DOC_INIT
128 -+else
129 ++],[
130 +# The initialisation is still needed for certain conditionals to be defined, just make it not output any error
131 +GNOME_DOC_INIT(,,[:])
132 -+fi
133 ++])
134 GNOME_COMPILE_WARNINGS
135
136 ##############################
137 +@@ -271,2 +281,7 @@
138 +- GObject Introspection: $enable_introspection
139 +-])
140 ++ GObject Introspection: $enable_introspection
141 ++])
142 ++
143 ++AM_COND_IF([HAVE_GNOME_DOC_UTILS],
144 ++ [AC_MSG_NOTICE([ Documentation: yes])],
145 ++ [AC_MSG_NOTICE([ Documentation: no])]
146 ++)
147 --- Makefile.am.orig 2010-09-20 23:12:10.442903362 +0200
148 +++ Makefile.am 2010-09-20 23:27:12.557785756 +0200
149 -@@ -5,7 +5,10 @@
150 - bindings \
151 - examples \
152 -- tests \
153 -- docs
154 -+ tests
155 -+
156 +@@ -1,2 +1,6 @@
157 +
158 +if WANT_DOC
159 -+SUBDIRS += docs
160 ++DOC_SUBDIR = docs
161 +endif
162 ++
163 + SUBDIRS = \
164 +@@ -8,3 +12,3 @@
165 + tests \
166 +- docs
167 ++ $(DOC_SUBDIR)
168
169 - EXTRA_DIST = \
170 - COPYING.LGPL.2.1 \
171
172
173
174 1.1 dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch
175
176 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch?rev=1.1&view=markup
177 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch?rev=1.1&content-type=text/plain
178
179 Index: libindicate-0.4.91-optional-mono.patch
180 ===================================================================
181 --- configure.ac.orig 2011-01-29 21:02:19.646030407 +0100
182 +++ configure.ac 2011-01-29 21:12:00.156516831 +0100
183 @@ -91,6 +91,12 @@
184 # Check for Mono support
185 ###########################
186
187 +AC_ARG_ENABLE([mono],
188 + AC_HELP_STRING([--disable-mono], [Disable Mono bindings generation]),
189 + [enable_mono=$enableval], [enable_mono=auto])
190 +AM_CONDITIONAL([WANT_MONO], [test "x$enable_mono" != "xno"])
191 +
192 +AS_IF([test "x$enable_mono" != "xno"],[
193 MONO_REQUIRED_VERSION=1.0
194 PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
195
196 @@ -141,6 +147,7 @@
197 AC_SUBST(GAPI_CODEGEN)
198 AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no)
199 AC_SUBST(GAPI_FIXUP)
200 +])
201
202 ###########################
203 # Check for Python support
204 @@ -273,2 +280,7 @@
205 - GObject Introspection: $enable_introspection
206 -])
207 + GObject Introspection: $enable_introspection
208 +])
209 +
210 +AS_IF([test "x$has_mono" = "xtrue"],
211 + [AC_MSG_NOTICE([ Mono bindings: yes])],
212 + [AC_MSG_NOTICE([ Mono bindings: no])]
213 +)
214 --- bindings/Makefile.am.orig 2011-01-29 21:10:05.095991987 +0100
215 +++ bindings/Makefile.am 2011-01-29 21:11:06.349142195 +0100
216 @@ -1,2 +1,6 @@
217 +if WANT_MONO
218 +MONO_SUBDIR = mono
219 +endif
220 +
221 -SUBDIRS = mono python
222 +SUBDIRS = $(MONO_SUBDIR) python
223
224
225
226
227 1.1 dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch
228
229 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch?rev=1.1&view=markup
230 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch?rev=1.1&content-type=text/plain
231
232 Index: libindicate-0.4.91-optional-python.patch
233 ===================================================================
234 --- configure.ac.orig 2011-01-29 21:51:17.724952231 +0100
235 +++ configure.ac 2011-01-29 21:52:29.969745013 +0100
236 @@ -146,4 +146,14 @@
237 # Check for Python support
238 ###########################
239
240 +AC_ARG_ENABLE([python],
241 + AC_HELP_STRING([--disable-python], [Disable Python bindings generation]),
242 + [enable_python=$enableval], [enable_python=auto])
243 +AM_CONDITIONAL([WANT_PYTHON], [test "x$enable_python" != "xno"])
244 +
245 +AS_IF([test "x$enable_python" != "xno"],[
246 + AS_IF([test "x$have_gtk" != "xyes"],[
247 + AC_MSG_ERROR([Python bindings require GTK support, please --enable-gtk])
248 + ])
249 +
250 AM_PATH_PYTHON(2.3.5)
251 @@ -156,2 +166,4 @@
252 - pygobject-2.0 >= $PYGOBJECT_REQUIRED])
253 + pygobject-2.0 >= $PYGOBJECT_REQUIRED],
254 + [have_python=yes]
255 +)
256
257 @@ -171,6 +183,7 @@
258 PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
259 AC_SUBST(PYGTK_CODEGEN)
260 AC_MSG_RESULT($PYGTK_CODEGEN)
261 +])
262
263 ###########################
264 # GTK Doc
265 @@ -271,2 +284,7 @@
266 - GObject Introspection: $enable_introspection
267 -])
268 + GObject Introspection: $enable_introspection
269 +])
270 +
271 +AS_IF([test "x$have_python" = "xyes"],
272 + [AC_MSG_NOTICE([ Python bindings: yes])],
273 + [AC_MSG_NOTICE([ Python bindings: no])]
274 +)
275 --- bindings/Makefile.am.orig 2011-01-29 21:53:17.826282713 +0100
276 +++ bindings/Makefile.am 2011-01-29 21:53:52.951209371 +0100
277 @@ -1,2 +1,6 @@
278 +if WANT_PYTHON
279 +PYTHON_SUBDIR = python
280 +endif
281 +
282 -SUBDIRS = mono python
283 +SUBDIRS = mono $(PYTHON_SUBDIR)
284
285
286
287
288 1.1 dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch
289
290 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch?rev=1.1&view=markup
291 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch?rev=1.1&content-type=text/plain
292
293 Index: libindicate-0.4.91-fix-python-version.patch
294 ===================================================================
295 --- configure.ac.orig 2011-01-29 21:38:44.667942630 +0100
296 +++ configure.ac 2011-01-29 21:42:03.892863493 +0100
297 @@ -153,15 +153,16 @@
298 -AM_PATH_PYTHON(2.3.5)
299 -AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
300 -
301 +PYTHON_REQUIRED=2.3.5
302 PYGTK_REQUIRED=2.14.0
303 PYGOBJECT_REQUIRED=0.22
304
305 -PKG_CHECK_MODULES(INDICATE_PYTHON, [pygtk-2.0 >= $PYGTK_REQUIRED
306 - pygobject-2.0 >= $PYGOBJECT_REQUIRED],
307 - [have_python=yes]
308 +AM_PATH_PYTHON([$PYTHON_REQUIRED])
309 +AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
310 +
311 +PKG_CHECK_MODULES([INDICATE_PYTHON], [python-$PYTHON_VERSION >= $PYTHON_REQUIRED
312 + pygtk-2.0 >= $PYGTK_REQUIRED
313 + pygobject-2.0 >= $PYGOBJECT_REQUIRED],
314 + [have_python=yes]
315 )
316
317 -INDICATE_PYTHON_LIBS+=$(python$PYTHON_VERSION-config --libs)
318 # libpyglib-2.0-python* doesn't have a pkgconfig unfortunately
319 INDICATE_PYTHON_LIBS+=" -lpyglib-2.0-python$PYTHON_VERSION"
320
321
322
323
324 1.1 dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch
325
326 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch?rev=1.1&view=markup
327 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch?rev=1.1&content-type=text/plain
328
329 Index: libindicate-0.4.4-mono-parallel-make.patch
330 ===================================================================
331 --- bindings/mono/indicate/Makefile.am.orig 2011-01-30 00:14:17.670042664 +0100
332 +++ bindings/mono/indicate/Makefile.am 2011-01-30 00:14:40.204346425 +0100
333 @@ -61,7 +61,8 @@
334 -e "s|PROP_MENU|menu|" \
335 -e "s|PROP_DESKTOP|Desktop|" \
336 -e "s|PROP_DESKTOP|desktop|" \
337 - $< > $@
338 + $< > $@.tmp
339 + mv $@.tmp $@
340
341 api_includes = $(GTK_SHARP_CFLAGS)
Report Message
Find on MARC Find on Google Groups