1
0

Accepting request 137195 from GNOME:Factory

- Add with_ibus condition (currently set to 0), as we do not have
  a recent enough version of IBus in Factory at this moment.
  + when with_ibus is set to 1; pkconfig(ibus) BuildRequires will
    be used and --enable-ibus is being passed to configure
  + when with_ibus is set to 0, pkgconfigu(ibus) is being ignored
    and --disable-ibus is being passed to configure. (forwarded request 136627 from Zaitor)

OBS-URL: https://build.opensuse.org/request/show/137195
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=83
This commit is contained in:
Stephan Kulow 2012-10-05 16:33:50 +00:00 committed by Git OBS Bridge
commit 19c0dbedec
8 changed files with 257 additions and 426 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:6d516a6b9779545568b480b36d69a965c20f3b7b53edbd306527f6bc2a6478f3
size 1473968

View File

@ -1,350 +0,0 @@
From 1eae564882f64b739bb98b9aae52b58c2370f860 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@novell.com>
Date: Tue, 27 Jan 2009 19:52:50 -0600
Subject: [PATCH 1/6] Add a GConf key to rotate tablets when the monitor rotates
Signed-off-by: Federico Mena Quintero <federico@novell.com>
---
data/apps_gnome_settings_daemon_xrandr.schemas.in | 25 +++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/data/apps_gnome_settings_daemon_xrandr.schemas.in b/data/apps_gnome_settings_daemon_xrandr.schemas.in
index c9f59fd..80324ca 100644
--- a/data/apps_gnome_settings_daemon_xrandr.schemas.in
+++ b/data/apps_gnome_settings_daemon_xrandr.schemas.in
@@ -14,5 +14,30 @@
</long>
</locale>
</schema>
+
+ <schema>
+ <key>/schemas/apps/gnome_settings_daemon/xrandr/rotate_tablet_with_monitor</key>
+ <applyto>/apps/gnome_settings_daemon/xrandr/rotate_tablet_with_monitor</applyto>
+ <owner>gnome</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Rotate pressure-sensitive tablet along with the
+ monitor</short>
+ <long>For internal pressure-sensitive
+ tablets which are part of the display (such as the
+ ones in tablet PCs), you want the tablet's cursor to
+ rotate when the monitor is rotated, so that the
+ orientation of the stylus will match the orientation
+ of the monitor; use "true" in this case. But for
+ external tablets, you may prefer to keep the tablet in
+ the same orientation even if you rotate the monitor;
+ use "false" in this case.
+
+ This option will only be used if the xsetwacom binary
+ is in your PATH.
+ </long>
+ </locale>
+ </schema>
</schemalist>
</gconfschemafile>
--
1.6.0.2
From c2668abfa744b67a5ad6d49aca5c3683638e7712 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@novell.com>
Date: Wed, 28 Jan 2009 11:38:37 -0600
Subject: [PATCH 2/6] Change a define for a GConf key name
Signed-off-by: Federico Mena Quintero <federico@novell.com>
---
plugins/xrandr/gsd-xrandr-manager.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index d9e5671..2e5a8ea 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -63,7 +63,7 @@
#define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, GsdXrandrManagerPrivate))
#define CONF_DIR "/apps/gnome_settings_daemon/xrandr"
-#define CONF_KEY "show_notification_icon"
+#define CONF_KEY_SHOW_NOTIFICATION_ICON (CONF_DIR "/show_notification_icon")
#define VIDEO_KEYSYM "XF86Display"
@@ -1374,7 +1374,7 @@ status_icon_stop (GsdXrandrManager *manager)
static void
start_or_stop_icon (GsdXrandrManager *manager)
{
- if (gconf_client_get_bool (manager->priv->client, CONF_DIR "/" CONF_KEY, NULL)) {
+ if (gconf_client_get_bool (manager->priv->client, CONF_KEY_SHOW_NOTIFICATION_ICON, NULL)) {
status_icon_start (manager);
}
else {
@@ -1388,7 +1388,8 @@ on_config_changed (GConfClient *client,
GConfEntry *entry,
GsdXrandrManager *manager)
{
- start_or_stop_icon (manager);
+ if (strcmp (entry->key, CONF_KEY_SHOW_NOTIFICATION_ICON) == 0)
+ start_or_stop_icon (manager);
}
static void
--
1.6.0.2
From a1235e7af87966bfaad3631661abc73513e1fb26 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@novell.com>
Date: Thu, 29 Jan 2009 18:37:53 -0600
Subject: [PATCH 3/6] Framework to handle the new GConf key to rotate the tablet
Signed-off-by: Federico Mena Quintero <federico@novell.com>
---
plugins/xrandr/gsd-xrandr-manager.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index 2e5a8ea..dbe4a8e 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -63,7 +63,8 @@
#define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, GsdXrandrManagerPrivate))
#define CONF_DIR "/apps/gnome_settings_daemon/xrandr"
-#define CONF_KEY_SHOW_NOTIFICATION_ICON (CONF_DIR "/show_notification_icon")
+#define CONF_KEY_SHOW_NOTIFICATION_ICON (CONF_DIR "/show_notification_icon")
+#define CONF_KEY_ROTATE_TABLET_WITH_MONITOR (CONF_DIR "/rotate_tablet_with_monitor")
#define VIDEO_KEYSYM "XF86Display"
@@ -114,6 +115,12 @@ G_DEFINE_TYPE (GsdXrandrManager, gsd_xrandr_manager, G_TYPE_OBJECT)
static gpointer manager_object = NULL;
+static void
+handle_tablet_rotation (GsdXrandrManager *manager)
+{
+ /* FMQ: implement */
+}
+
/* Filters out GNOME_RR_ERROR_NO_MATCHING_CONFIG from
* gnome_rr_config_apply_from_filename(), since that is not usually an error.
*/
@@ -1390,6 +1397,8 @@ on_config_changed (GConfClient *client,
{
if (strcmp (entry->key, CONF_KEY_SHOW_NOTIFICATION_ICON) == 0)
start_or_stop_icon (manager);
+ else if (strcmp (entry->key, CONF_KEY_ROTATE_TABLET_WITH_MONITOR) == 0)
+ handle_tablet_rotation (manager);
}
static void
--
1.6.0.2
From d3f2bd5f11c83d40dc2f363da17effccc81477d4 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@novell.com>
Date: Thu, 29 Jan 2009 18:42:40 -0600
Subject: [PATCH 4/6] Handle rotation of the tablet every time we apply a RANDR configuration
Signed-off-by: Federico Mena Quintero <federico@novell.com>
---
plugins/xrandr/gsd-xrandr-manager.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index dbe4a8e..325f39f 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -133,8 +133,10 @@ apply_configuration_from_filename (GsdXrandrManager *manager, const char *filena
my_error = NULL;
success = gnome_rr_config_apply_from_filename (priv->rw_screen, filename, &my_error);
- if (success)
+ if (success) {
+ handle_tablet_rotation (manager);
return TRUE;
+ }
if (g_error_matches (my_error, GNOME_RR_ERROR, GNOME_RR_ERROR_NO_MATCHING_CONFIG)) {
/* This is not an error; the user probably changed his monitors
--
1.6.0.2
From 27d2fe2de5738d309ff8cfc7e206297397dee52c Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@novell.com>
Date: Thu, 29 Jan 2009 19:13:33 -0600
Subject: [PATCH 5/6] Find the rotation to use for the tablet
Signed-off-by: Federico Mena Quintero <federico@novell.com>
---
plugins/xrandr/gsd-xrandr-manager.c | 49 ++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index 325f39f..63142c9 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -115,10 +115,57 @@ G_DEFINE_TYPE (GsdXrandrManager, gsd_xrandr_manager, G_TYPE_OBJECT)
static gpointer manager_object = NULL;
+static GnomeRRRotation
+find_rotation_for_tablet (GnomeRRConfig *configuration)
+{
+ int i;
+
+ /* The stupid heuristic is to find the first rotated output, and use its rotation.
+ * The rationale is:
+ *
+ * - If you have a built-in tablet (like a tablet PC), then you want the
+ * stylus to match the built-in monitor's orientation. Your external
+ * monitor has no relationship to your stylus.
+ *
+ * - If you have a single swivel monitor, that's the one which corresponds to
+ * your external tablet.
+ *
+ * - If you have two swivel monitors, well, I want your setup at my home, too.
+ */
+
+ for (i = 0; configuration->outputs[i] != NULL; i++) {
+ GnomeOutputInfo *output;
+
+ output = configuration->outputs[i];
+ if (output->on && output->connected && output->rotation != GNOME_RR_ROTATION_0)
+ return output->rotation;
+ }
+
+ return GNOME_RR_ROTATION_0;
+}
+
static void
handle_tablet_rotation (GsdXrandrManager *manager)
{
- /* FMQ: implement */
+ struct GsdXrandrManagerPrivate *priv = manager->priv;
+ GnomeRRConfig *configuration;
+ GnomeRRRotation rotation;
+
+ if (!gconf_client_get_bool (priv->client, CONF_KEY_ROTATE_TABLET_WITH_MONITOR, NULL)) {
+ rotate_tablet (manager, GNOME_RR_ROTATION_0); /* un-rotate the tablet when the GConf key is turned off */
+ return;
+ }
+
+ /* Re-creating the current configuration is probably not the most
+ * efficient thing, but it should give us an accurate view of the world.
+ */
+ configuration = gnome_rr_config_new_current (priv->rw_screen);
+
+ rotation = find_rotation_for_tablet (configuration);
+
+ gnome_rr_config_free (configuration);
+
+ rotate_tablet (manager, rotation);
}
/* Filters out GNOME_RR_ERROR_NO_MATCHING_CONFIG from
--
1.6.0.2
From 8df5eafa8f72178516d5e3c1489333d571f487e6 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@novell.com>
Date: Fri, 30 Jan 2009 13:46:57 -0600
Subject: [PATCH 6/6] Call xsetwacom(1) to rotate the stylus
Signed-off-by: Federico Mena Quintero <federico@novell.com>
---
plugins/xrandr/gsd-xrandr-manager.c | 74 +++++++++++++++++++++++++++++++++++
1 files changed, 74 insertions(+), 0 deletions(-)
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index 63142c9..ad42235 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -145,6 +145,80 @@ find_rotation_for_tablet (GnomeRRConfig *configuration)
}
static void
+rotate_tablet (GsdXrandrManager *manager, GnomeRRRotation rotation)
+{
+ char *stdout_str;
+ int status;
+ char *p;
+ char *newline;
+ const char *arg;
+
+ /* We really don't do error checking. If xsetwacom(1) doesn't exist,
+ * well, too bad. Maybe that means that the user doesn't have a tablet.
+ */
+
+ stdout_str = NULL;
+ if (!g_spawn_command_line_sync ("xsetwacom list",
+ &stdout_str,
+ NULL,
+ &status,
+ NULL))
+ goto out;
+
+ if (!(WIFEXITED (status) && WEXITSTATUS (status) == 0 && stdout_str != NULL))
+ goto out;
+
+ switch (rotation) {
+ case GNOME_RR_ROTATION_90:
+ arg = "CW";
+ break;
+
+ case GNOME_RR_ROTATION_180:
+ arg = "HALF";
+ break;
+
+ case GNOME_RR_ROTATION_270:
+ arg = "CCW";
+ break;
+
+ default: /* this also catches GNOME_RR_ROTATION_0 */
+ arg = "NONE";
+ break;
+ }
+
+ for (p = stdout_str; *p != '\0'; p = newline + 1) {
+ char *end;
+ char *device_name;
+ char *command;
+
+ newline = strchr (p, '\n');
+ if (!newline)
+ break;
+
+ *newline = '\0';
+
+ if (!strstr (p, "stylus"))
+ continue;
+
+ device_name = p;
+ for (end = device_name; *end != '\0' && !g_ascii_isspace (*end); end++);
+
+ *end = '\0';
+
+ if (strlen (device_name) == 0)
+ continue;
+
+ command = g_strconcat ("xsetwacom set ", device_name, " Rotate ", arg, NULL);
+ g_spawn_command_line_sync (command, NULL, NULL, NULL, NULL);
+ g_free (command);
+ }
+
+out:
+
+ g_free (stdout_str);
+}
+
+static void
handle_tablet_rotation (GsdXrandrManager *manager)
{
struct GsdXrandrManagerPrivate *priv = manager->priv;
--
1.6.0.2

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,223 @@
-------------------------------------------------------------------
Tue Oct 2 16:59:37 UTC 2012 - dimstar@opensuse.org
- Add with_ibus condition (currently set to 0), as we do not have
a recent enough version of IBus in Factory at this moment.
+ when with_ibus is set to 1; pkconfig(ibus) BuildRequires will
be used and --enable-ibus is being passed to configure
+ when with_ibus is set to 0, pkgconfigu(ibus) is being ignored
and --disable-ibus is being passed to configure.
-------------------------------------------------------------------
Tue Sep 25 14:34:37 UTC 2012 - dimstar@opensuse.org
- Update to version 3.6.0:
+ Create sources from the X layouts if the configuration is empty
+ Always do that in GDM, so system-wide layouts work
+ Add modifiers-only shortcuts to switch input sources.
-------------------------------------------------------------------
Mon Sep 17 22:28:14 UTC 2012 - zaitor@opensuse.org
- Update to version 3.5.92:
+ Keyboard:
- Don't block getting the IBus global engine.
- Don't touch the XKB layout if no input sources were
configured.
- Fix gtk+ IM module getting set to IBus for XKB sources.
+ Media keys:
- Make "toggle brightness" work.
+ Color:
- Don't warn about non-existent DMI file.
+ Power:
- Fix some instances where an external screen would turn off.
+ Wacom:
- Require wacom 0.6 to fix bugs with some tablets.
-------------------------------------------------------------------
Sat Sep 8 08:16:37 UTC 2012 - vuntz@opensuse.org
- Drop gnome-settings-daemon-bnc461755-randr-rotate-wacom.diff:
this needed to be rebased for a long time, and there's a rocking
support for wacom tablets upstream now. So this is most likely
not needed anymore.
-------------------------------------------------------------------
Sat Sep 8 07:29:13 UTC 2012 - vuntz@opensuse.org
- Add explicit pkgconfig(libpulse-mainloop-glib) BuildRequires:
we forgot to add it when adding pkgconfig(libpulse).
- Add pkgconfig(xext) BuildRequires: new explicit dependency in
3.5.5 for the power plugin that needs the XSync API.
-------------------------------------------------------------------
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 'ignore 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: add upstream after
libgnomekbd dependency got dropped.
- 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

@ -20,34 +20,31 @@
# lose ConsoleKit support (bad for sysvinit)
%define with_systemd 0
# We can currently not build ibus support, as it requires ibus 1.5, which has not been released yet.
%define with_ibus 0
Name: gnome-settings-daemon
Version: 3.4.2
Version: 3.6.0
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.6/%{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)
Patch8: gnome-settings-daemon-apport-monitor.patch
# PATCH-FEATURE-UPSTREAM gnome-settings-daemon-bnc462640-mute-action.patch bnc462640 bgo572365 vuntz@novell.com -- Mute button should always mute sound instead of toggling mute status
Patch10: gnome-settings-daemon-bnc462640-mute-action.patch
# PATCH-NEEDS-REBASE gnome-settings-daemon-bnc461755-randr-rotate-wacom.diff bnc461755 federico@novell.com - Add the option of rotating a Wacom tablet when rotating the monitor with RANDR (was PATCH-FEATURE-OPENSUSE)
Patch11: gnome-settings-daemon-bnc461755-randr-rotate-wacom.diff
# PATCH-NEEDS-REBASE PATCH-FIX-UPSTREAM gnome-settings-daemon-add-layout-switcher.patch bgo603806 vuntz@opensuse.org -- Add a layout switching combo if needed; the real fix implies some API change in libgnomekbd (see upstream bug)
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 +53,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 +63,31 @@ 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)
%if %{with_ibus}
BuildRequires: pkgconfig(ibus-1.0) >= 1.4.99
%endif
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)
BuildRequires: pkgconfig(libpulse-mainloop-glib)
%if %{with_systemd}
BuildRequires: pkgconfig(libsystemd-login)
%endif
BuildRequires: pkgconfig(libwacom) >= 0.3
BuildRequires: pkgconfig(libxklavier)
BuildRequires: pkgconfig(libwacom) >= 0.6
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(xext)
BuildRequires: pkgconfig(xfixes)
BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xkbfile)
BuildRequires: pkgconfig(xorg-wacom)
BuildRequires: pkgconfig(xtst)
Requires: gsettings-desktop-schemas
@ -133,16 +134,12 @@ translation-update-upstream
#%%patch8 -p0
%patch10 -p0
# PATCH-NEEDS-REBASE
#%%patch11 -p1
# PATCH-NEEDS-REBASE
#%%patch13 -p0
# PATCH-NEEDS-REBASE
#%%patch14 -p0
# PATCH-NEEDS-REBASE
#%%patch15 -p0
%patch17 -p1
%patch18 -p1
%patch19 -p1
%endif
%if 0%{?BUILD_FROM_VCS}
@ -158,7 +155,12 @@ autoreconf -f -i
--enable-gconf-bridge \
--disable-static \
--with-pnpids=%{_datadir}/libgnome-desktop-3.0/pnp.ids \
--libexecdir=%{_libexecdir}/gnome-settings-daemon-3.0
--libexecdir=%{_libexecdir}/gnome-settings-daemon-3.0 \
%if %{with_ibus}
--enable-ibus
%else
--disable-ibus
%endif
make %{?jobs:-j%jobs} V=1
@ -188,16 +190,21 @@ 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
%if %{with_ibus}
%{_datadir}/dbus-1/services/org.freedesktop.IBus.service
%endif
%{_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-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-test-*
# From patch2
#%{_libexecdir}/novell-sysconfig-proxy-helper
%dir %{_libdir}/gnome-settings-daemon-3.0/
@ -249,7 +256,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