summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-11-19 17:49:35 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-11-19 17:49:35 +0000
commitb606c7e57f313cc8c91892b78b3764f36b290a3c (patch)
tree61079575d73f5fecf20e2aff0d4a8de348743f9a /dev-libs/libindicate/files
parentold (diff)
downloadgentoo-2-b606c7e57f313cc8c91892b78b3764f36b290a3c.tar.gz
gentoo-2-b606c7e57f313cc8c91892b78b3764f36b290a3c.tar.bz2
gentoo-2-b606c7e57f313cc8c91892b78b3764f36b290a3c.zip
old
(Portage version: 2.2.0_alpha73/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/libindicate/files')
-rw-r--r--dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch194
-rw-r--r--dev-libs/libindicate/files/libindicate-0.4.4-as-needed-introspection.patch30
-rw-r--r--dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch7
-rw-r--r--dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch97
-rw-r--r--dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch51
-rw-r--r--dev-libs/libindicate/files/libindicate-0.4.4-fix-python-version.patch11
-rw-r--r--dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch12
-rw-r--r--dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch42
-rw-r--r--dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch11
-rw-r--r--dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch44
-rw-r--r--dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch8
-rw-r--r--dev-libs/libindicate/files/libindicate-0.4.4-parallel.patch30
-rw-r--r--dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch26
-rw-r--r--dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch43
-rw-r--r--dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch51
15 files changed, 0 insertions, 657 deletions
diff --git a/dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch b/dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch
deleted file mode 100644
index ed04dc8cefb7..000000000000
--- a/dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-Date: Mon, 23 Nov 2009 23:14:01 +0100
-Subject: Make gtk support optional, Fix some QA
-
----
- Makefile.am | 17 +++++++----
- configure.ac | 23 +++++++++++----
- examples/Makefile.am | 64 ++++++++++++++++++++++---------------------
- libindicate-gtk/Makefile.am | 2 +-
- tests/Makefile.am | 2 +-
- 5 files changed, 63 insertions(+), 45 deletions(-)
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,10 +1,15 @@
-+SUBDIRS = libindicate
-
--SUBDIRS = \
-- libindicate \
-- libindicate-gtk \
-- examples \
-- tests \
-- docs
-+if HAVE_LIBINDICATEGTK
-+SUBDIRS += libindicate-gtk
-+endif
-+
-+SUBDIRS += \
-+ examples \
-+ tests
-+if INSTALL_DOC
-+SUBDIRS += docs
-+endif
-
- EXTRA_DIST = \
- COPYING.LGPL.2.1 \
---- a/configure.ac
-+++ b/configure.ac
-@@ -63,11 +63,18 @@ AC_SUBST(LIBINDICATE_LIBS)
-
- GDK_PIXBUF_REQUIRED_VERSION=2.12
-
--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
-- dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
-+AC_ARG_ENABLE([gtk],
-+ AC_HELP_STRING([--disable-gtk], [Disable libindicator-gtk library]),
-+ [enable_gtk=$enableval], enable_gtk=auto)
-+
-+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
-+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
-+fi
-+AM_CONDITIONAL([HAVE_LIBINDICATEGTK], [test "x$enable_gtk" != "xno"])
- AC_SUBST(LIBINDICATEGTK_CFLAGS)
- AC_SUBST(LIBINDICATEGTK_LIBS)
-
-@@ -103,8 +110,12 @@ AM_CONDITIONAL(USE_GIR, test "x$gir_ok" = "xyes")
- # GTK Doc
- ###########################
-
-+AC_ARG_ENABLE([doc],
-+ AC_HELP_STRING([--disable-doc], [Do not install API doc]),
-+ [enable_doc=$enableval], [enable_doc=auto])
-+AM_CONDITIONAL([INSTALL_DOC], [test "x$enable_doc" != "xno"])
- GTK_DOC_CHECK([1.4])
--GNOME_DOC_INIT
-+#GNOME_DOC_INIT
- GNOME_COMPILE_WARNINGS
-
- ##############################
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -1,33 +1,12 @@
-
--libexec_PROGRAMS = \
-+EXTRA_PROGRAMS = \
- indicate-and-crash \
- indicate-alot \
-- listen-and-print \
-- im-client \
- show-hide-server
--
--indicate_and_crash_SOURCES = \
-- indicate-and-crash.c
--
--indicate_and_crash_CFLAGS = \
-- -I $(srcdir)/.. \
-- $(LIBINDICATE_CFLAGS)
--
--indicate_and_crash_LDADD = \
-- ../libindicate/libindicate.la \
-- $(LIBINDICATE_LIBS)
--
--indicate_alot_SOURCES = \
-- indicate-alot.c
--
--indicate_alot_CFLAGS = \
-- -I $(srcdir)/.. \
-- $(LIBINDICATE_CFLAGS)
--
--indicate_alot_LDADD = \
-- ../libindicate/libindicate.la \
-- $(LIBINDICATE_LIBS)
--
-+if HAVE_LIBINDICATEGTK
-+EXTRA_PROGRAMS += \
-+ listen-and-print \
-+ im-client
- listen_and_print_SOURCES = \
- listen-and-print.c
-
-@@ -37,8 +16,8 @@ listen_and_print_CFLAGS = \
- $(LIBINDICATEGTK_CFLAGS)
-
- listen_and_print_LDADD = \
-- ../libindicate/libindicate.la \
-- ../libindicate-gtk/libindicate-gtk.la \
-+ $(top_srcdir)/libindicate/libindicate.la \
-+ $(top_srcdir)/libindicate-gtk/libindicate-gtk.la \
- $(LIBINDICATE_LIBS) \
- $(LIBINDICATEGTK_LIBS)
-
-@@ -51,10 +30,33 @@ im_client_CFLAGS = \
- $(LIBINDICATEGTK_CFLAGS)
-
- im_client_LDADD = \
-- ../libindicate/libindicate.la \
-- ../libindicate-gtk/libindicate-gtk.la \
-+ $(top_srcdir)/libindicate/libindicate.la \
-+ $(top_srcdir)/libindicate-gtk/libindicate-gtk.la \
- $(LIBINDICATE_LIBS) \
- $(LIBINDICATEGTK_LIBS)
-+endif
-+
-+indicate_and_crash_SOURCES = \
-+ indicate-and-crash.c
-+
-+indicate_and_crash_CFLAGS = \
-+ -I $(srcdir)/.. \
-+ $(LIBINDICATE_CFLAGS)
-+
-+indicate_and_crash_LDADD = \
-+ $(top_srcdir)/libindicate/libindicate.la \
-+ $(LIBINDICATE_LIBS)
-+
-+indicate_alot_SOURCES = \
-+ indicate-alot.c
-+
-+indicate_alot_CFLAGS = \
-+ -I $(srcdir)/.. \
-+ $(LIBINDICATE_CFLAGS)
-+
-+indicate_alot_LDADD = \
-+ $(top_srcdir)/libindicate/libindicate.la \
-+ $(LIBINDICATE_LIBS)
-
- show_hide_server_SOURCES = \
- show-hide-server.c
-@@ -64,7 +66,7 @@ show_hide_server_CFLAGS = \
- $(LIBINDICATE_CFLAGS)
-
- show_hide_server_LDADD = \
-- ../libindicate/libindicate.la \
-+ $(top_srcdir)/libindicate/libindicate.la \
- $(LIBINDICATE_LIBS)
-
- examplesdir = $(docdir)/examples/
---- a/libindicate-gtk/Makefile.am
-+++ b/libindicate-gtk/Makefile.am
-@@ -32,7 +32,7 @@ libindicate_gtk_la_CFLAGS = \
- $(LIBINDICATEGTK_CFLAGS)
-
- libindicate_gtk_la_LIBADD = \
-- ../libindicate/libindicate.la \
-+ $(top_srcdir)/libindicate/libindicate.la \
- $(LIBINDICATEGTK_LIBS)
-
- pkgconfig_DATA = indicate-gtk.pc
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -9,7 +9,7 @@ TESTS = \
- test_indicator_display \
- test_indicator_display_half
-
--libexec_PROGRAMS = \
-+check_PROGRAMS = \
- test-interests-client \
- test-interests-server \
- test-interests-server1 \
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-as-needed-introspection.patch b/dev-libs/libindicate/files/libindicate-0.4.4-as-needed-introspection.patch
deleted file mode 100644
index fda48a86f65c..000000000000
--- a/dev-libs/libindicate/files/libindicate-0.4.4-as-needed-introspection.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- libindicate-gtk/Makefile.am | 2 +-
- libindicate/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libindicate-gtk/Makefile.am b/libindicate-gtk/Makefile.am
-index 9e73402..4527996 100644
---- a/libindicate-gtk/Makefile.am
-+++ b/libindicate-gtk/Makefile.am
-@@ -56,7 +56,7 @@ Indicate-Gtk-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
- --include=GLib-2.0 \
- --include=GdkPixbuf-2.0 \
- --include=Indicate-0.2 \
-- --library=indicate-gtk \
-+ --library=libindicate-gtk.la \
- --add-include-path=$(top_builddir)/libindicate \
- $(LIBINDICATEGTK_CFLAGS) -I$(srcdir) -I$(top_srcdir) \
- --output Indicate-Gtk-0.2.gir $(irscanner_headers) \
-diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am
-index 3703299..22cf1e2 100644
---- a/libindicate/Makefile.am
-+++ b/libindicate/Makefile.am
-@@ -119,7 +119,7 @@ Indicate-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
- --include=GObject-2.0 \
- --include=GLib-2.0 \
- --include=Dbusmenu-Glib-0.2 \
-- --library=indicate \
-+ --library=libindicate.la \
- $(LIBINDICATE_CFLAGS) -I $(srcdir) -I $(top_srcdir) \
- --output Indicate-0.2.gir $(irscanner_headers) \
- $(addprefix --c-include=libindicate/, $(indicate_headers))
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch b/dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch
deleted file mode 100644
index d7184a39ec3e..000000000000
--- a/dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- Makefile.am.orig 2010-09-20 23:12:10.442903362 +0200
-+++ Makefile.am 2010-09-20 23:12:20.591583239 +0200
-@@ -1,3 +1,4 @@
-+ACLOCAL_AMFLAGS = -I m4
-
- SUBDIRS = \
- libindicate \
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch b/dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch
deleted file mode 100644
index e3f17518f50a..000000000000
--- a/dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- /dev/null 1970-01-01 01:00:00.000000000 +0100
-+++ m4//introspection.m4 2010-09-20 23:33:07.134254070 +0200
-@@ -0,0 +1,94 @@
-+dnl -*- mode: autoconf -*-
-+dnl Copyright 2009 Johan Dahlin
-+dnl
-+dnl This file is free software; the author(s) gives unlimited
-+dnl permission to copy and/or distribute it, with or without
-+dnl modifications, as long as this notice is preserved.
-+dnl
-+
-+# serial 1
-+
-+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-+[
-+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-+
-+ dnl enable/disable introspection
-+ m4_if([$2], [require],
-+ [dnl
-+ enable_introspection=yes
-+ ],[dnl
-+ AC_ARG_ENABLE(introspection,
-+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-+ [Enable introspection for this build]),,
-+ [enable_introspection=auto])
-+ ])dnl
-+
-+ AC_MSG_CHECKING([for gobject-introspection])
-+
-+ dnl presence/version checking
-+ AS_CASE([$enable_introspection],
-+ [no], [dnl
-+ found_introspection="no (disabled, use --enable-introspection to enable)"
-+ ],dnl
-+ [yes],[dnl
-+ PKG_CHECK_EXISTS([gobject-introspection-1.0],,
-+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
-+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
-+ found_introspection=yes,
-+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
-+ ],dnl
-+ [auto],[dnl
-+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
-+ ],dnl
-+ [dnl
-+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
-+ ])dnl
-+
-+ AC_MSG_RESULT([$found_introspection])
-+
-+ INTROSPECTION_SCANNER=
-+ INTROSPECTION_COMPILER=
-+ INTROSPECTION_GENERATE=
-+ INTROSPECTION_GIRDIR=
-+ INTROSPECTION_TYPELIBDIR=
-+ if test "x$found_introspection" = "xyes"; then
-+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-+ fi
-+ AC_SUBST(INTROSPECTION_SCANNER)
-+ AC_SUBST(INTROSPECTION_COMPILER)
-+ AC_SUBST(INTROSPECTION_GENERATE)
-+ AC_SUBST(INTROSPECTION_GIRDIR)
-+ AC_SUBST(INTROSPECTION_TYPELIBDIR)
-+ AC_SUBST(INTROSPECTION_CFLAGS)
-+ AC_SUBST(INTROSPECTION_LIBS)
-+ AC_SUBST(INTROSPECTION_MAKEFILE)
-+
-+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-+])
-+
-+
-+dnl Usage:
-+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-+
-+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-+[
-+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-+])
-+
-+dnl Usage:
-+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-+
-+
-+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-+[
-+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-+])
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch b/dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch
deleted file mode 100644
index a87440e605ba..000000000000
--- a/dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- examples/Makefile.am.orig 2010-09-20 23:42:07.380545155 +0200
-+++ examples/Makefile.am 2010-09-20 23:43:31.231899979 +0200
-@@ -18,7 +18,7 @@
- $(LIBINDICATE_CFLAGS)
-
- indicate_and_crash_LDADD = \
-- ../libindicate/libindicate.la \
-+ $(top_srcdir)/libindicate/libindicate.la \
- $(LIBINDICATE_LIBS)
-
- indicate_alot_SOURCES = \
-@@ -30,7 +30,7 @@
- $(LIBINDICATE_CFLAGS)
-
- indicate_alot_LDADD = \
-- ../libindicate/libindicate.la \
-+ $(top_srcdir)/libindicate/libindicate.la \
- $(LIBINDICATE_LIBS)
-
- listen_and_print_SOURCES = \
-@@ -43,8 +43,8 @@
- $(LIBINDICATEGTK_CFLAGS)
-
- listen_and_print_LDADD = \
-- ../libindicate/libindicate.la \
-- ../libindicate-gtk/libindicate-gtk.la \
-+ $(top_srcdir)/libindicate/libindicate.la \
-+ $(top_srcdir)/libindicate-gtk/libindicate-gtk.la \
- $(LIBINDICATE_LIBS) \
- $(LIBINDICATEGTK_LIBS)
-
-@@ -58,8 +58,8 @@
- $(LIBINDICATEGTK_CFLAGS)
-
- im_client_LDADD = \
-- ../libindicate/libindicate.la \
-- ../libindicate-gtk/libindicate-gtk.la \
-+ $(top_srcdir)/libindicate/libindicate.la \
-+ $(top_srcdir)/libindicate-gtk/libindicate-gtk.la \
- $(LIBINDICATE_LIBS) \
- $(LIBINDICATEGTK_LIBS)
-
-@@ -72,7 +72,7 @@
- $(LIBINDICATE_CFLAGS)
-
- show_hide_server_LDADD = \
-- ../libindicate/libindicate.la \
-+ $(top_srcdir)/libindicate/libindicate.la \
- $(LIBINDICATE_LIBS)
-
- python_examples = \
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-fix-python-version.patch b/dev-libs/libindicate/files/libindicate-0.4.4-fix-python-version.patch
deleted file mode 100644
index 198114b65647..000000000000
--- a/dev-libs/libindicate/files/libindicate-0.4.4-fix-python-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bindings/python/Makefile.am.orig 2010-12-01 11:02:01.089105608 +0100
-+++ bindings/python/Makefile.am 2010-12-01 11:02:32.619126150 +0100
-@@ -21,7 +21,7 @@
- indicatedir = $(pkgpyexecdir)/indicate
- indicate_LTLIBRARIES = _indicate.la
-
--_indicate_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_indicate -lpyglib-2.0-python2.6 -lpython2.6
-+_indicate_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_indicate -lpyglib-2.0-python@PYTHON_VERSION@ -lpython@PYTHON_VERSION@
- _indicate_la_LIBADD = $(INDICATE_PYTHON_LIBS) -L$(top_builddir)/libindicate/.libs/ -lindicate -L$(top_builddir)/libindicate-gtk/.libs -lindicate-gtk $(LIBINDICATEGTK_LIBS)
- _indicate_la_SOURCES = indicatemodule.c
- nodist__indicate_la_SOURCES = indicate.c
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
deleted file mode 100644
index 1554b4c14bb8..000000000000
--- a/dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index 21bf198b328d..000000000000
--- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ruN libindicate-0.4.4.orig/Makefile.am libindicate-0.4.4/Makefile.am
---- libindicate-0.4.4.orig/Makefile.am 2010-06-02 21:06:51.000000000 +0200
-+++ libindicate-0.4.4/Makefile.am 2011-04-13 01:06:13.763221971 +0200
-@@ -1,11 +1,15 @@
-
-+if WANT_DOC
-+DOC_SUBDIR = docs
-+endif
-+
- SUBDIRS = \
- libindicate \
- libindicate-gtk \
- bindings \
- examples \
- tests \
-- docs
-+ $(DOC_SUBDIR)
-
- EXTRA_DIST = \
- COPYING.LGPL.2.1 \
-diff -ruN libindicate-0.4.4.orig/configure.ac libindicate-0.4.4/configure.ac
---- libindicate-0.4.4.orig/configure.ac 2010-09-15 18:24:09.000000000 +0200
-+++ libindicate-0.4.4/configure.ac 2011-04-13 01:07:01.744221988 +0200
-@@ -171,8 +171,18 @@
- # GTK Doc
- ###########################
-
-+AC_ARG_ENABLE([doc],
-+ AC_HELP_STRING([--disable-doc], [Disable doc generation]),
-+ [enable_doc=$enableval], [enable_doc=auto])
-+AM_CONDITIONAL([WANT_DOC], [test "x$enable_doc" != "xno"])
-+
- GTK_DOC_CHECK([1.4])
-+AS_IF([test "x$enable_doc" != "xno"],[
- GNOME_DOC_INIT
-+],[
-+# The initialisation is still needed for certain conditionals to be defined, just make it not output any error
-+GNOME_DOC_INIT(,,[:])
-+])
- GNOME_COMPILE_WARNINGS
-
- ##############################
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch b/dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch
deleted file mode 100644
index 8e2e03644040..000000000000
--- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/Makefile.am.orig 2010-09-20 23:42:07.380545155 +0200
-+++ examples/Makefile.am 2010-09-20 23:57:17.405792954 +0200
-@@ -2,7 +2,7 @@
- CSFILES = IndicatorMonoExample.cs
- CLEANFILES = $(ASSEMBLY)
-
--libexec_PROGRAMS = \
-+EXTRA_PROGRAMS = \
- indicate-and-crash \
- indicate-alot \
- listen-and-print \
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
deleted file mode 100644
index 2c5b2592a3b0..000000000000
--- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- configure.ac.orig 2010-09-20 23:15:36.692289201 +0200
-+++ configure.ac 2010-09-20 23:17:50.380918143 +0200
-@@ -66,3 +66,9 @@
-
-+AC_ARG_ENABLE([gtk],
-+ AC_HELP_STRING([--disable-gtk], [Disable libindicate-gtk library]),
-+ [enable_gtk=$enableval], [enable_gtk=auto])
-+AM_CONDITIONAL([WANT_LIBINDICATEGTK], [test "x$enable_gtk" != "xno"])
-+
-+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,5 +1,9 @@
-
-+if WANT_LIBINDICATEGTK
-+LIBINDICATEGTK_SUBDIR = libindicate-gtk
-+endif
-+
- SUBDIRS = \
- libindicate \
-- libindicate-gtk \
-+ $(LIBINDICATEGTK_SUBDIR) \
- bindings \
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch b/dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch
deleted file mode 100644
index 97cb78ce3c44..000000000000
--- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- examples/Makefile.am.orig 2010-09-20 23:42:07.380545155 +0200
-+++ examples/Makefile.am 2010-09-20 23:44:49.173431396 +0200
-@@ -97,5 +97,3 @@
- $(ASSEMBLY): $(CSFILES) Makefile.am
- $(CSC) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(references) $(srcdir)/$(CSFILES)
- chmod a+x indicator-mono-example
--
--all: $(ASSEMBLY)
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-parallel.patch b/dev-libs/libindicate/files/libindicate-0.4.4-parallel.patch
deleted file mode 100644
index bf0828e5ac7b..000000000000
--- a/dev-libs/libindicate/files/libindicate-0.4.4-parallel.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- libindicate-gtk/Makefile.am | 2 +-
- libindicate/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libindicate-gtk/Makefile.am b/libindicate-gtk/Makefile.am
-index 4527996..3fd9c5e 100644
---- a/libindicate-gtk/Makefile.am
-+++ b/libindicate-gtk/Makefile.am
-@@ -47,7 +47,7 @@ BUILT_GIRSOURCES =
-
- irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_gtk_headers))
-
--Indicate-Gtk-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
-+Indicate-Gtk-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) libindicate-gtk.la Makefile.am
- $(INTROSPECTION_SCANNER) \
- -v --namespace Indicate \
- --nsversion=0.2 \
-diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am
-index 22cf1e2..8712b4e 100644
---- a/libindicate/Makefile.am
-+++ b/libindicate/Makefile.am
-@@ -111,7 +111,7 @@ BUILT_GIRSOURCES =
-
- irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_headers))
-
--Indicate-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
-+Indicate-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) libindicate.la Makefile.am
- $(INTROSPECTION_SCANNER) \
- -v --namespace Indicate \
- --nsversion=0.2 \
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
deleted file mode 100644
index c08f982ac7a9..000000000000
--- a/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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"
-
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
deleted file mode 100644
index d663389db9bb..000000000000
--- a/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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
-
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
deleted file mode 100644
index 43d42fbd22fb..000000000000
--- a/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- 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)
-