tampakrap 11/01/17 09:34:19
Added: libindicate-0.4.4-fix-out-of-source-build.patch
libindicate-0.4.4-fix-aclocal.patch
libindicate-0.4.4-fix-python-version.patch
libindicate-0.4.4-fix-introspection.patch
libindicate-0.4.4-optional-examples.patch
libindicate-0.4.4-optional-gtk.patch
libindicate-0.4.4-optional-mono-example.patch
libindicate-0.4.4-optional-doc.patch
Removed: libindicate-0.3.6-optional-gtk-support.patch
libindicate-0.3.6-no-gobject-introspection.patch
Log:
Version bump, remove old, ebuild and patches by Dennis Schridde, bug 332375
(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)
Revision Changes Path
1.1 dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch?rev=1.1&content-type=text/plain
Index: libindicate-0.4.4-fix-out-of-source-build.patch
===================================================================
--- 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 = \
1.1 dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch?rev=1.1&content-type=text/plain
Index: libindicate-0.4.4-fix-aclocal.patch
===================================================================
--- 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 \
1.1 dev-libs/libindicate/files/libindicate-0.4.4-fix-python-version.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-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.4-fix-python-version.patch?rev=1.1&content-type=text/plain
Index: libindicate-0.4.4-fix-python-version.patch
===================================================================
--- 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
1.1 dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch?rev=1.1&content-type=text/plain
Index: libindicate-0.4.4-fix-introspection.patch
===================================================================
--- /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])
+])
1.1 dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch?rev=1.1&content-type=text/plain
Index: libindicate-0.4.4-optional-examples.patch
===================================================================
--- 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 \
1.1 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.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch?rev=1.1&content-type=text/plain
Index: libindicate-0.4.4-optional-gtk.patch
===================================================================
--- 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
+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"])
+
+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
+
AC_SUBST(LIBINDICATEGTK_CFLAGS)
AC_SUBST(LIBINDICATEGTK_LIBS)
--- 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 @@
SUBDIRS = \
libindicate \
- libindicate-gtk \
bindings \
examples \
tests \
docs
+if WANT_LIBINDICATEGTK
+SUBDIRS += libindicate-gtk
+endif
+
EXTRA_DIST = \
COPYING.LGPL.2.1 \
gtk-doc.make \
1.1 dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch?rev=1.1&content-type=text/plain
Index: libindicate-0.4.4-optional-mono-example.patch
===================================================================
--- 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)
1.1 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.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch?rev=1.1&content-type=text/plain
Index: libindicate-0.4.4-optional-doc.patch
===================================================================
--- configure.ac.orig 2010-09-20 23:15:36.692289201 +0200
+++ configure.ac 2010-09-20 23:26:30.159014141 +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])
+if test "x$enable_doc" != "xno" ; then
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
##############################
--- 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 \
|
