diff options
Diffstat (limited to 'dev-libs/libindicate/files')
5 files changed, 78 insertions, 25 deletions
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch b/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch index 857bc7acd23..13c09f90fc8 100644 --- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch +++ b/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch @@ -6,19 +6,29 @@ +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 @@ -1,2 +1,6 @@ diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch b/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch index 90272e341da..2c5b2592a3b 100644 --- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch +++ b/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch @@ -4,17 +4,31 @@ +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 ++AS_IF([test "x$enable_gtk" != "xno"],[ GDK_PIXBUF_REQUIRED_VERSION=2.12 -@@ -75,3 +66,4 @@ +@@ -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) -+fi ++]) +@@ -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,5 +1,9 @@ diff --git a/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch b/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch index 357c6e3d049..c08f982ac7a 100644 --- a/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch +++ b/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch @@ -1,6 +1,6 @@ --- configure.ac.orig 2011-01-29 21:38:44.667942630 +0100 +++ configure.ac 2011-01-29 21:42:03.892863493 +0100 -@@ -153,13 +153,14 @@ +@@ -153,15 +153,16 @@ -AM_PATH_PYTHON(2.3.5) -AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) - @@ -9,13 +9,16 @@ PYGOBJECT_REQUIRED=0.22 -PKG_CHECK_MODULES(INDICATE_PYTHON, [pygtk-2.0 >= $PYGTK_REQUIRED -- pygobject-2.0 >= $PYGOBJECT_REQUIRED]) -+AM_PATH_PYTHON($PYTHON_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) ++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 diff --git a/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch b/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch index 323224ad1c7..d663389db9b 100644 --- a/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch +++ b/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch @@ -6,10 +6,10 @@ +AC_ARG_ENABLE([mono], + AC_HELP_STRING([--disable-mono], [Disable Mono bindings generation]), -+ [enable_mono=$enableval], enable_mono=auto) ++ [enable_mono=$enableval], [enable_mono=auto]) +AM_CONDITIONAL([WANT_MONO], [test "x$enable_mono" != "xno"]) + -+if test "x$enable_mono" != "xno" ; then ++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) @@ -17,10 +17,20 @@ AC_SUBST(GAPI_CODEGEN) AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no) AC_SUBST(GAPI_FIXUP) -+fi ++]) ########################### # 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 @@ diff --git a/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch b/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch index cb058bc7e25..43d42fbd22f 100644 --- a/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch +++ b/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch @@ -1,28 +1,44 @@ --- configure.ac.orig 2011-01-29 21:51:17.724952231 +0100 +++ configure.ac 2011-01-29 21:52:29.969745013 +0100 -@@ -153,4 +153,14 @@ +@@ -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) ++ [enable_python=$enableval], [enable_python=auto]) +AM_CONDITIONAL([WANT_PYTHON], [test "x$enable_python" != "xno"]) + -+if test "x$enable_python" != "xno" ; then -+if test "x$enable_gtk" = "xno" ; then -+ AC_MSG_ERROR([Python bindings require GTK support, please --enable-gtk]) -+fi ++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) -@@ -179,6 +185,7 @@ +@@ -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) -+fi ++]) ########################### # 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 @@ |