Merge lp:~darkxst/unity-settings-daemon/lp1372346 into lp:unity-settings-daemon

[Tim Lunn]

* Rebuild for gnome-desktop 3.12 (LP: #1372346)
* debian/control: Drop depends gnome-settings-daemon-schemas (<< 3.10),
   gnome-settings-daemon 3.12 reverts all removed keys
* Fix merge of xkb get/free_info_vars

  * Rebuild for gnome-desktop 3.12 (LP: #1372346)
  * debian/control: Drop depends gnome-settings-daemon-schemas (<< 3.10),
    gnome-settings-daemon 3.12 reverts all removed keys
  * Fix renaming of xkb get/free_info_vars

[Robert Ancell (robert-ancell)]

This branch should probably depend on https://code.launchpad.net/~robert-ancell/unity-settings-daemon/fix-libusd-depends/+merge/235557

[Robert Ancell (robert-ancell)]

Or just not have those changes - the CI system will merge the two branches itself.

[Robert Ancell (robert-ancell)]

Change appears to be a straight copy out of gnome-desktop3, which is exactly what we want. Thanks Tim!

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2014-08-29 10:24:00 +0000
+++ configure.ac	2014-09-29 12:19:40 +0000
@@ -204,8 +204,10 @@
 fi
 AM_CONDITIONAL(HAVE_IBUS, test "x$enable_ibus" == "xyes")
 
-PKG_CHECK_MODULES(KEYBOARD, accountsservice xkbfile $IBUS_MODULE gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+PKG_CHECK_MODULES(KEYBOARD, accountsservice xkbfile xkeyboard-config  $IBUS_MODULE gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
 
+XKB_BASE=$($PKG_CONFIG --variable xkb_base xkeyboard-config)
+AC_SUBST(XKB_BASE)
 dnl ---------------------------------------------------------------------------
 dnl - Housekeeping plugin stuff
 dnl ---------------------------------------------------------------------------

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-22 11:29:12 +0000
+++ debian/changelog	2014-09-29 12:19:40 +0000
@@ -1,3 +1,21 @@
+unity-settings-daemon (14.04.0+14.10.20140922-0ubuntu3) utopic; urgency=medium
+
+  * Rebuild for gnome-desktop 3.12 (LP: #1372346)
+  * debian/control: Drop depends gnome-settings-daemon-schemas (<< 3.10),
+    gnome-settings-daemon 3.12 reverts all removed keys 
+  * Fix merge of git patch for  xkb get/free info_vars
+
+ -- Tim Lunn <[e-mail]>  Mon, 29 Sep 2014 20:05:27 +1000
+
+unity-settings-daemon (14.04.0+14.10.20140922-0ubuntu2) utopic; urgency=medium
+
+  * debian/control:
+    - Move -dev dependencies from libunity-settings-daemon1 to
+      libunity-settings-daemon-dev and add it to the correct section
+      (LP: #1372728)
+
+ -- Robert Ancell <[e-mail]>  Wed, 24 Sep 2014 15:38:13 +1200
+
 unity-settings-daemon (14.04.0+14.10.20140922-0ubuntu1) utopic; urgency=low
 
   [ Robert Ancell ]

=== modified file 'debian/control'
--- debian/control	2014-09-22 11:23:09 +0000
+++ debian/control	2014-09-29 12:19:40 +0000
@@ -54,7 +54,6 @@
          gsettings-desktop-schemas (>= 3.7.2.1),
          nautilus-data (>= 2.91.3-1),
          gnome-settings-daemon-schemas (>= 3.8), 
-         gnome-settings-daemon-schemas (<< 3.10),
          gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140224),
 Recommends: ibus (>= 1.5.0),
             pulseaudio,
@@ -102,16 +101,17 @@
 Package: libunity-settings-daemon1
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libglib2.0-dev,
-         libgtk-3-dev
+         ${misc:Depends}
 Description: Helper library for accessing settings
  This package contains a helper library for unity-control-center
 
 Package: libunity-settings-daemon-dev
+Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libunity-settings-daemon1 (= ${binary:Version})
+         libunity-settings-daemon1 (= ${binary:Version}),
+         libglib2.0-dev,
+         libgtk-3-dev
 Description: Helper library for accessing settings (development files)
  This package contains a headers for using libunity-settings-daemon

=== modified file 'plugins/keyboard/Makefile.am'
--- plugins/keyboard/Makefile.am	2013-12-04 23:55:26 +0000
+++ plugins/keyboard/Makefile.am	2014-09-29 12:19:40 +0000
@@ -19,6 +19,8 @@
 	gsd-keyboard-plugin.c	\
 	gsd-keyboard-manager.h	\
 	gsd-keyboard-manager.c	\
+	gsd-xkb-utils.h		\
+	gsd-xkb-utils.c		\
 	$(NULL)
 
 libkeyboard_la_CPPFLAGS = \
@@ -28,6 +30,7 @@
 	-DDATADIR=\""$(pkgdatadir)"\"			\
 	-DLIBEXECDIR=\""$(libexecdir)"\"		\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	-DXKB_BASE=\""$(XKB_BASE)"\"			\
 	$(AM_CPPFLAGS)
 
 libkeyboard_la_CFLAGS = \
@@ -52,6 +55,8 @@
 	test-keyboard.c		\
 	gsd-keyboard-manager.h	\
 	gsd-keyboard-manager.c	\
+	gsd-xkb-utils.h		\
+	gsd-xkb-utils.c		\
 	$(NULL)
 
 usd_test_keyboard_CFLAGS = $(libkeyboard_la_CFLAGS)

=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
--- plugins/keyboard/gsd-keyboard-manager.c	2014-04-12 09:30:04 +0000
+++ plugins/keyboard/gsd-keyboard-manager.c	2014-09-29 12:19:40 +0000
@@ -38,9 +38,7 @@
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
-#include <X11/XKBlib.h>
 #include <X11/keysym.h>
-#include <X11/extensions/XKBrules.h>
 
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnome-desktop/gnome-languages.h>
@@ -57,6 +55,7 @@
 #include "gsd-keyboard-manager.h"
 #include "gsd-input-helper.h"
 #include "gsd-enums.h"
+#include "gsd-xkb-utils.h"
 
 #define GSD_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_KEYBOARD_MANAGER, GsdKeyboardManagerPrivate))
 
@@ -987,7 +986,7 @@
         XkbRF_VarDefsRec *xkb_var_defs;
         gchar *rules_file_path;
 
-        gnome_xkb_info_get_var_defs (&rules_file_path, &xkb_var_defs);
+        gsd_xkb_get_var_defs (&rules_file_path, &xkb_var_defs);
 
         free (xkb_var_defs->options);
         xkb_var_defs->options = options;
@@ -1013,7 +1012,7 @@
         if (gdk_error_trap_pop ())
                 g_warning ("Error loading XKB rules");
 
-        gnome_xkb_info_free_var_defs (xkb_var_defs);
+        gsd_xkb_free_var_defs (xkb_var_defs);
         g_free (rules_file_path);
 
         XkbLockModifiers (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XkbUseCoreKbd, LockMask, 0);

=== added file 'plugins/keyboard/gsd-xkb-utils.c'
--- plugins/keyboard/gsd-xkb-utils.c	1970-01-01 00:00:00 +0000
+++ plugins/keyboard/gsd-xkb-utils.c	2014-09-29 12:19:40 +0000
@@ -0,0 +1,90 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2012 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+
+#include "gsd-xkb-utils.h"
+
+#ifndef XKB_RULES_FILE
+#define XKB_RULES_FILE "evdev"
+#endif
+#ifndef XKB_LAYOUT
+#define XKB_LAYOUT "us"
+#endif
+#ifndef XKB_MODEL
+#define XKB_MODEL "pc105+inet"
+#endif
+
+void
+gsd_xkb_get_var_defs (char             **rules,
+                      XkbRF_VarDefsRec **var_defs)
+{
+        Display *display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+        char *tmp;
+
+        g_return_if_fail (rules != NULL);
+        g_return_if_fail (var_defs != NULL);
+
+        *rules = NULL;
+        *var_defs = g_new0 (XkbRF_VarDefsRec, 1);
+
+        gdk_error_trap_push ();
+
+        /* Get it from the X property or fallback on defaults */
+        if (!XkbRF_GetNamesProp (display, rules, *var_defs) || !*rules) {
+                *rules = strdup (XKB_RULES_FILE);
+                (*var_defs)->model = strdup (XKB_MODEL);
+                (*var_defs)->layout = strdup (XKB_LAYOUT);
+                (*var_defs)->variant = NULL;
+                (*var_defs)->options = NULL;
+        }
+
+        gdk_error_trap_pop_ignored ();
+
+        tmp = *rules;
+
+        if (*rules[0] == '/')
+                *rules = g_strdup (*rules);
+        else
+                *rules = g_build_filename (XKB_BASE, "rules", *rules, NULL);
+
+        free (tmp);
+}
+
+void
+gsd_xkb_free_var_defs (XkbRF_VarDefsRec *var_defs)
+{
+        g_return_if_fail (var_defs != NULL);
+
+        free (var_defs->model);
+        free (var_defs->layout);
+        free (var_defs->variant);
+        free (var_defs->options);
+
+        g_free (var_defs);
+}
+

=== added file 'plugins/keyboard/gsd-xkb-utils.h'
--- plugins/keyboard/gsd-xkb-utils.h	1970-01-01 00:00:00 +0000
+++ plugins/keyboard/gsd-xkb-utils.h	2014-09-29 12:19:40 +0000
@@ -0,0 +1,32 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2012 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef __GSD_XKB_UTILS_H
+#define __GSD_XKB_UTILS_H
+
+#include <X11/XKBlib.h>
+#include <X11/extensions/XKBrules.h>
+
+void
+gsd_xkb_get_var_defs (char             **rules,
+                      XkbRF_VarDefsRec **var_defs);
+void
+gsd_xkb_free_var_defs (XkbRF_VarDefsRec *var_defs);
+
+#endif  /* __GSD_XKB_UTILS_H */

=== modified file 'plugins/keyboard/test-keyboard-ibus-utils.c'
--- plugins/keyboard/test-keyboard-ibus-utils.c	2013-03-19 15:18:34 +0000
+++ plugins/keyboard/test-keyboard-ibus-utils.c	2014-09-29 12:19:40 +0000
@@ -1,3 +1,4 @@
+#include "gsd-xkb-utils.c"
 #include "gsd-keyboard-manager.c"
 
 static void