From 79d18530a158befce66bbe247fdba3da9bd9c51fce208b4043a46f54e8a98618 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 4 Sep 2010 20:54:07 +0000 Subject: [PATCH] Accepting request 47145 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gnome-settings-daemon via accept of submit request 47145 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/47145 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=69 --- gnome-settings-daemon-display-tool.patch | 22 ++++++++++++++++++++++ gnome-settings-daemon.changes | 7 +++++++ gnome-settings-daemon.spec | 3 +++ 3 files changed, 32 insertions(+) create mode 100644 gnome-settings-daemon-display-tool.patch diff --git a/gnome-settings-daemon-display-tool.patch b/gnome-settings-daemon-display-tool.patch new file mode 100644 index 0000000..3ff87a3 --- /dev/null +++ b/gnome-settings-daemon-display-tool.patch @@ -0,0 +1,22 @@ +commit 03112091d18ad0f9cc66b5f8835aadb1c47bc9ee +Author: Matthias Clasen +Date: Wed Jun 16 08:17:45 2010 -0400 + + Fix launching the display configuration tool + + It is a control-center panel now, not a standalone capplet anymore. + Adjust the commandline accordingly. + +diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c +index 7f406b1..7f66cd2 100644 +--- a/plugins/xrandr/gsd-xrandr-manager.c ++++ b/plugins/xrandr/gsd-xrandr-manager.c +@@ -76,7 +76,7 @@ + #define GSD_XRANDR_ICON_NAME "gsd-xrandr" + + /* executable of the control center's display configuration capplet */ +-#define GSD_XRANDR_DISPLAY_CAPPLET "gnome-display-properties" ++#define GSD_XRANDR_DISPLAY_CAPPLET "gnome-control-center display" + + #define GSD_DBUS_PATH "/org/gnome/SettingsDaemon" + #define GSD_DBUS_NAME "org.gnome.SettingsDaemon" diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 0bdc94d..0654ed1 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 4 22:41:36 CEST 2010 - vuntz@opensuse.org + +- Add gnome-settings-daemon-display-tool.patch to fix the display + notification area to use the right tool to configure display. The + patch reverts a commit that is GNOME 3-only. Fix bnc#636849. + ------------------------------------------------------------------- Tue Aug 31 15:03:22 CEST 2010 - dimstar@opensuse.org diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index f6590d9..aaf1cb2 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -25,6 +25,8 @@ Summary: Settings daemon for the GNOME desktop Url: http://www.gnome.org Group: System/GUI/GNOME Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM gnome-settings-daemon-display-tool.patch bnc#636849 bgo#628792 vuntz@opensuse.org -- Fix launch of display tool, revert upstream commit that changed it (was a GNOME 3 commit) +Patch0: gnome-settings-daemon-display-tool.patch # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.diff Patch2: gnome-settings-daemon-system-proxy-configuration.diff # PATCH-FIX-UPSTREAM gnome-settings-daemon-bnc427745-force-dpi.patch bnc427745 bgo553652 vuntz@novell.com -- Force the DPI to 96 right now to avoid big fonts. @@ -103,6 +105,7 @@ contact the settings daemon via its DBus interface. %setup -q translation-update-upstream gnome-patch-translation-prepare +%patch0 -p1 -R %patch2 -p0 %patch6 -p0 %patch8 -p0