Added patch to fix crash on VT switch (bug #345343, thanks to Alexandre Rostovtsev for the patch and Robert Swain for the analysis), removed our own desktop entry (bug #345959).

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

4 files changed, 89 insertions, 12 deletions

diff --git a/gnome-extra/gpointing-device-settings/ChangeLog b/gnome-extra/gpointing-device-settings/ChangeLog
index 91ac6fa46090..9e5f2573af85 100644
--- a/gnome-extra/gpointing-device-settings/ChangeLog
+++ b/gnome-extra/gpointing-device-settings/ChangeLog
@@ -1,6 +1,15 @@
 # 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.9 2011/02/13 12:39:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gpointing-device-settings/ChangeLog,v 1.10 2011/02/24 09:30:11 dev-zero Exp $
+
+*gpointing-device-settings-1.5.1-r2 (24 Feb 2011)
+
+  24 Feb 2011; Tiziano Müller <dev-zero@gentoo.org>
+  +gpointing-device-settings-1.5.1-r2.ebuild,
+  +files/gpointing-device-settings-1.5.1-gsd-crash.patch:
+  Added patch to fix crash on VT switch (bug #345343, thanks to Alexandre
+  Rostovtsev for the patch and Robert Swain for the analysis), removed our own
+  desktop entry (bug #345959).
 
   13 Feb 2011; Pacho Ramos <pacho@gentoo.org>
   gpointing-device-settings-1.5.1.ebuild:
diff --git a/gnome-extra/gpointing-device-settings/Manifest b/gnome-extra/gpointing-device-settings/Manifest
index 0234f12eb5a5..c1c745f50a40 100644
--- a/gnome-extra/gpointing-device-settings/Manifest
+++ b/gnome-extra/gpointing-device-settings/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-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-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
@@ -9,13 +7,7 @@ DIST gpointing-device-settings-1.3.2.tar.gz 423274 RMD160 8aa662e2513b0f27eccc10
 DIST gpointing-device-settings-1.5.1.tar.gz 458352 RMD160 93b2f30d2cdfe643c745fb5163dd8c93a6369d3d SHA1 7f7e2fa02efdcc597dd6f3713f2c52325b00c26c SHA256 cccdbb5cd3ea18b9458ca23fd3bfbdc98410917f2037472b08ac239dbd2639b3
 EBUILD gpointing-device-settings-1.3.2.ebuild 1052 RMD160 537d89da0a653cac5ae72df4f20a05898a51784b SHA1 52dca3f9f8c44f08c157a6d95d1b6519e06ad93f SHA256 1e82640bb60b862a68a94336da292e62880f2c59ded0dd94fda03fc3d3b4f964
 EBUILD gpointing-device-settings-1.5.1-r1.ebuild 1329 RMD160 9ee84eb89e1ced0b52295d7c938daac2ace43ff1 SHA1 97aaf7bb229a02ba552f9ce750aae8886d325ff8 SHA256 54022895752ab774b8802e96892337aa12b15382d65f075c212b432d8c19be36
+EBUILD gpointing-device-settings-1.5.1-r2.ebuild 1168 RMD160 d7afe01d0ba26a2f2a8c58d1bb243ca0f83e7e89 SHA1 9f960fc51def1e7fe56c563b7a8be6722d3b2565 SHA256 b06c21e1a504bbc891c72e3deb8dbe39bb3e8e36677e64b5bcc928500a64433c
 EBUILD gpointing-device-settings-1.5.1.ebuild 1365 RMD160 ffbdf14d1b56085efd2516009a264399927ff361 SHA1 58075f5b6660026ecb6c91eab7cce778d00b751a SHA256 8dd353636a563a4bf687a4d2531274843e7c2f25e03f26206f772c21ea261d47
-MISC ChangeLog 2145 RMD160 1ca8b82f62097000123e938955eea6a1c38ab14f SHA1 92ab6a50d53247499b7edf0da7bdc954c8606809 SHA256 0acdc5e66bff5c63c422d3238dcc89a951c70f1a8c39043bac9aea35f3bdc7ff
+MISC ChangeLog 2542 RMD160 5032333e6a21086e243a22dd9c5aee12fc2edbe5 SHA1 55dd3fd11aee5b7a0b57c31fbe154d5b19d5b2e7 SHA256 afc08b9910a6ed2ca3703978b34797e12650f19e344f01a68a52ae105670584d
 MISC metadata.xml 250 RMD160 f27bc8272125f15d03c2bfc87e961842bdb303ae SHA1 c4991bbfca89085d81f56ed53f8b0c827a35a4f1 SHA256 68999dde540491efec63a8f47366dbc2d5f2c9f2c1211709d92366a56b6cd27d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk1X0SAACgkQCaWpQKGI+9QhCQCePJtqy9Vo7m3bWhWjttvvTyYM
-knQAnRQrC4vNssVokU8bZDWrkAQMWQta
-=YKbE
------END PGP SIGNATURE-----
diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch
new file mode 100644
index 000000000000..f694556b74ec
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch
@@ -0,0 +1,35 @@
+diff -ru gpointing-device-settings-1.5.1-orig/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c gpointing-device-settings-1.5.1/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
+--- gpointing-device-settings-1.5.1-orig/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c	2010-12-20 01:29:09.204274003 -0500
++++ gpointing-device-settings-1.5.1/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c	2010-12-20 02:15:21.652274002 -0500
+@@ -96,19 +96,21 @@
+         XDevicePresenceNotifyEvent *notify_event = (XDevicePresenceNotifyEvent *)xev;
+ 
+         device_info = gpds_xinput_utils_get_device_info_from_id(notify_event->deviceid, NULL);
+-        if (notify_event->devchange == DeviceEnabled) {
+-            GsdPointingDeviceManager *manager;
++        if (device_info) {
++            if (notify_event->devchange == DeviceEnabled) {
++                GsdPointingDeviceManager *manager;
+ 
+-            if (has_manager(plugin, device_info->name))
+-                return GDK_FILTER_CONTINUE;
++                if (has_manager(plugin, device_info->name))
++                    return GDK_FILTER_CONTINUE;
+ 
+-            manager = gsd_pointing_device_manager_new(gdk_x11_get_xatom_name(device_info->type),
+-                                                      device_info->name);
+-            if (manager) {
+-                gsd_pointing_device_manager_start(manager, NULL);
+-                plugin->managers = g_list_prepend(plugin->managers, manager);
++                manager = gsd_pointing_device_manager_new(gdk_x11_get_xatom_name(device_info->type),
++                                                          device_info->name);
++                if (manager) {
++                    gsd_pointing_device_manager_start(manager, NULL);
++                    plugin->managers = g_list_prepend(plugin->managers, manager);
++                }
++            } else if (notify_event->devchange == DeviceRemoved) {
+             }
+-        } else if (notify_event->devchange == DeviceRemoved) {
+         }
+     }
+ 
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
new file mode 100644
index 000000000000..3003b05ec5db
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 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.1 2011/02/24 09:30:11 dev-zero Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+inherit eutils gnome2
+
+DESCRIPTION="A GTK+ based configuration utility for the synaptics driver"
+HOMEPAGE="http://live.gnome.org/GPointingDeviceSettings"
+SRC_URI="mirror://sourceforge.jp/gsynaptics/45812/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# recent enough x11-base/xorg-server required
+RDEPEND=">=dev-libs/glib-2.10
+	>=x11-libs/gtk+-2.14.0
+	>=gnome-base/gconf-2.24
+	>=gnome-base/gnome-settings-daemon-2.28
+	>=x11-libs/libXi-1.2
+	>=x11-libs/libX11-1.2.0
+	!<=x11-base/xorg-server-1.6.0
+	!gnome-extra/gsynaptics"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.19
+	>=dev-util/intltool-0.35.5"
+
+DOCS="MAINTAINERS NEWS TODO"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-crash.patch" \
+		"${FILESDIR}/${P}-plugin.patch" \
+		"${FILESDIR}/${P}-reboot.patch" \
+		"${FILESDIR}/${P}-gtk22.patch" \
+		"${FILESDIR}/${P}-gsd-crash.patch"
+	gnome2_src_prepare
+}