summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Shadura <andrewsh@debian.org>2016-07-15 17:52:22 +0200
committerAndrew Shadura <andrewsh@debian.org>2016-07-15 17:52:22 +0200
commit26089a186665282b68c6177f01ee3029bb3f24ba (patch)
tree73faff734922fe296f4c5d7afc2de12c3a69110d
parent648fc13173c1b8f968353969c8b510c4fbf0b673 (diff)
Compatibility with GSD 3.20
-rw-r--r--debian/patches/04-gpointing-device-settings-1.5.1-gsd-3.20-fix.patch28
-rw-r--r--debian/patches/series1
2 files changed, 29 insertions, 0 deletions
diff --git a/debian/patches/04-gpointing-device-settings-1.5.1-gsd-3.20-fix.patch b/debian/patches/04-gpointing-device-settings-1.5.1-gsd-3.20-fix.patch
new file mode 100644
index 0000000..1c08674
--- /dev/null
+++ b/debian/patches/04-gpointing-device-settings-1.5.1-gsd-3.20-fix.patch
@@ -0,0 +1,28 @@
+--- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
++++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
+@@ -56,6 +56,25 @@
+ GType gsd_pointing_device_plugin_get_type (void) G_GNUC_CONST;
+ G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
+
++#undef GNOME_SETTINGS_PLUGIN_REGISTER
++/*
++ * Utility macro used to register plugins
++ *
++ * use: GNOME_SETTINGS_PLUGIN_REGISTER (PluginName, plugin_name)
++ */
++#define GNOME_SETTINGS_PLUGIN_REGISTER(PluginName, plugin_name) \
++ G_DEFINE_DYNAMIC_TYPE (PluginName, \
++ plugin_name, \
++ GNOME_TYPE_SETTINGS_PLUGIN) \
++ \
++G_MODULE_EXPORT GType \
++register_gnome_settings_plugin (GTypeModule *type_module) \
++{ \
++ plugin_name##_register_type (type_module); \
++ \
++ return plugin_name##_get_type(); \
++} \
++
+ GNOME_SETTINGS_PLUGIN_REGISTER(GsdPointingDevicePlugin, gsd_pointing_device_plugin)
+
+ static void
diff --git a/debian/patches/series b/debian/patches/series
index 50735ea..9473a78 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,6 @@
02-gpointing-device-settings-1.5.1-gtk22.patch
03-gpointing-device-settings-1.5.1-gsd-crash.patch
04-gpointing-device-settings-1.5.1-gsd-3.2-fix.patch
+04-gpointing-device-settings-1.5.1-gsd-3.20-fix.patch
05-gpointing-device-settings-1.5.1-fix-build.patch
06-po-makefile.patch