diff options
| author | Dennis Schridde <devurandom@gmx.net> | 2010-09-21 00:04:26 +0200 |
|---|---|---|
| committer | Dennis Schridde <devurandom@gmx.net> | 2010-09-21 00:04:26 +0200 |
| commit | beff862e912304affffed42b41754449961f74d7 (patch) | |
| tree | 14a1a2ae1851c0e0fe11373d01123d9ccb4cdfd4 /dev-libs/libindicate/files | |
| parent | 5bea205e1cd76e4acdd23777dca4833b1cecbd7f (diff) | |
| download | kde-beff862e912304affffed42b41754449961f74d7.tar.gz kde-beff862e912304affffed42b41754449961f74d7.tar.bz2 kde-beff862e912304affffed42b41754449961f74d7.zip | |
[dev-libs/libindicate] Version bump: 0.3.6 to 0.4.4
Warning: This still contains an awful lot of automagic dependencies!
(Portage version: 2.2_rc85/git/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-libs/libindicate/files')
5 files changed, 207 insertions, 0 deletions
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 new file mode 100644 index 00000000000..65d63efe30d --- /dev/null +++ b/dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch @@ -0,0 +1,104 @@ +--- 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 \ +--- /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 new file mode 100644 index 00000000000..a87440e605b --- /dev/null +++ b/dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch @@ -0,0 +1,51 @@ +--- 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-optional-doc.patch b/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch new file mode 100644 index 00000000000..c18138afb99 --- /dev/null +++ b/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch @@ -0,0 +1,33 @@ +--- configure.ac.orig 2010-09-20 23:15:36.692289201 +0200 ++++ configure.ac 2010-09-20 23:26:30.159014141 +0200 +@@ -171,8 +171,15 @@ + # 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]) ++if test "x$enable_doc" != "xno" ; then + GNOME_DOC_INIT ++fi + GNOME_COMPILE_WARNINGS + + ############################## +--- 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 ++ ++if WANT_DOC ++SUBDIRS += docs ++endif + + EXTRA_DIST = \ + COPYING.LGPL.2.1 \ 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 new file mode 100644 index 00000000000..8e2e0364404 --- /dev/null +++ b/dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch @@ -0,0 +1,11 @@ +--- 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-mono-example.patch b/dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch new file mode 100644 index 00000000000..97cb78ce3c4 --- /dev/null +++ b/dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch @@ -0,0 +1,8 @@ +--- 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) |
