From b9dbba74a3bf6546dc3727afc2ca07ce8ce7fb4a30663052b3d5cf648965b646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 31 May 2013 18:33:41 +0000 Subject: [PATCH] Accepting request 176997 from home:dimstar:branches:GNOME:Factory Update to 3.9.2 OBS-URL: https://build.opensuse.org/request/show/176997 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=163 --- gnome-settings-daemon-3.8.2.tar.xz | 3 -- gnome-settings-daemon-3.9.2.tar.xz | 3 ++ gnome-settings-daemon-disabled-ibus.patch | 26 +++++++++ gnome-settings-daemon-rpmlintrc | 2 + gnome-settings-daemon.changes | 64 +++++++++++++++++++++++ gnome-settings-daemon.spec | 15 ++++-- 6 files changed, 105 insertions(+), 8 deletions(-) delete mode 100644 gnome-settings-daemon-3.8.2.tar.xz create mode 100644 gnome-settings-daemon-3.9.2.tar.xz create mode 100644 gnome-settings-daemon-disabled-ibus.patch create mode 100644 gnome-settings-daemon-rpmlintrc diff --git a/gnome-settings-daemon-3.8.2.tar.xz b/gnome-settings-daemon-3.8.2.tar.xz deleted file mode 100644 index aad1aec..0000000 --- a/gnome-settings-daemon-3.8.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2118024549b1a3b24e338403d3451211b8cde5c68e387d9a0081e137191b0be -size 1591764 diff --git a/gnome-settings-daemon-3.9.2.tar.xz b/gnome-settings-daemon-3.9.2.tar.xz new file mode 100644 index 0000000..4445c1e --- /dev/null +++ b/gnome-settings-daemon-3.9.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f332bb91e635a7cc288309084cb2105dcab54f64f1647e76e6a465c99a1cd1be +size 1585224 diff --git a/gnome-settings-daemon-disabled-ibus.patch b/gnome-settings-daemon-disabled-ibus.patch new file mode 100644 index 0000000..b2dbd85 --- /dev/null +++ b/gnome-settings-daemon-disabled-ibus.patch @@ -0,0 +1,26 @@ +From 6fa0b3df3054ba8f29885d1584cc5f6605375880 Mon Sep 17 00:00:00 2001 +From: Rui Matos +Date: Thu, 30 May 2013 11:40:37 +0200 +Subject: [PATCH] keyboard: Fix build without IBus + +https://bugzilla.gnome.org/show_bug.cgi?id=701249 +--- + plugins/keyboard/gsd-keyboard-manager.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c +index b15d355..b4131ef 100644 +--- a/plugins/keyboard/gsd-keyboard-manager.c ++++ b/plugins/keyboard/gsd-keyboard-manager.c +@@ -1489,7 +1489,9 @@ handle_dbus_method_call (GDBusConnection *connection, + /* This can only happen if there's an + * ibus_bus_set_global_engine_async() call + * going on. */ ++#ifdef HAVE_IBUS + g_cancellable_cancel (priv->ibus_cancellable); ++#endif + g_clear_pointer (&priv->invocation, set_input_source_return); + priv->pending_ops = 0; + } +-- +1.8.1.4 diff --git a/gnome-settings-daemon-rpmlintrc b/gnome-settings-daemon-rpmlintrc new file mode 100644 index 0000000..4f55865 --- /dev/null +++ b/gnome-settings-daemon-rpmlintrc @@ -0,0 +1,2 @@ +# polkit privileges, see bnc#822405 +setBadness('polkit-unauthorized-privilege', 100) diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 2e91ca8..a003683 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Thu May 30 07:09:49 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.9.2: + + Color: + - Simplify code by using new libcolord feature. + - Fix warning with some screens. + - Fix possible CPU burn loop. + + Cursor: + - Disable plugin if the X version is too old. + + Housekeeping: + - Use GSettings features to clamp options. + - Fix incorrect handling of ignore_paths. + + Keyboard: + - Get layouts and variants from localed. + - Get XKB options from localed. + - Always try to activate the ibus daemon. + - Use the gtk+ ibus module if there's at least one ibus source. + - Make sure the XKB group in use is always what we want. + - Without settings or under GDM, make sure to add the US + layout. + - Add SetInputSource DBus method. + - Remove the input source switcher helper. + - Convert the XKB group switch option from libgnomekbd. + - Stop adding locale based input sources from a hardcoded list. + + Media-keys: + - Handle key grabbing and volume OSDs in gnome-shell. + - Remove unused multi-head support. + - Remove label for analog-output ports. + - Avoid leaking DESKTOP_AUTOSTART_ID to children. + - Fix possible crash when changing the volume. + - Add Rotation lock support. + - Change default 'Lock screen' keybinding to be Super+L. + - Show Shell's search when pressing the search button. + - Add support for XF86AudioMicMute key. + + Mouse: + - Enable two-finger scrolling by default. + + Plugins: + - Fix priority handling. + - Update for gnome-desktop API change. + + Power: + - Handle the shell coming back with a different screensaver + state. + - Don't change active state variable in VM. + - Don't look for screens if we don't have a lid. + - Don't poll for external monitors. + - Remove pre-dim brightness hack. + - Make "Screen when inactive" button in Settings work. + + Sound: + - Fix creation of sound theme directories. + + Updates: + - Fix a number of possible crashers, especially on exit. + + Wacom: + - Warn when screen has changed and calibration is needed. + - Add OLED support for Intuos4 tablets. + - Warn when tablet is not supported in GNOME. + + XSettings: + - Drop toolbar-style workaround. +- Add pkgconfig(pango) BuildRequires: new dependency of the wacom + module. +- Add gnome-settings-daemon-disabled-ibus.patch: Fix build with + configure --disable-ibus. +- Add rpmlintrc to not hard block on the missing polkit privileges. + ------------------------------------------------------------------- Tue May 14 11:34:50 UTC 2013 - dimstar@opensuse.org diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 690fdfc..f9f5006 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -27,13 +27,14 @@ %define with_smartcard 0 Name: gnome-settings-daemon -Version: 3.8.2 +Version: 3.9.2 Release: 0 Summary: Settings daemon for the GNOME desktop License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org -Source: http://download.gnome.org/sources/gnome-settings-daemon/3.8/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-settings-daemon/3.9/%{name}-%{version}.tar.xz +Source99: %{name}-rpmlintrc # PATCH-NEEDS-REBASE gnome-settings-daemon-system-proxy-configuration.diff Patch2: gnome-settings-daemon-system-proxy-configuration.diff # PATCH-NEEDS-REBASE gnome-settings-daemon-apport-monitor.patch bnc439203 jblunck@novell.com -- Add apport monitoring plugin. (was PATCH-FEATURE-UPSTREAM) @@ -50,6 +51,8 @@ Patch15: gnome-packagekit-BNC383261.patch Patch17: gnome-settings-daemon-stop-reload-proxy-settings.patch # PATCH-FEATURE-UPSTREAM gnome-settings-daemon-notify-idle-resumed.patch bnc#439018 bnc#708182 bgo#575467 hpj@suse.com -- notify user about auto suspend when returning from sleep Patch19: gnome-settings-daemon-notify-idle-resumed.patch +# PATCH-FIX-UPSTREAM gnome-settings-daemon-disabled-ibus.patch bgo#701249 dimstar@opensuse.org -- Fix build with ibus disabled. +Patch20: gnome-settings-daemon-disabled-ibus.patch BuildRequires: cups-devel BuildRequires: fdupes BuildRequires: gnome-common @@ -61,11 +64,11 @@ BuildRequires: update-desktop-files BuildRequires: xsltproc # For directory ownership; it's fine to BuildRequire it since it's also a Requires BuildRequires: polkit -BuildRequires: pkgconfig(colord) >= 0.1.12 +BuildRequires: pkgconfig(colord) >= 0.1.32 BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gconf-2.0) >= 2.6.1 BuildRequires: pkgconfig(glib-2.0) >= 2.35.3 -BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.7.90 +BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.9.0 BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.7.2.1 BuildRequires: pkgconfig(gtk+-3.0) >= 3.7.8 BuildRequires: pkgconfig(gudev-1.0) @@ -85,6 +88,7 @@ BuildRequires: pkgconfig(libsystemd-login) BuildRequires: pkgconfig(libwacom) >= 0.7 BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(packagekit-glib2) >= 0.7.4 +BuildRequires: pkgconfig(pango) >= 1.20.0 BuildRequires: pkgconfig(upower-glib) >= 0.9.11 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) @@ -143,6 +147,7 @@ translation-update-upstream #%%patch15 -p0 %patch17 -p1 %patch19 -p1 +%patch20 -p1 %build autoreconf -f -i @@ -194,11 +199,11 @@ rm -rf %{buildroot} %dir %{_libexecdir}/gnome-settings-daemon-3.0/ %{_libexecdir}/gnome-settings-daemon-3.0/gnome-settings-daemon %{_libexecdir}/gnome-settings-daemon-3.0/gsd-backlight-helper -%{_libexecdir}/gnome-settings-daemon-3.0/gsd-input-sources-switcher %{_libexecdir}/gnome-settings-daemon-3.0/gsd-list-wacom %{_libexecdir}/gnome-settings-daemon-3.0/gsd-locate-pointer %{_libexecdir}/gnome-settings-daemon-3.0/gsd-printer %{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-led-helper +%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-oled-helper %{_libexecdir}/gnome-settings-daemon-3.0/gsd-test-* # From patch2 #%{_libexecdir}/novell-sysconfig-proxy-helper