* [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
@ 2011-02-07 10:05 Theo Chatzimichos (tampakrap)
0 siblings, 0 replies; only message in thread
From: Theo Chatzimichos (tampakrap) @ 2011-02-07 10:05 UTC (permalink / raw
To: gentoo-commits
tampakrap 11/02/07 10:05:34
Modified: libindicate-0.4.4-optional-gtk.patch
libindicate-0.4.4-optional-doc.patch
Added: 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
Log:
Revision bump, improved patches, ebuild and patches by Dennis Schridde
(Portage version: 2.2.0_alpha20/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch
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
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
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
Index: libindicate-0.4.4-optional-gtk.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libindicate-0.4.4-optional-gtk.patch 17 Jan 2011 09:34:19 -0000 1.1
+++ libindicate-0.4.4-optional-gtk.patch 7 Feb 2011 10:05:34 -0000 1.2
@@ -1,42 +1,44 @@
--- configure.ac.orig 2010-09-20 23:15:36.692289201 +0200
+++ configure.ac 2010-09-20 23:17:50.380918143 +0200
-@@ -66,12 +66,20 @@
-
- GDK_PIXBUF_REQUIRED_VERSION=2.12
+@@ -66,3 +66,9 @@
+AC_ARG_ENABLE([gtk],
+ AC_HELP_STRING([--disable-gtk], [Disable libindicate-gtk library]),
-+ [enable_gtk=$enableval], enable_gtk=auto)
++ [enable_gtk=$enableval], [enable_gtk=auto])
+AM_CONDITIONAL([WANT_LIBINDICATEGTK], [test "x$enable_gtk" != "xno"])
+
-+if test "x$enable_gtk" != "xno" ; then
- PKG_CHECK_MODULES(LIBINDICATEGTK, glib-2.0 >= $GLIB_REQUIRED_VERSION
- gio-2.0 >= $GIO_REQUIRED_VERSION
- gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION
- gtk+-2.0 >= $GTK_REQUIRED_VERSION
- dbusmenu-glib >= $DBUSMENU_REQUIRED_VERSION
- dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
-+fi
-+
++AS_IF([test "x$enable_gtk" != "xno"],[
+ GDK_PIXBUF_REQUIRED_VERSION=2.12
+
+@@ -74,4 +80,7 @@
+- dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
++ dbus-glib-1 >= $DBUS_REQUIRED_VERSION,
++ [have_gtk=yes]
++)
AC_SUBST(LIBINDICATEGTK_CFLAGS)
AC_SUBST(LIBINDICATEGTK_LIBS)
++])
+@@ -271,2 +280,7 @@
+- GObject Introspection: $enable_introspection
+-])
++ GObject Introspection: $enable_introspection
++])
++
++AS_IF([test "x$have_gtk" = "xyes"],
++ [AC_MSG_NOTICE([ Gtk: yes])],
++ [AC_MSG_NOTICE([ Gtk: no])]
++)
--- Makefile.am.orig 2010-09-20 23:12:10.442903362 +0200
+++ Makefile.am 2010-09-20 23:17:35.141406450 +0200
-@@ -1,12 +1,15 @@
+@@ -1,5 +1,9 @@
++if WANT_LIBINDICATEGTK
++LIBINDICATEGTK_SUBDIR = libindicate-gtk
++endif
++
SUBDIRS = \
libindicate \
- libindicate-gtk \
++ $(LIBINDICATEGTK_SUBDIR) \
bindings \
- examples \
- tests \
- docs
-
-+if WANT_LIBINDICATEGTK
-+SUBDIRS += libindicate-gtk
-+endif
-+
- EXTRA_DIST = \
- COPYING.LGPL.2.1 \
- gtk-doc.make \
1.2 dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
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
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
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
Index: libindicate-0.4.4-optional-doc.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libindicate-0.4.4-optional-doc.patch 17 Jan 2011 09:34:19 -0000 1.1
+++ libindicate-0.4.4-optional-doc.patch 7 Feb 2011 10:05:34 -0000 1.2
@@ -6,31 +6,40 @@
+AC_ARG_ENABLE([doc],
+ AC_HELP_STRING([--disable-doc], [Disable doc generation]),
-+ [enable_doc=$enableval], enable_doc=auto)
++ [enable_doc=$enableval], [enable_doc=auto])
+AM_CONDITIONAL([WANT_DOC], [test "x$enable_doc" != "xno"])
+
GTK_DOC_CHECK([1.4])
-+if test "x$enable_doc" != "xno" ; then
++AS_IF([test "x$enable_doc" != "xno"],[
GNOME_DOC_INIT
-+else
++],[
+# The initialisation is still needed for certain conditionals to be defined, just make it not output any error
+GNOME_DOC_INIT(,,[:])
-+fi
++])
GNOME_COMPILE_WARNINGS
##############################
+@@ -271,2 +281,7 @@
+- GObject Introspection: $enable_introspection
+-])
++ GObject Introspection: $enable_introspection
++])
++
++AM_COND_IF([HAVE_GNOME_DOC_UTILS],
++ [AC_MSG_NOTICE([ Documentation: yes])],
++ [AC_MSG_NOTICE([ Documentation: no])]
++)
--- Makefile.am.orig 2010-09-20 23:12:10.442903362 +0200
+++ Makefile.am 2010-09-20 23:27:12.557785756 +0200
-@@ -5,7 +5,10 @@
- bindings \
- examples \
-- tests \
-- docs
-+ tests
-+
+@@ -1,2 +1,6 @@
+
+if WANT_DOC
-+SUBDIRS += docs
++DOC_SUBDIR = docs
+endif
++
+ SUBDIRS = \
+@@ -8,3 +12,3 @@
+ tests \
+- docs
++ $(DOC_SUBDIR)
- EXTRA_DIST = \
- COPYING.LGPL.2.1 \
1.1 dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch
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
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
Index: libindicate-0.4.91-optional-mono.patch
===================================================================
--- configure.ac.orig 2011-01-29 21:02:19.646030407 +0100
+++ configure.ac 2011-01-29 21:12:00.156516831 +0100
@@ -91,6 +91,12 @@
# Check for Mono support
###########################
+AC_ARG_ENABLE([mono],
+ AC_HELP_STRING([--disable-mono], [Disable Mono bindings generation]),
+ [enable_mono=$enableval], [enable_mono=auto])
+AM_CONDITIONAL([WANT_MONO], [test "x$enable_mono" != "xno"])
+
+AS_IF([test "x$enable_mono" != "xno"],[
MONO_REQUIRED_VERSION=1.0
PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
@@ -141,6 +147,7 @@
AC_SUBST(GAPI_CODEGEN)
AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no)
AC_SUBST(GAPI_FIXUP)
+])
###########################
# Check for Python support
@@ -273,2 +280,7 @@
- GObject Introspection: $enable_introspection
-])
+ GObject Introspection: $enable_introspection
+])
+
+AS_IF([test "x$has_mono" = "xtrue"],
+ [AC_MSG_NOTICE([ Mono bindings: yes])],
+ [AC_MSG_NOTICE([ Mono bindings: no])]
+)
--- bindings/Makefile.am.orig 2011-01-29 21:10:05.095991987 +0100
+++ bindings/Makefile.am 2011-01-29 21:11:06.349142195 +0100
@@ -1,2 +1,6 @@
+if WANT_MONO
+MONO_SUBDIR = mono
+endif
+
-SUBDIRS = mono python
+SUBDIRS = $(MONO_SUBDIR) python
1.1 dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch
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
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
Index: libindicate-0.4.91-optional-python.patch
===================================================================
--- configure.ac.orig 2011-01-29 21:51:17.724952231 +0100
+++ configure.ac 2011-01-29 21:52:29.969745013 +0100
@@ -146,4 +146,14 @@
# Check for Python support
###########################
+AC_ARG_ENABLE([python],
+ AC_HELP_STRING([--disable-python], [Disable Python bindings generation]),
+ [enable_python=$enableval], [enable_python=auto])
+AM_CONDITIONAL([WANT_PYTHON], [test "x$enable_python" != "xno"])
+
+AS_IF([test "x$enable_python" != "xno"],[
+ AS_IF([test "x$have_gtk" != "xyes"],[
+ AC_MSG_ERROR([Python bindings require GTK support, please --enable-gtk])
+ ])
+
AM_PATH_PYTHON(2.3.5)
@@ -156,2 +166,4 @@
- pygobject-2.0 >= $PYGOBJECT_REQUIRED])
+ pygobject-2.0 >= $PYGOBJECT_REQUIRED],
+ [have_python=yes]
+)
@@ -171,6 +183,7 @@
PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
AC_SUBST(PYGTK_CODEGEN)
AC_MSG_RESULT($PYGTK_CODEGEN)
+])
###########################
# GTK Doc
@@ -271,2 +284,7 @@
- GObject Introspection: $enable_introspection
-])
+ GObject Introspection: $enable_introspection
+])
+
+AS_IF([test "x$have_python" = "xyes"],
+ [AC_MSG_NOTICE([ Python bindings: yes])],
+ [AC_MSG_NOTICE([ Python bindings: no])]
+)
--- bindings/Makefile.am.orig 2011-01-29 21:53:17.826282713 +0100
+++ bindings/Makefile.am 2011-01-29 21:53:52.951209371 +0100
@@ -1,2 +1,6 @@
+if WANT_PYTHON
+PYTHON_SUBDIR = python
+endif
+
-SUBDIRS = mono python
+SUBDIRS = mono $(PYTHON_SUBDIR)
1.1 dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch
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
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
Index: libindicate-0.4.91-fix-python-version.patch
===================================================================
--- configure.ac.orig 2011-01-29 21:38:44.667942630 +0100
+++ configure.ac 2011-01-29 21:42:03.892863493 +0100
@@ -153,15 +153,16 @@
-AM_PATH_PYTHON(2.3.5)
-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
-
+PYTHON_REQUIRED=2.3.5
PYGTK_REQUIRED=2.14.0
PYGOBJECT_REQUIRED=0.22
-PKG_CHECK_MODULES(INDICATE_PYTHON, [pygtk-2.0 >= $PYGTK_REQUIRED
- pygobject-2.0 >= $PYGOBJECT_REQUIRED],
- [have_python=yes]
+AM_PATH_PYTHON([$PYTHON_REQUIRED])
+AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+
+PKG_CHECK_MODULES([INDICATE_PYTHON], [python-$PYTHON_VERSION >= $PYTHON_REQUIRED
+ pygtk-2.0 >= $PYGTK_REQUIRED
+ pygobject-2.0 >= $PYGOBJECT_REQUIRED],
+ [have_python=yes]
)
-INDICATE_PYTHON_LIBS+=$(python$PYTHON_VERSION-config --libs)
# libpyglib-2.0-python* doesn't have a pkgconfig unfortunately
INDICATE_PYTHON_LIBS+=" -lpyglib-2.0-python$PYTHON_VERSION"
1.1 dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch
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
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
Index: libindicate-0.4.4-mono-parallel-make.patch
===================================================================
--- bindings/mono/indicate/Makefile.am.orig 2011-01-30 00:14:17.670042664 +0100
+++ bindings/mono/indicate/Makefile.am 2011-01-30 00:14:40.204346425 +0100
@@ -61,7 +61,8 @@
-e "s|PROP_MENU|menu|" \
-e "s|PROP_DESKTOP|Desktop|" \
-e "s|PROP_DESKTOP|desktop|" \
- $< > $@
+ $< > $@.tmp
+ mv $@.tmp $@
api_includes = $(GTK_SHARP_CFLAGS)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-02-07 10:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-07 10:05 [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 Theo Chatzimichos (tampakrap)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox