← Back to branch summary

~ubuntu-desktop/gnome-settings-daemon/3.5

« back to all changes in this revision

Viewing changes to debian/patches/revert_git_stop_using_gconf.patch

  • Committer: Sebastien Bacher
  • Date: 2012-06-19 08:52:53 UTC
  • Revision ID: seb128@ubuntu.com-20120619085253-zv1co6nal0dthkn8
* debian/control.in:
  - don't build-depends on gconf
* debian/gnome-settings-daemon.gsettings-override:
  - don't enable the deprecated gconf bridge
* debian/patches/revert_git_a11y_gsettings.patch,
  debian/patches/revert_git_dropping_gconf_wrapper.patch,
  debian/patches/revert_git_stop_using_gconf.patch,
  debian/patches/revert_git_use_gsetting_keybindings.patch:
  - drop the gconf to gsettings migration reverts
* debian/rules:
  - don't use deprecated --enable-gconf-bridge

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/revert_git_stop_using_gconf.patch
1
 
Index: gnome-settings-daemon-3.4.2/configure.ac
2
 
===================================================================
3
 
--- gnome-settings-daemon-3.4.2.orig/configure.ac       2012-05-22 21:09:13.249387326 +0200
4
 
+++ gnome-settings-daemon-3.4.2/configure.ac    2012-05-22 21:09:23.933386948 +0200
5
 
@@ -57,10 +57,13 @@
6
 
 
7
 
 EXTRA_COMPILE_WARNINGS(yes)
8
 
 
9
 
+dnl FIXME we link against gconf-2.0 until all the plugins are ported
10
 
+dnl to GSettings, or we could get crashes on startup
11
 
 PKG_CHECK_MODULES(SETTINGS_DAEMON,
12
 
         glib-2.0 >= $GLIB_REQUIRED_VERSION
13
 
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
14
 
         gio-2.0 >= $GIO_REQUIRED_VERSION
15
 
+        gconf-2.0 >= $GCONF_REQUIRED_VERSION
16
 
         gmodule-2.0
17
 
         gthread-2.0
18
 
        gsettings-desktop-schemas >= 3.3.0
19
 
@@ -68,6 +71,7 @@
20
 
 
21
 
 PKG_CHECK_MODULES(SETTINGS_PLUGIN,
22
 
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
23
 
+        gconf-2.0 >= $GCONF_REQUIRED_VERSION
24
 
         gio-2.0 >= $GIO_REQUIRED_VERSION
25
 
         gsettings-desktop-schemas
26
 
         x11