Fixed build failure aginst gnome-base/gnome-settings-daemon-3.2.2 (undefined gsd_pointing_device_plugin_class_finalize); bug #384001 by Allan Gottlieb and others. Patch provided by battle.jerboa@gmail.com.

Package-Manager: portage-2.2.0_alpha89_p3/cvs/Linux x86_64

4 files changed, 42 insertions, 11 deletions

diff --git a/gnome-extra/gpointing-device-settings/ChangeLog b/gnome-extra/gpointing-device-settings/ChangeLog
index 846b5c00bf8c..24106bb7d946 100644
--- a/gnome-extra/gpointing-device-settings/ChangeLog
+++ b/gnome-extra/gpointing-device-settings/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gpointing-device-settings
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gpointing-device-settings/ChangeLog,v 1.16 2011/10/13 23:11:17 pva Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gpointing-device-settings/ChangeLog,v 1.17 2012/03/03 16:04:10 slyfox Exp $
+
+  03 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/gpointing-device-settings-1.5.1-gsd-3.2-fix.patch,
+  gpointing-device-settings-1.5.1-r2.ebuild:
+  Fixed build failure aginst gnome-base/gnome-settings-daemon-3.2.2 (undefined
+  gsd_pointing_device_plugin_class_finalize); bug #384001 by Allan Gottlieb and
+  others. Patch provided by battle.jerboa@gmail.com.
 
   13 Oct 2011; Peter Volkov <pva@gentoo.org>
   -gpointing-device-settings-1.3.2.ebuild,
diff --git a/gnome-extra/gpointing-device-settings/Manifest b/gnome-extra/gpointing-device-settings/Manifest
index 8219bf8f7195..65f1360a47db 100644
--- a/gnome-extra/gpointing-device-settings/Manifest
+++ b/gnome-extra/gpointing-device-settings/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX gpointing-device-settings-1.5.1-crash.patch 1097 RMD160 0d3f8b5ff6beebc9e15539b531d476e310ed79f6 SHA1 a9d843e1fe90223d516a4120b710452dbe3d7bf4 SHA256 84dbd85a86fe05892f035a367271fc633f589742ad62510df94357aae5dfa3d9
+AUX gpointing-device-settings-1.5.1-gsd-3.2-fix.patch 933 RMD160 e5dd4c7e6b3d112773a969c9c2355413eb4383e9 SHA1 aa6c2efc42d8132d694f4b4f76619fa35686901a SHA256 f2f7ad87b538d70ba87f1e07731589723ddc2c95543148fa4676965ecda553ec
 AUX gpointing-device-settings-1.5.1-gsd-crash.patch 2062 RMD160 36932390272a60f6bbd3b0ba4f9b8223431cad89 SHA1 ae4b448f8c378b513bd5a503be5163584a6ed156 SHA256 73260c4d4e4b4d1c6e8493fba77841fd57101019a3416d2a7bc1609f8d7ba3fd
 AUX gpointing-device-settings-1.5.1-gtk22.patch 8272 RMD160 9caaf6b1ddc894deb2f700734d2919cb36fba55c SHA1 f2f84cafc51af6a71f6f565bd8ac99202d505e42 SHA256 b8fa0c56351d6bd65a3709e34d10903bee1c761fe1b57acefdff3c03a4e6553a
 AUX gpointing-device-settings-1.5.1-plugin.patch 5068 RMD160 c8a51a1c82182596ef170233cb914d621c8b0a92 SHA1 347c8f342675683ebb5a95ad1138790e741fb1df SHA256 f74bb7c430ceafaccf31c783c252ccd1e911ef21c414d89ace687dabf0d0df2d
 AUX gpointing-device-settings-1.5.1-reboot.patch 9300 RMD160 9d20c01fb17fb9579c7d61afb94e28e0067094ae SHA1 993ee1f1001889dc4c76e0f3a4deccaec68e7dbc SHA256 bfddd39c350aeddd64de846c5bb37d54e23f72d525a183f3e5f56026196164b2
 DIST gpointing-device-settings-1.5.1.tar.gz 458352 RMD160 93b2f30d2cdfe643c745fb5163dd8c93a6369d3d SHA1 7f7e2fa02efdcc597dd6f3713f2c52325b00c26c SHA256 cccdbb5cd3ea18b9458ca23fd3bfbdc98410917f2037472b08ac239dbd2639b3
-EBUILD gpointing-device-settings-1.5.1-r2.ebuild 1288 RMD160 d36e928410ec3af9b22e6e4f7b315b41e8d6ee47 SHA1 4d5c17f6b43e5da820a1eae057c55e97b8edbd77 SHA256 b750ae3fc31daa67c0ab7b83b1b95d93be95eff1a9ad833f71a82d6b2e0c60eb
-MISC ChangeLog 3526 RMD160 e24fb8d8de72d4c61dc2a59d3b4afe0055edd953 SHA1 6227de4384c1ddee323cdcaa24aecd531a7f13e9 SHA256 bbbd9b6fa49d9c6a19e07af15430d4260cf67d7a4250f09e911967b4b67854cf
+EBUILD gpointing-device-settings-1.5.1-r2.ebuild 1325 RMD160 d12090ea713aa7e4741a17c9ce67fcb44ad1a228 SHA1 adaf1b604844fbf5e73a0bd008872a3b0bcd89aa SHA256 7148ec87aac327ec3de1707ebf292a7bbce7c7d4fb7e17e3d5a44f297a29d423
+MISC ChangeLog 3901 RMD160 cb57a2a9b5501c74f177f1b5ea3e98c972263da5 SHA1 801b76bee62aecc2683c4eed3af953c57055c45b SHA256 374ad4461daaf775283d92ab28220d815240d7e979d3c791b7fe9f1bf0d49ae6
 MISC metadata.xml 228 RMD160 bcdd76c994501350b97e70c443e09ebf3172df41 SHA1 1a35ed2e9e695b6f228703fce8baf6c3a5ae71d0 SHA256 c1d5f02bf3a5a5a936093a7df8732f0d4ae6cda289d1f24f938651a98e2809cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6Xb6kACgkQGrk+8vGYmwdGAwD+JhLd+w/7OsIDhDbpPfxsDcOj
-zxAyCS3OCDbqw+x9/aQA/i2eQeLfngkettYYwzLF6yKckLhi/MS/GC/dhgHzAh+O
-=Wapo
+iEYEARECAAYFAk9SQhQACgkQcaHudmEf86oAogCfR6PIkjlF/evXf4EvYSAecvmR
+c/IAnRPQH6WWEH+lDZyRaGRlo02aAAR/
+=0VHm
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-3.2-fix.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-3.2-fix.patch
new file mode 100644
index 000000000000..c92f0bd54c95
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-3.2-fix.patch
@@ -0,0 +1,22 @@
+Fixes build failnure on gnome-base/gnome-settings-daemon-3.2.2
+
+ gsd-pointing-device-plugin.c:59:1: warning: 'gsd_pointing_device_plugin_class_finalize' used but never defined [enabled by default]
+  CCLD   libpointing-device.la
+  ld: .libs/libpointing_device_la-gsd-pointing-device-plugin.o: relocation R_X86_64_PC32 against undefined symbol `gsd_pointing_device_plugin_class_finalize'
+
+Gentoo-bug: http://bugs.gentoo.org/384001
+Patch-by: battle.jerboa@gmail.com
+--- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c	2012-02-02 13:32:20.000000000 +0400
++++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c	2012-02-02 13:32:04.000000000 +0400
+@@ -214,6 +214,11 @@
+     plugin_class->activate = activate;
+     plugin_class->deactivate = deactivate;
+ }
++
++static void
++gsd_pointing_device_plugin_class_finalize (GsdPointingDevicePluginClass *klass)
++{
++}
+ /*
+ vi:ts=4:nowrap:ai:expandtab:sw=4
+ */
diff --git a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r2.ebuild b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r2.ebuild
index d5f177de97b2..7aa3482b0a81 100644
--- a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r2.ebuild
+++ b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r2.ebuild,v 1.5 2011/10/13 21:23:23 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r2.ebuild,v 1.6 2012/03/03 16:04:10 slyfox Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -36,7 +36,8 @@ src_prepare() {
 		"${FILESDIR}/${P}-plugin.patch" \
 		"${FILESDIR}/${P}-reboot.patch" \
 		"${FILESDIR}/${P}-gtk22.patch" \
-		"${FILESDIR}/${P}-gsd-crash.patch"
+		"${FILESDIR}/${P}-gsd-crash.patch" \
+		"${FILESDIR}/${P}-gsd-3.2-fix.patch"
 	sed 's|\(^GPDS_CFLAGS=.*-D[A-Z_]*_DISABLE_DEPRECATED.*\)|#\1|' \
 		-i configure.ac || die
 	eautoreconf