diff options
Diffstat (limited to 'dev-libs/libindicate/files')
6 files changed, 123 insertions, 33 deletions
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch b/dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch new file mode 100644 index 00000000000..1554b4c14bb --- /dev/null +++ b/dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch @@ -0,0 +1,12 @@ +--- 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) + 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 b4f6d6f9dbb..857bc7acd23 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 @@ -21,16 +21,15 @@ ############################## --- 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 \ 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 6376b46d708..90272e341da 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 @@ -1,8 +1,6 @@ --- 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]), @@ -10,33 +8,23 @@ +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 -+ + GDK_PIXBUF_REQUIRED_VERSION=2.12 + +@@ -75,3 +66,4 @@ AC_SUBST(LIBINDICATEGTK_CFLAGS) AC_SUBST(LIBINDICATEGTK_LIBS) ++fi --- 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 \ 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 new file mode 100644 index 00000000000..357c6e3d049 --- /dev/null +++ b/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch @@ -0,0 +1,23 @@ +--- 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 @@ +-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]) ++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) + +-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" + 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 new file mode 100644 index 00000000000..323224ad1c7 --- /dev/null +++ b/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch @@ -0,0 +1,33 @@ +--- 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"]) ++ ++if test "x$enable_mono" != "xno" ; then + 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) ++fi + + ########################### + # Check for Python support +--- 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 + 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 new file mode 100644 index 00000000000..cb058bc7e25 --- /dev/null +++ b/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch @@ -0,0 +1,35 @@ +--- 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 @@ + # 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"]) ++ ++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 ++ + AM_PATH_PYTHON(2.3.5) +@@ -179,6 +185,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 +--- 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) + |