Fix build with gobject-introspection 0.9, bug #344227 by Mike Auty.

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

4 files changed, 237 insertions, 10 deletions

diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog
index 4fbc4995a302..14eea80b42c3 100644
--- a/net-wireless/gnome-bluetooth/ChangeLog
+++ b/net-wireless/gnome-bluetooth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/gnome-bluetooth
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.83 2010/12/16 23:23:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.84 2010/12/19 11:51:36 pacho Exp $
+
+  19 Dec 2010; Pacho Ramos <pacho@gentoo.org> gnome-bluetooth-2.32.0.ebuild,
+  +files/gnome-bluetooth-2.32.0-introspection-build.patch:
+  Fix build with gobject-introspection 0.9, bug #344227 by Mike Auty.
 
   16 Dec 2010; Gilles Dartiguelongue <eva@gentoo.org> +files/80-rfkill.rules,
   gnome-bluetooth-2.32.0.ebuild:
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index 81ca52b11ed8..6772c35a4b74 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -4,18 +4,19 @@ Hash: SHA1
 AUX 80-rfkill.rules 117 RMD160 78e948840a4359344d3bd565300e4432fe43bf91 SHA1 6a6b28aaf852aae9e419963ddbdb92092825f4ee SHA256 81b3a8a3a3639b6d6024043364ad4917b32a85fd7f766e4051211d388e165798
 AUX gnome-bluetooth-2.30.0-add-pin.patch 838 RMD160 38f83f8aaba9cb8f45f42b0ac7b943eba9234dda SHA1 e03d3a7bcb28d3bb8af59b60a1ec8c76d8bf2613 SHA256 43a9fabca0daf02cf7908d47c7cab5ee3a687d7241adc5af440bc7f593c400f1
 AUX gnome-bluetooth-2.30.0-mounted-failure.patch 1053 RMD160 3f1cceadb563c4fe9672fbe9c6a4dda3926c1c61 SHA1 b1308644e93b691c4e3875407c88c3cad0a34896 SHA256 3da63558ec863549c37f4388c51c5bab31bf2c3d8e68512d49bd69d2eab9626d
+AUX gnome-bluetooth-2.32.0-introspection-build.patch 7550 RMD160 a636566db1be7d38a9ef76b6126af0ab96064ce0 SHA1 91e0b0c8adc4fac6d028b0cf82445a8eea868340 SHA256 65d0326ffc06315d14e1d5790230edcae77b2ecb477c86792fed814639f0ad9f
 DIST gnome-bluetooth-2.28.6.tar.bz2 911443 RMD160 5b435837229c940a2c6a30ff937c05f1f950e1bb SHA1 181f2fe69430e722506f5e6a06bf66a1095a9e72 SHA256 0abfcf93f637c58dc83c5590823452189aecc6d48450f6c98122affc6eb8906b
 DIST gnome-bluetooth-2.30.0.tar.bz2 1015602 RMD160 cc13229f22a09cb72fd1325d0f08bd69f42766e8 SHA1 76183906a0d644547bd4192a43908cdd00292ece SHA256 4caafa8c28195c81d8c51414f3a64489f81b9b46cac56979aeaaff8c9ebb78d4
 DIST gnome-bluetooth-2.32.0.tar.bz2 1231205 RMD160 2000381411f0e0b409d6131b390632b9fcfdace0 SHA1 24d2c416df92098d96eeaa992bfaf122ee65328d SHA256 57b1f06c96a1b85e1c19ff919d708cc38e95edae658881ed99968c325839a973
 EBUILD gnome-bluetooth-2.28.6.ebuild 1147 RMD160 ea0abd0a4d52da6b9dbec7f53343e262be53fd9c SHA1 f775552270033d4213d7a8a64a36a4781dfe0b4e SHA256 cad60450bce94f3a6adf6ab58a5affdb5327ff2075e51f6f28ea6a84ed35ffdd
 EBUILD gnome-bluetooth-2.30.0.ebuild 1551 RMD160 8c43a2615d7c9e702f17afe75fc98ee3fb83c3c6 SHA1 a6c545161c2dec57a478ede74e84ba1c802fa80c SHA256 3daf891c4d9bd7bce3f78b6295d1948115b8cff917d0238e70cfa062467f0ff4
-EBUILD gnome-bluetooth-2.32.0.ebuild 2088 RMD160 8371e4f36a51e70bd537a2d5c9756d363642429e SHA1 b3cc9e08abebc9bde460a2c3cbb752e35e0d63f3 SHA256 7e1214c55547fb8ad4fe4f4a2f4def68f4ded3b1b9b844a0fa8c261e879ec81f
-MISC ChangeLog 14333 RMD160 d768119672a94ce47f0186467130577b4140035a SHA1 98cdfcd0c0773b8d48e0cd71984e5c368c4f1447 SHA256 d43c2ba8b5bde50ad30932690d796eceec94692b71a7901373b02742e488d009
+EBUILD gnome-bluetooth-2.32.0.ebuild 2454 RMD160 66ea1cbfa5cc8b5bd4311e12621893629a85e100 SHA1 5b34167ed676f8ae8693f71439f44c5f71d7fad1 SHA256 8d97e88d9de9f173b1178c1e3c670938b23763ffdbd7fa6e70ccb9854e518a10
+MISC ChangeLog 14542 RMD160 e126e7d53f722d723068953a2ab9f24dd3c4279a SHA1 11cf637fb5dd662bb92686ff69f32d9e2031c4a2 SHA256 983571b90529fb447a786627c2426e6a3b4681fce069e2203c015504c48258c6
 MISC metadata.xml 368 RMD160 2643b5ecedb67f6f0038b48088e7495dd506c0ec SHA1 00f11cbc428d3b7c792d51a7fff725d9035651e7 SHA256 4cbae2ab2ea8b4679a449d08aa9cc35422e211164099fd727fe2d7619cb37176
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0Kn4gACgkQ1fmVwcYIWAaQXgCfZ4i14tsn6Vew6rt/0nNSdlGF
-sz4AoI+KltcgSgFx0gDzDIJeZRVh4ayZ
-=CyBw
+iEYEARECAAYFAk0N8c0ACgkQCaWpQKGI+9Rj9ACeNBkX608tvbOiUsXVlfS9hO2C
+QCQAn2DZrHiVzCNZf4QZSe+531yVnwyf
+=Dt5E
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-introspection-build.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-introspection-build.patch
new file mode 100644
index 000000000000..592f66fcb655
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-introspection-build.patch
@@ -0,0 +1,208 @@
+From a26a8bc169ff2fdc249437c9c6fa9d6aae77b4df Mon Sep 17 00:00:00 2001
+From: Pacho Ramos <pacho@condmat1.ciencias.uniovi.es>
+Date: Thu, 16 Dec 2010 19:15:42 +0000
+Subject: introspection: Fix build with newer g-introspection
+
+Fixes build with gobject-introspection 0.9
+
+https://bugzilla.gnome.org/show_bug.cgi?id=634131
+---
+diff --git a/Makefile.am b/Makefile.am
+index 9391392..f73baf4 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -9,10 +9,9 @@ SUBDIRS = icons lib applet properties wizard sendto $(MOBLIN_DIR) docs po help
+ DIST_SUBDIRS = $(DEF_SUBDIRS) moblin
+ EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in ChangeLog.pre-2.27 gtk-doc.make gnome-doc-utils.make
+ 
+-# FIXME https://bugzilla.gnome.org/show_bug.cgi?id=595675
+ DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install \
+ 	--disable-desktop-update --disable-mime-update --disable-icon-update \
+-	--enable-gtk-doc --disable-scrollkeeper --enable-introspection=no
++	--enable-gtk-doc --disable-scrollkeeper --enable-introspection
+ 
+ DISTCLEANFILES = intltool-extract intltool-update intltool-merge gnome-doc-utils.make
+ 
+diff --git a/acinclude.m4 b/acinclude.m4
+index 5cf8c03..deebd2b 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1,93 +1,3 @@
+-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)"
+-    fi
+-    AC_SUBST(INTROSPECTION_SCANNER)
+-    AC_SUBST(INTROSPECTION_COMPILER)
+-    AC_SUBST(INTROSPECTION_GENERATE)
+-    AC_SUBST(INTROSPECTION_GIRDIR)
+-    AC_SUBST(INTROSPECTION_TYPELIBDIR)
+-
+-    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])
+-])
+-
+-
+ dnl as-ac-expand.m4 0.2.0                                   -*- autoconf -*-
+ dnl autostars m4 macro for expanding directories using configure's prefix
+ 
+diff --git a/configure.ac b/configure.ac
+index 8bbce4e..02aaf5f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -186,7 +186,7 @@ AC_SUBST(DBUS_BINDING_TOOL)
+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+ AC_SUBST(GLIB_GENMARSHAL)
+ 
+-GOBJECT_INTROSPECTION_CHECK([0.6.3])
++GOBJECT_INTROSPECTION_CHECK([0.6.7])
+ 
+ GNOME_COMMON_INIT
+ GNOME_DEBUG_CHECK
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 6da2a9c..f7acece 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -55,41 +55,29 @@ gnomebluetooth_HEADERS =				\
+ 
+ AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\"
+ 
++-include $(INTROSPECTION_MAKEFILE)
++INTROSPECTION_GIRS =
++INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir)
++INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
++
+ if HAVE_INTROSPECTION
+-BUILT_GIRSOURCES += GnomeBluetooth-1.0.gir
++introspection_sources = $(gnomebluetooth_HEADERS)
+ 
+-GnomeBluetooth-1.0.gir: $(libgnome_bluetooth_la_SOURCES)
+-GnomeBluetooth-1.0.gir: $(gnomebluetooth_HEADERS)
+ GnomeBluetooth-1.0.gir: libgnome-bluetooth.la
+-GnomeBluetooth-1.0.gir: $(INTROSPECTION_SCANNER)
+-	$(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace GnomeBluetooth --nsversion=1.0 \
+-		--add-include-path=$(srcdir) --add-include-path=. \
+-		--include=GObject-2.0 \
+-		--include=Gtk-2.0 \
+-		--include=DBusGLib-1.0 \
+-		--include=GModule-2.0 \
+-		--libtool="$(LIBTOOL)" \
+-		--library=gnome-bluetooth \
+-		--output $@ \
+-		--pkg gobject-2.0 \
+-		--pkg gtk+-2.0 \
+-		--pkg dbus-glib-1 \
+-		--pkg gmodule-2.0 \
+-		-I$(srcdir) \
+-		$(LIBGNOMEBT_CFLAGS) \
+-		$(gnomebluetooth_HEADERS)
++GnomeBluetooth_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 DBusGLib-1.0 GModule-2.0
++GnomeBluetooth_1_0_gir_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS)
++GnomeBluetooth_1_0_gir_LIBS = libgnome-bluetooth.la
++GnomeBluetooth_1_0_gir_SCANNERFLAGS = --strip-prefix=Bluetooth --pkg-export=gnome-bluetooth-1.0
++GnomeBluetooth_1_0_gir_FILES = $(introspection_sources)
++INTROSPECTION_GIRS += GnomeBluetooth-1.0.gir
+ 
+ girdir = $(INTROSPECTION_GIRDIR)
+-dist_gir_DATA = $(BUILT_GIRSOURCES)
+ 
+-EXTRA_DIST += $(BUILT_GIRSOURCES)
++gir_DATA = $(INTROSPECTION_GIRS)
+ 
+-typelibsdir = $(INTROSPECTION_TYPELIBDIR)
+-typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
++typelibdir = $(INTROSPECTION_TYPELIBDIR)
++typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+ 
+-%.typelib: %.gir $(G_IR_COMPILER)
+-	$(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@
+-	
+ endif # HAVE_INTROSPECTION
+ 
+ BUILT_SOURCES = marshal.h marshal.c \
+@@ -101,7 +89,7 @@ BUILT_SOURCES = marshal.h marshal.c \
+ 
+ nodist_libcommon_la_SOURCES = $(BUILT_SOURCES)
+ 
+-CLEANFILES = $(BUILT_SOURCES)
++CLEANFILES = $(BUILT_SOURCES) $(gir_DATA) $(typelib_DATA)
+ 
+ noinst_PROGRAMS = test-client test-agent test-deviceselection test-plugins test-class
+ 
+--
+cgit v0.8.3.1
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild
index 1d7f81f2d58f..79dedb547de0 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild,v 1.3 2010/12/16 23:23:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild,v 1.4 2010/12/19 11:51:36 pacho Exp $
 
 EAPI="3"
+GCONF_DEBUG="yes"
 
-inherit eutils gnome2 multilib
+inherit eutils gnome2 multilib autotools
 
 DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME"
 HOMEPAGE="http://live.gnome.org/GnomeBluetooth"
@@ -23,7 +24,8 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.7:2
 RDEPEND="${COMMON_DEPEND}
 	>=net-wireless/bluez-4.34
 	app-mobilephone/obexd
-	sys-fs/udev"
+	sys-fs/udev
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
 DEPEND="${COMMON_DEPEND}
 	!!net-wireless/bluez-gnome
 	app-text/gnome-doc-utils
@@ -35,7 +37,9 @@ DEPEND="${COMMON_DEPEND}
 	x11-libs/libX11
 	x11-libs/libXi
 	x11-proto/xproto
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+	doc? ( >=dev-util/gtk-doc-1.9 )
+	gnome-base/gnome-common
+	dev-util/gtk-doc-am"
 # eautoreconf needs:
 #	gnome-base/gnome-common
 #	dev-util/gtk-doc-am
@@ -52,6 +56,16 @@ pkg_setup() {
 	enewgroup plugdev
 }
 
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix build with gobject-introspection 0.9, bug #344227
+	epatch "${FILESDIR}/${P}-introspection-build.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
 src_install() {
 	gnome2_src_install
 	find "${ED}"/usr/$(get_libdir)/${PN}/plugins -name "*.la" -delete \