Accepting request 132715 from GNOME:Next

Starting to push GNOME:Next...

OBS-URL: https://build.opensuse.org/request/show/132715
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=139
This commit is contained in:
Vincent Untz 2012-09-08 07:24:27 +00:00 committed by Git OBS Bridge
parent 50f2005ad1
commit aa4ea1be8a
7 changed files with 188 additions and 71 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:00499118c80474981f3389ef518e2d001f1b1a3b1fb78e54859d59f3bee38ff4
size 1430872

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:005ad39fb50259fa2a8780db98498bb0af50ce4002cfe0c6e3017107df25ae9e
size 1456260

View File

@ -2,7 +2,7 @@ Index: plugins/media-keys/gsd-media-keys-manager.c
===================================================================
--- plugins/media-keys/gsd-media-keys-manager.c.orig
+++ plugins/media-keys/gsd-media-keys-manager.c
@@ -976,6 +976,7 @@ do_sound_action (GsdMediaKeysManager *ma
@@ -1070,6 +1070,7 @@ do_sound_action (GsdMediaKeysManager *ma
{
GvcMixerStream *stream;
gboolean old_muted, new_muted;
@ -10,7 +10,7 @@ Index: plugins/media-keys/gsd-media-keys-manager.c
guint old_vol, new_vol, norm_vol_step;
gboolean sound_changed;
@@ -997,7 +998,11 @@ do_sound_action (GsdMediaKeysManager *ma
@@ -1091,7 +1092,11 @@ do_sound_action (GsdMediaKeysManager *ma
switch (type) {
case MUTE_KEY:
@ -39,9 +39,9 @@ Index: data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
===================================================================
--- data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in.orig
+++ data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
@@ -155,6 +155,11 @@
<_summary>Magnifier zoom out</_summary>
<_description>Binding for the magnifier to zoom out</_description>
@@ -185,6 +185,11 @@
<_summary>Switch input source backward</_summary>
<_description>Binding to select the previous input source</_description>
</key>
+ <key name="toggle-mute" type="b">
+ <default>true</default>

View File

@ -1,23 +0,0 @@
Index: gnome-settings-daemon-3.4.2/plugins/mouse/gsd-mouse-manager.c
===================================================================
--- gnome-settings-daemon-3.4.2.orig/plugins/mouse/gsd-mouse-manager.c
+++ gnome-settings-daemon-3.4.2/plugins/mouse/gsd-mouse-manager.c
@@ -542,7 +542,7 @@ set_disable_w_typing (GsdMouseManager *m
{
if (state && touchpad_is_present ()) {
GError *error = NULL;
- char *args[6];
+ char *args[7];
if (manager->priv->syndaemon_spawned)
return 0;
@@ -552,7 +552,8 @@ set_disable_w_typing (GsdMouseManager *m
args[2] = "1.0";
args[3] = "-K";
args[4] = "-R";
- args[5] = NULL;
+ args[5] = "-t";
+ args[6] = NULL;
if (!have_program_in_path (args[0]))
return 0;

View File

@ -1,22 +0,0 @@
From 2e56b5ce4d42a26146c36f5b734b99352069ebaf Mon Sep 17 00:00:00 2001
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date: Sat, 08 Oct 2011 14:34:09 +0000
Subject: mouse: Set default touchpad deactivation to 1.0s
https://bugzilla.gnome.org/show_bug.cgi?id=590783
---
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index 8a1d444..17a7219 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -549,7 +549,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state)
args[0] = "syndaemon";
args[1] = "-i";
- args[2] = "2.0";
+ args[2] = "1.0";
args[3] = "-K";
args[4] = "-R";
args[5] = NULL;
--
cgit v0.9.0.2

View File

@ -1,3 +1,170 @@
-------------------------------------------------------------------
Tue Sep 4 21:09:34 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.91:
+ Keyboard:
- Don't handle IBus for fallback, it will use the same UI it
always did.
- Hook IBus support for legacy applications.
+ Mouse:
- Fix natural-scroll not working until switched off and on
again.
+ Power:
- Do not attempt to change the brightness of an output that was
disabled.
- Fix idle blank and sleep timeout.
-------------------------------------------------------------------
Tue Aug 21 20:43:37 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.90:
+ Keyboard:
- Apply XKB options
+ Mouse:
- Add support for natural scroll for touchpads
+ Power:
- Fix D-Bus path of the screensaver
+ Wacom:
- Implement the "switch monitor" combination
+ Updated translations.
-------------------------------------------------------------------
Wed Aug 8 18:05:32 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.6:
+ Build:
- Add optional man page.
- List plugin schemas as children of the main schema.
+ Keyboard:
- Require ibus 1.4.99 for ibus support.
+ Mouse:
- If one device was ignored, we would ignore all the devices.
+ Smartcard:
- Don't try to use smartcard drivers that didn't load.
+ Updates:
- Remove unused code.
- Avoid compilation warnings due to PackageKit API changes.
+ Wacom:
- Avoid a warning at login.
- Add xsltproc BuildRequires: needed to build the man pages.
-------------------------------------------------------------------
Tue Jul 17 20:10:49 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.5:
+ Add test applications for a number of plugins
+ Color:
- Fix notification-related memory leaks
+ Housekeeping:
- Fix notification-related memory leaks
+ Keyboard:
- Add support for switching to IBus input methods
+ Updates:
- Remove unused settings
- Remove a number of unused notifications
- Don't ever live-update packages in the session
- Fix a number of memory leaks
- Prevent crash if a device that requires a firmware is removed
before the firmware search completes
+ Wacom:
- Fix crasher related to screen tablets
- Do not rotate "pad" devices
- Apply display rotation to device that's mapped to it
- Make shortcuts that require Shift work as expected
- Re-apply calibration and aspect-ratio when the screen changes
but don't apply it to touch devices.
- Add pkgconfig(ibus-1.0) BuildRequires: new dependency.
-------------------------------------------------------------------
Wed Jun 27 08:17:19 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.4:
+ Printers:
- Don't block the session with unreachable printers
+ Wacom:
- Fix crasher related to screen matching
-------------------------------------------------------------------
Mon Jun 25 19:28:14 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.3:
+ Housekeeping:
- Support new XDG thumbnail directory locations
+ Keyboard A11y:
- Don't crash when changing large print in fallback mode
- Link to an existing help page
+ Keyboard:
- Don't crash if LANG is empty
+ Media-keys:
- Make <Super> keyboard shortcuts work again
- Use systemd to shutdown or suspend if available
+ Mouse:
- Only inhibits mouse clicks and scrolls with syndaemon
+ Power:
- End the lid-close safety timer when the lid gets opened
- Update fallback status icon on icon state change
- Don't leak notifications
- Avoid duplicate translations
- Use systemd to shutdown or suspend if available
- Don't enable backlight helper if GUdev is not available
+ Updates:
- Adapt to new upstream property name
- Add a notification for offline updates
+ Wacom:
- Update display mapping on monitor changes
- Flag unknown devices created from fallback
- Add keep aspect ratio option
- Use GnomeRROutput instead of GnomeRROutputInfo
- Match built-in monitor
+ XRandr:
- Explicitly set clone state variable when generating monitor
configs.
- Drop gnome-settings-daemon-only-inhibit-touchpad-tapping.patch:
fixed upstream.
-------------------------------------------------------------------
Sat Jun 9 17:08:12 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.2:
+ Remove ability to D-Bus activate
+ Media keys:
- Get proper gnome-keyring environment
- Simplify the OSD code
- Add keybindings to switch input sources
+ Mouse:
- Fix applying settings to newly added touchpads
- Reduce default touchpad deactivation to 1s
+ Housekeeping:
- Split out 'ingnore unix mount' code
+ Keyboard:
- Always apply xmodmap
- Lots of cleanups
- Apply XKB layouts ourselfs and stop relying on libgnomekbd
+ Power:
- Disconnect from upower signals when needed
- Add org.gnome.settings-daemon.plugins.power.lid-close-
suspend-with-extrnal-monitors
key to allow forcing suspend on lid close
+ Print:
- Fix setting of default media size
- Don't create an unused proxy object
- Speed up initialization
+ Updates:
- Automatically download updates rather than installing them
+ Wacom:
- Disable wacom support on s390
- Disable wacom support on non-linux
- Don't put touchscreens in relative mode
- Make tablet configuration per-machine
+ Color:
- Be quiet about unloadable profiles
+ Updated translations.
- Drop pkgconfig(libxklavier), pkgconfig(libgnomekbd) and
pkgconfig(libgnomekbdui) BuildRequires
- Add pkgconfig(xkbfile) BuildRequires.
- Drop gnome-settings-daemon-reduce-tap-delay.patch: fixed upstream
- Rebase gnome-settings-daemon-bnc462640-mute-action.patch.
-------------------------------------------------------------------
Wed Jun 6 21:05:32 UTC 2012 - badshah400@gmail.com

View File

@ -21,13 +21,13 @@
%define with_systemd 0
Name: gnome-settings-daemon
Version: 3.4.2
Version: 3.5.91
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.4/%{name}-%{version}.tar.xz
Source: http://download.gnome.org/sources/gnome-settings-daemon/3.5/%{name}-%{version}.tar.xz
# 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)
@ -40,14 +40,10 @@ Patch11: gnome-settings-daemon-bnc461755-randr-rotate-wacom.diff
Patch13: gnome-settings-daemon-add-layout-switcher.patch
# PATCH-NEEDS-REBASE PATCH-FEATURE-OPENSUSE gnome-packagekit-fate302445.patch fate 302445
Patch14: gnome-packagekit-fate302445.patch
# PATCH-NEEDSREBASE PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
# PATCH-NEEDS-REBASE PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
Patch15: gnome-packagekit-BNC383261.patch
# PATCH-FIX-OPENSUSE gnome-settings-daemon-stop-reload-proxy-settings.patch bnc689592#c1, bnc#538353 glin@suse.com -- Stop g-s-d poping up the authentication dialog for reloading the proxy settings
Patch17: gnome-settings-daemon-stop-reload-proxy-settings.patch
# PATCH-FIX-UPSTREAM gnome-settings-daemon-reduce-tap-delay.patch bgo#590783 badshah400@gmail.com -- Reduce lag between last keystroke and first touchpad tap (patch came from upstream git)
Patch18: gnome-settings-daemon-reduce-tap-delay.patch
# PATCH-FIX-UPSTREAM gnome-settings-daemon-reduce-tap-delay.patch bgo#673055 badshah400@gmail.com -- When touchpad is deactivated during keyboard use, only deactivate tapping, but not pointer motion
Patch19: gnome-settings-daemon-only-inhibit-touchpad-tapping.patch
BuildRequires: cups-devel
BuildRequires: fdupes
BuildRequires: gnome-common
@ -56,6 +52,7 @@ BuildRequires: gnome-common
BuildRequires: intltool
BuildRequires: translation-update-upstream
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
@ -65,28 +62,27 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.31.0
%if 0%{?BUILD_FROM_VCS}
BuildRequires: gnome-common
%endif
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.3.92
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.3.0
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.5.3
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.5.90
BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.18
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(ibus-1.0) >= 1.4.99
BuildRequires: pkgconfig(kbproto)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libgnomekbd)
BuildRequires: pkgconfig(libgnomekbdui)
BuildRequires: pkgconfig(libnotify) >= 0.7.3
BuildRequires: pkgconfig(libpulse)
%if %{with_systemd}
BuildRequires: pkgconfig(libsystemd-login)
%endif
BuildRequires: pkgconfig(libwacom) >= 0.3
BuildRequires: pkgconfig(libxklavier)
BuildRequires: pkgconfig(libwacom) >= 0.5
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(packagekit-glib2) >= 0.6.12
BuildRequires: pkgconfig(packagekit-glib2) >= 0.7.4
BuildRequires: pkgconfig(upower-glib) >= 0.9.11
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xfixes)
BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xkbfile)
BuildRequires: pkgconfig(xorg-wacom)
BuildRequires: pkgconfig(xtst)
Requires: gsettings-desktop-schemas
@ -141,8 +137,6 @@ translation-update-upstream
# PATCH-NEEDS-REBASE
#%%patch15 -p0
%patch17 -p1
%patch18 -p1
%patch19 -p1
%endif
%if 0%{?BUILD_FROM_VCS}
@ -188,16 +182,18 @@ rm -rf %{buildroot}
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS
%{_datadir}/dbus-1/interfaces/org.gnome.SettingsDaemonUpdates.xml
%{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service
%{_datadir}/dbus-1/services/org.freedesktop.IBus.service
%{_datadir}/gnome-settings-daemon/
%{_datadir}/gnome-settings-daemon-3.0/
%dir %{_libexecdir}/gnome-settings-daemon-3.0/
%{_libexecdir}/gnome-settings-daemon-3.0/gnome-fallback-mount-helper
%{_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-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-test-*
# From patch2
#%{_libexecdir}/novell-sysconfig-proxy-helper
%dir %{_libdir}/gnome-settings-daemon-3.0/
@ -249,7 +245,6 @@ rm -rf %{buildroot}
%dir %{_datadir}/GConf
%dir %{_datadir}/GConf/gsettings
%{_datadir}/GConf/gsettings/gnome-settings-daemon.convert
%{_mandir}/man1/*
%files lang -f %{name}.lang