Fix building with recent gobject-introspection wrt #341549 by Mike Auty.

Package-Manager: portage-2.2_rc96/cvs/Linux x86_64

5 files changed, 219 insertions, 7 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index 51570f3905c4..d8955adc9c3e 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/upower
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.23 2010/10/17 08:16:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.24 2010/10/18 09:45:31 ssuominen Exp $
+
+  18 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> upower-0.9.6.ebuild,
+  +files/upower-0.9.6-introspection.patch,
+  +files/upower-0.9.6-introspection-2.patch:
+  Fix building with recent gobject-introspection wrt #341549 by Mike Auty.
 
 *upower-0.9.6 (17 Oct 2010)
 
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index d095ef927ba2..0af10004b295 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,9 +1,11 @@
 AUX upower-0.9.4-enumerate.patch 847 RMD160 f2487429e40447f3f3216226b8cdac06bc7c00d2 SHA1 86763eeea830e3a2805f3470b3abafbe626e4bc0 SHA256 7314530bb1609d24fa25b04519a8dbbab9378fe0a241d6af1e5a18ccab5160c8
+AUX upower-0.9.6-introspection-2.patch 4913 RMD160 8c564657c46ed8fb462ac897662b2f0dff085662 SHA1 4ecce4e42b977bd06d44dc81357019afbcab7359 SHA256 1bbb8272c3eb7fd377857a60804a97fa8f93c1b41ed474eaece4b30118197937
+AUX upower-0.9.6-introspection.patch 1211 RMD160 1c5f68cd72181e7e98b43e847add7054d7372dd2 SHA1 9fbf83d4a6226e9c5eb9059ac4b907043e70c344 SHA256 4325436699554dae5cc5c3ac4768d40a44f4a708f2f4d3e90ee896c341f72dad
 DIST upower-0.9.4.tar.bz2 468727 RMD160 4403b090e831c63e6ae3846d8ccbc1c7e8d8516c SHA1 35a25ecec2f45a0f92ef5b5f916fca37703b8fac SHA256 39dd138781b2a2d820f1a2bde4ca60dbf99e6def0e0010d4c3d3f4707954a57c
 DIST upower-0.9.5.tar.bz2 473750 RMD160 0d6c84046230b17ee63428df1b103474d920ef93 SHA1 5a4763bcbdf0dae1868f8475d9eebe6188eb89c2 SHA256 b34074a5467d442720f4b5d4cee3946fa41dea932463f5e265deb90ae0e7c7a1
 DIST upower-0.9.6.tar.bz2 453993 RMD160 f1bf3a2138d41bc7c138fb2df2b99980f64ae000 SHA1 4e21c948ac7eda57f9f0ab1fde734315517fe9ac SHA256 aeff4a0c98a12b8beb56ca92314e1e8a6711f13929a294ae3c0a725125a1db4f
 EBUILD upower-0.9.4.ebuild 2087 RMD160 d2c9c8842183225978bb62f4fc76e0ce8238bc7c SHA1 75176fc44625268a49cba4a34e4ae1cc58a5067e SHA256 afb10c591389975bc2f4065704efc5b366405c012da95ef2010fe22be886b2d7
 EBUILD upower-0.9.5.ebuild 2127 RMD160 46dcf2ef5036997ad48d18ed627d8f1474978dd4 SHA1 cc72ee3fd4c3b5ad6d3981e26ceeecd2b40a447f SHA256 1cdf5d4567f9bb36d7736ad6f34ffe13161c39d49609fefc2c80c53860d534fd
-EBUILD upower-0.9.6.ebuild 2061 RMD160 d9b88c61e297c024f6cc870b5cb6f861a3450728 SHA1 e197309ef07e60bebc7746d298fdc43987ea849d SHA256 814a76d7ff7ed67113cac87e22d01b0d86bdc3d6ed47f2a089e6d834c997534c
-MISC ChangeLog 2970 RMD160 634d07b2b3e0a6b4a4c36589d84a5fcded2353f2 SHA1 c87d997910a03a3b3f61845805abb6d7ecfbb7a8 SHA256 35516b3ef552a475d8810e442285e67d1b09027c79f1b62bab6bf9966850b4e5
+EBUILD upower-0.9.6.ebuild 2294 RMD160 8b3ba4efb218587b80fe720760d41121b8ef0027 SHA1 480c007a6c3cfe6a223354c03fe1297fcaae3233 SHA256 9f14fd49794e5f3d9c435ca890c21e7e30e20d69dcf37653b54806edde52c52f
+MISC ChangeLog 3209 RMD160 8c6d1c5b94f3924f6613e3baa4bb70ef99f6977e SHA1 50772f89e56d20b6274e7d44f27e914af020b66e SHA256 73f052ecf22fdd4e6c454820a6173aaa71053ad6f5c914c313ee173f741fab49
 MISC metadata.xml 363 RMD160 7210445bae10f2ddf76edaa8e7144227a03c5de1 SHA1 76f5af45c1a11584d24878ee65e6773757cfa014 SHA256 b24b22d2e371b3ee7165cd9ae1ca6fac72aee10e107c192a4e94686ba95b9093
diff --git a/sys-power/upower/files/upower-0.9.6-introspection-2.patch b/sys-power/upower/files/upower-0.9.6-introspection-2.patch
new file mode 100644
index 000000000000..7bdf57745494
--- /dev/null
+++ b/sys-power/upower/files/upower-0.9.6-introspection-2.patch
@@ -0,0 +1,168 @@
+From 58f3d9fbdff88173276f05e0d6da2cf864758381 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Tue, 05 Oct 2010 10:13:09 +0000
+Subject: Fix up all the warnings when building with new versions of gobject-introspection
+
+---
+diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c
+index 13d5bf7..01ceeb8 100644
+--- a/libupower-glib/up-client.c
++++ b/libupower-glib/up-client.c
+@@ -120,7 +120,7 @@ up_client_get_device (UpClient *client, const gchar *object_path)
+  * You must have called up_client_enumerate_devices_sync() before calling this
+  * function.
+  *
+- * Return value: an array of #UpDevice objects, free with g_ptr_array_unref()
++ * Return value: (transfer full): an array of #UpDevice objects, free with g_ptr_array_unref()
+  *
+  * Since: 0.9.0
+  **/
+diff --git a/libupower-glib/up-device.c b/libupower-glib/up-device.c
+index 41097b2..999f25b 100644
+--- a/libupower-glib/up-device.c
++++ b/libupower-glib/up-device.c
+@@ -568,7 +568,7 @@ out:
+  *
+  * Gets the device history.
+  *
+- * Return value: an array of #UpHistoryItem's, else #NULL and @error is used
++ * Return value: (transfer full): an array of #UpHistoryItem's, else #NULL and @error is used
+  *
+  * Since: 0.9.0
+  **/
+@@ -653,7 +653,7 @@ out:
+  *
+  * Gets the device current statistics.
+  *
+- * Return value: an array of #UpStatsItem's, else #NULL and @error is used
++ * Return value: (transfer full): an array of #UpStatsItem's, else #NULL and @error is used
+  *
+  * Since: 0.9.0
+  **/
+diff --git a/libupower-glib/up-wakeup-item.c b/libupower-glib/up-wakeup-item.c
+index 776473b..7060a3d 100644
+--- a/libupower-glib/up-wakeup-item.c
++++ b/libupower-glib/up-wakeup-item.c
+@@ -66,7 +66,7 @@ G_DEFINE_TYPE (UpWakeupItem, up_wakeup_item, G_TYPE_OBJECT)
+ 
+ /**
+  * up_wakeup_item_get_is_userspace:
+- * @history_item: #UpWakeupItem
++ * @wakeup_item: #UpWakeupItem
+  *
+  * Gets if the item is userspace.
+  *
+@@ -83,7 +83,7 @@ up_wakeup_item_get_is_userspace (UpWakeupItem *wakeup_item)
+ 
+ /**
+  * up_wakeup_item_set_is_userspace:
+- * @history_item: #UpWakeupItem
++ * @wakeup_item: #UpWakeupItem
+  * @is_userspace: the new value
+  *
+  * Sets if the item is userspace.
+@@ -100,7 +100,7 @@ up_wakeup_item_set_is_userspace (UpWakeupItem *wakeup_item, gboolean is_userspac
+ 
+ /**
+  * up_wakeup_item_get_id:
+- * @history_item: #UpWakeupItem
++ * @wakeup_item: #UpWakeupItem
+  *
+  * Gets the item id.
+  *
+@@ -117,7 +117,7 @@ up_wakeup_item_get_id (UpWakeupItem *wakeup_item)
+ 
+ /**
+  * up_wakeup_item_set_id:
+- * @history_item: #UpWakeupItem
++ * @wakeup_item: #UpWakeupItem
+  * @id: the new value
+  *
+  * Sets the item id.
+@@ -134,7 +134,7 @@ up_wakeup_item_set_id (UpWakeupItem *wakeup_item, guint id)
+ 
+ /**
+  * up_wakeup_item_get_old:
+- * @history_item: #UpWakeupItem
++ * @wakeup_item: #UpWakeupItem
+  *
+  * Gets the item old.
+  *
+@@ -151,7 +151,7 @@ up_wakeup_item_get_old (UpWakeupItem *wakeup_item)
+ 
+ /**
+  * up_wakeup_item_set_old:
+- * @history_item: #UpWakeupItem
++ * @wakeup_item: #UpWakeupItem
+  * @old: the new value
+  *
+  * Sets the item old.
+@@ -168,7 +168,7 @@ up_wakeup_item_set_old (UpWakeupItem *wakeup_item, guint old)
+ 
+ /**
+  * up_wakeup_item_get_value:
+- * @history_item: #UpWakeupItem
++ * @wakeup_item: #UpWakeupItem
+  *
+  * Gets the item value.
+  *
+@@ -185,7 +185,7 @@ up_wakeup_item_get_value (UpWakeupItem *wakeup_item)
+ 
+ /**
+  * up_wakeup_item_set_value:
+- * @history_item: #UpWakeupItem
++ * @wakeup_item: #UpWakeupItem
+  * @value: the new value
+  *
+  * Sets the item value.
+@@ -202,7 +202,7 @@ up_wakeup_item_set_value (UpWakeupItem *wakeup_item, gdouble value)
+ 
+ /**
+  * up_wakeup_item_get_cmdline:
+- * @history_item: #UpWakeupItem
++ * @wakeup_item: #UpWakeupItem
+  *
+  * Gets the item cmdline.
+  *
+@@ -219,7 +219,7 @@ up_wakeup_item_get_cmdline (UpWakeupItem *wakeup_item)
+ 
+ /**
+  * up_wakeup_item_set_cmdline:
+- * @history_item: #UpWakeupItem
++ * @wakeup_item: #UpWakeupItem
+  * @cmdline: the new value
+  *
+  * Sets the item cmdline.
+@@ -237,7 +237,7 @@ up_wakeup_item_set_cmdline (UpWakeupItem *wakeup_item, const gchar *cmdline)
+ 
+ /**
+  * up_wakeup_item_get_details:
+- * @history_item: #UpWakeupItem
++ * @wakeup_item: #UpWakeupItem
+  *
+  * Gets the item details.
+  *
+@@ -254,7 +254,7 @@ up_wakeup_item_get_details (UpWakeupItem *wakeup_item)
+ 
+ /**
+  * up_wakeup_item_set_details:
+- * @history_item: #UpWakeupItem
++ * @wakeup_item: #UpWakeupItem
+  * @details: the new value
+  *
+  * Sets the item details.
+diff --git a/libupower-glib/up-wakeups.c b/libupower-glib/up-wakeups.c
+index 1388eab..2843891 100644
+--- a/libupower-glib/up-wakeups.c
++++ b/libupower-glib/up-wakeups.c
+@@ -95,7 +95,7 @@ up_wakeups_get_total_sync (UpWakeups *wakeups, GCancellable *cancellable, GError
+  *
+  * Gets the wakeups data from the daemon.
+  *
+- * Return value: an array of %UpWakeupItem's
++ * Return value: (transfer full): an array of %UpWakeupItem's
+  *
+  * Since: 0.9.1
+  **/
+--
+cgit v0.8.3-6-g21f6
diff --git a/sys-power/upower/files/upower-0.9.6-introspection.patch b/sys-power/upower/files/upower-0.9.6-introspection.patch
new file mode 100644
index 000000000000..53dbe03f9d5d
--- /dev/null
+++ b/sys-power/upower/files/upower-0.9.6-introspection.patch
@@ -0,0 +1,30 @@
+From cfd3641501b23ae68beb9656489e8c3077c3dad5 Mon Sep 17 00:00:00 2001
+From: Edward Sheldrake <ejsheldrake@gmail.com>
+Date: Tue, 05 Oct 2010 10:03:42 +0000
+Subject: Fix building with gobject-introspection 0.9.10
+
+---
+diff --git a/libupower-glib/Makefile.am b/libupower-glib/Makefile.am
+index 83322c4..652f2de 100644
+--- a/libupower-glib/Makefile.am
++++ b/libupower-glib/Makefile.am
+@@ -60,14 +60,15 @@ EXTRA_DIST =							\
+ CLEANFILES = $(BUILT_SOURCES)
+ 
+ if HAVE_INTROSPECTION
+-introspection_sources = $(libupower_glib_la_SOURCES)
++introspection_sources = $(libupower_glib_include_HEADERS) $(libupower_glib_la_SOURCES)
+ 
+ UPowerGlib-1.0.gir: libupower-glib.la
+ UPowerGlib_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+ UPowerGlib_1_0_gir_CFLAGS = $(INCLUDES)
+-PackageKitGlib_1_0_gir_SCANNERFLAGS = --identifier-prefix=Up --warn-all --add-include-path=$(srcdir)
++UPowerGlib_1_0_gir_SCANNERFLAGS = --identifier-prefix=Up --symbol-prefix=up_ --warn-all --add-include-path=$(srcdir)
+ UPowerGlib_1_0_gir_LIBS = libupower-glib.la
+ UPowerGlib_1_0_gir_FILES = $(introspection_sources)
++UPowerGlib_1_0_gir_NAMESPACE = UPowerGlib
+ INTROSPECTION_GIRS += UPowerGlib-1.0.gir
+ 
+ girdir = $(datadir)/gir-1.0
+--
+cgit v0.8.3-6-g21f6
diff --git a/sys-power/upower/upower-0.9.6.ebuild b/sys-power/upower/upower-0.9.6.ebuild
index 75c13ebb51ba..3df722f90e83 100644
--- a/sys-power/upower/upower-0.9.6.ebuild
+++ b/sys-power/upower/upower-0.9.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.6.ebuild,v 1.1 2010/10/17 08:16:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.6.ebuild,v 1.2 2010/10/18 09:45:31 ssuominen Exp $
 
 EAPI=3
-inherit linux-info
+inherit autotools eutils linux-info
 
 DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
 HOMEPAGE="http://upower.freedesktop.org/"
@@ -31,7 +31,8 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.0
 	dev-util/pkgconfig
 	doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2 )"
+		app-text/docbook-xml-dtd:4.1.2 )
+	introspection? ( dev-util/gtk-doc-am )" # eautoreconf
 
 RESTRICT="test" # error getting system bus
 
@@ -45,7 +46,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
+	if use introspection; then
+		sed -i -e '/DISABLE_DEPRECATED/d' configure.ac || die
+		epatch "${FILESDIR}"/${P}-introspection{,-2}.patch
+		eautoreconf
+	else
+		sed -i -e '/DISABLE_DEPRECATED/d' configure || die
+	fi
 }
 
 src_configure() {