[gpointing-device-settings] Fix build with newer gnome-settings-daemon (thanks to Mamoru Tasaka)
Gianluca Sforna
giallu at fedoraproject.org
Wed Dec 15 21:52:23 UTC 2010
commit 9e64890f55848d11e77db134eff17adabea43cea
Author: Gianluca Sforna <giallu at gmail.com>
Date: Wed Dec 15 22:51:09 2010 +0100
Fix build with newer gnome-settings-daemon (thanks to Mamoru Tasaka)
gpointing-device-settings.spec | 5 +++++
gpsd-1.5.1-fix-build_with_newer_gsd.patch | 16 ++++++++++++++++
2 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/gpointing-device-settings.spec b/gpointing-device-settings.spec
index b09080f..d7f0a1c 100644
--- a/gpointing-device-settings.spec
+++ b/gpointing-device-settings.spec
@@ -30,8 +30,11 @@ Provides: gsynaptics = %{version}-%{release}
# Upstream patch from https://bugzilla.gnome.org/show_bug.cgi?id=613022
Patch0: gpds-1.5.1-set_tapping_time_from_preference.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=631068
Patch1: gpds-1.5.1-fix_build_with_gtk22.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=637351
+Patch2: gpsd-1.5.1-fix-build_with_newer_gsd.patch
%description
GUI tool for setting pointing device such as TrackPoint or Touchpad. It
@@ -54,6 +57,7 @@ Development headers and libraries for %{name}.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%configure \
@@ -140,6 +144,7 @@ fi
%changelog
* Fri Dec 10 2010 Gianluca Sforna <giallu at gmail.com> - 1.5.1-3
- Fix build against GTK+ 2.22
+- Fix build against newer gnome-settings-daemon
* Mon May 17 2010 Gianluca Sforna <giallu gmail com> - 1.5.1-2
- add patch from upstream for #592786
diff --git a/gpsd-1.5.1-fix-build_with_newer_gsd.patch b/gpsd-1.5.1-fix-build_with_newer_gsd.patch
new file mode 100644
index 0000000..d3b8140
--- /dev/null
+++ b/gpsd-1.5.1-fix-build_with_newer_gsd.patch
@@ -0,0 +1,16 @@
+diff -u -r 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-01-29 11:28:56.000000000 +0100
++++ gpointing-device-settings-1.5.1/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c 2010-12-15 01:21:35.111373640 +0100
+@@ -158,6 +158,12 @@
+ plugin_class->activate = activate;
+ plugin_class->deactivate = deactivate;
+ }
++
++
++static void
++gsd_mouse_extension_plugin_class_finalize(GsdMouseExtensionPluginClass *klass)
++{
++}
+ /*
+ vi:ts=4:nowrap:ai:expandtab:sw=4
+ */
More information about the scm-commits
mailing list