pool/gnome-settings-daemon
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating link to change in openSUSE:Factory/gnome-settings-daemon revision 53.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=cd416a64b21eff4157093838e69b22a8
This commit is contained in:
OBS User buildservice-autocommit 2010-08-09 20:51:53 +00:00 committed by Git OBS Bridge
parent 01f51027dd
commit a0f9a77876
7 changed files with 138 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-settings-daemon-2.30.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f66de1bb80af094a640398549799109e60f53d5373a1b0b7719a5a31c900095
size 1246609

3
gnome-settings-daemon-2.31.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4b4a06d636c02774925da61076c60a9fcc22876b07b7479056379ce9c72a3055
size 1306168

62
gnome-settings-daemon-add-layout-switcher.patch
View File

@ -2,24 +2,16 @@ Index: plugins/keyboard/gsd-keyboard-xkb.c
=================================================================== ===================================================================
--- plugins/keyboard/gsd-keyboard-xkb.c.orig --- plugins/keyboard/gsd-keyboard-xkb.c.orig
+++ plugins/keyboard/gsd-keyboard-xkb.c +++ plugins/keyboard/gsd-keyboard-xkb.c
@@ -461,6 +461,103 @@ show_hide_icon () @@ -361,6 +361,57 @@ show_hide_icon ()
} }
} }
+#define GROUP_SWITCHERS_GROUP "grp"
+#define DEFAULT_GROUP_SWITCH "grp:shifts_toggle"
+
+static void +static void
+_maybe_add_layout_switcher (GSList *layouts, +_maybe_add_layout_switcher (GSList *layouts,
+ GConfClient *conf_client) + GConfClient *conf_client)
+{ +{
+ GSList *options; + GSList *options;
+ GSList *option; + gboolean appended;
+ gboolean any_switcher;
+
+ /* do we have more than one layout? */
+ if (g_slist_length (layouts) > 1)
+ return;
+ +
+ /* If yes, we need to make sure there's a way to change the layout + /* If yes, we need to make sure there's a way to change the layout
+ * Based on xkl_layout_chooser_add_default_switcher_if_necessary() in + * Based on xkl_layout_chooser_add_default_switcher_if_necessary() in
@ -31,6 +23,8 @@ Index: plugins/keyboard/gsd-keyboard-xkb.c
+ NULL); + NULL);
+ +
+ if (options == NULL) { + if (options == NULL) {
+ GSList *option;
+
+ /* nothing in gconf, get the current options from X */ + /* nothing in gconf, get the current options from X */
+ GkbdKeyboardConfig kbd_config; + GkbdKeyboardConfig kbd_config;
+ +
@ -49,56 +43,16 @@ Index: plugins/keyboard/gsd-keyboard-xkb.c
+ gkbd_keyboard_config_term (&kbd_config); + gkbd_keyboard_config_term (&kbd_config);
+ } + }
+ +
+ any_switcher = FALSE; + appended = FALSE;
+ options = gkbd_keyboard_config_add_default_switch_option_if_necessary (layouts, options, &appended);
+ +
+ while (option != NULL) { + if (appended) {
+ char *g, *o;
+
+ if (gkbd_keyboard_config_split_items (option->data, &g, &o)) {
+ if (!g_ascii_strcasecmp (g, GROUP_SWITCHERS_GROUP)) {
+ any_switcher = TRUE;
+ break;
+ }
+ }
+ option = option->next;
+ }
+
+ /* no option to switch between layouts, let's add one */
+ if (!any_switcher) {
+ XklConfigItem *ci = xkl_config_item_new ();
+
+ g_snprintf (ci->name, XKL_MAX_CI_NAME_LENGTH,
+ DEFAULT_GROUP_SWITCH);
+
+ /* we make sure the option we want to add is known */
+ if (!xkl_registry) {
+ xkl_registry = xkl_config_registry_get_instance (xkl_engine);
+ if (!xkl_config_registry_load (xkl_registry, TRUE)) {
+ g_object_unref (xkl_registry);
+ xkl_registry = NULL;
+ }
+ }
+
+ if (xkl_registry &&
+ xkl_config_registry_find_option (xkl_registry,
+ GROUP_SWITCHERS_GROUP,
+ ci)) {
+ const char *id;
+
+ id = gkbd_keyboard_config_merge_items
+ (GROUP_SWITCHERS_GROUP,
+ DEFAULT_GROUP_SWITCH);
+
+ options = g_slist_append (options, g_strdup (id));
+ gconf_client_set_list (conf_client, + gconf_client_set_list (conf_client,
+ GKBD_KEYBOARD_CONFIG_KEY_OPTIONS, + GKBD_KEYBOARD_CONFIG_KEY_OPTIONS,
+ GCONF_VALUE_STRING, options, + GCONF_VALUE_STRING, options,
+ NULL); + NULL);
+ } + }
+ +
+ g_object_unref (G_OBJECT (ci));
+ }
+
+ g_slist_foreach (options, (GFunc) g_free, NULL); + g_slist_foreach (options, (GFunc) g_free, NULL);
+ g_slist_free (options); + g_slist_free (options);
+} +}
@ -106,7 +60,7 @@ Index: plugins/keyboard/gsd-keyboard-xkb.c
static gboolean static gboolean
try_activating_xkb_config_if_new (GkbdKeyboardConfig * try_activating_xkb_config_if_new (GkbdKeyboardConfig *
current_sys_kbd_config) current_sys_kbd_config)
@@ -623,6 +720,7 @@ apply_xkb_settings (void) @@ -542,6 +593,7 @@ apply_xkb_settings (void)
g_slist_free (free_layouts); g_slist_free (free_layouts);
} }

46
gnome-settings-daemon-apport-monitor.patch
View File

@ -12,9 +12,9 @@
Index: configure.ac Index: configure.ac
=================================================================== ===================================================================
--- configure.ac.orig 2010-01-13 16:44:52.000000000 +1100 --- configure.ac.orig
+++ configure.ac 2010-01-13 16:44:52.000000000 +1100 +++ configure.ac
@@ -348,6 +348,7 @@ Makefile @@ -425,6 +425,7 @@ Makefile
gnome-settings-daemon/Makefile gnome-settings-daemon/Makefile
plugins/Makefile plugins/Makefile
plugins/a11y-keyboard/Makefile plugins/a11y-keyboard/Makefile
@ -24,8 +24,8 @@ Index: configure.ac
plugins/common/Makefile plugins/common/Makefile
Index: data/gnome-settings-daemon.schemas.in Index: data/gnome-settings-daemon.schemas.in
=================================================================== ===================================================================
--- data/gnome-settings-daemon.schemas.in.orig 2010-01-13 16:44:52.000000000 +1100 --- data/gnome-settings-daemon.schemas.in.orig
+++ data/gnome-settings-daemon.schemas.in 2010-01-13 16:44:52.000000000 +1100 +++ data/gnome-settings-daemon.schemas.in
@@ -26,6 +26,29 @@ @@ -26,6 +26,29 @@
</schema> </schema>
@ -58,20 +58,20 @@ Index: data/gnome-settings-daemon.schemas.in
<owner>gnome-settings-daemon</owner> <owner>gnome-settings-daemon</owner>
Index: plugins/Makefile.am Index: plugins/Makefile.am
=================================================================== ===================================================================
--- plugins/Makefile.am.orig 2010-01-13 16:44:52.000000000 +1100 --- plugins/Makefile.am.orig
+++ plugins/Makefile.am 2010-01-13 16:44:52.000000000 +1100 +++ plugins/Makefile.am
@@ -3,6 +3,7 @@ NULL = @@ -2,6 +2,7 @@ NULL =
SUBDIRS = \
common \ enabled_plugins = \
a11y-keyboard \ a11y-keyboard \
+ apport \ + apport \
background \ background \
clipboard \ clipboard \
dummy \ datetime \
Index: plugins/apport/Makefile.am Index: plugins/apport/Makefile.am
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ plugins/apport/Makefile.am 2010-01-13 16:44:52.000000000 +1100 +++ plugins/apport/Makefile.am
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
+plugin_LTLIBRARIES = libapport.la +plugin_LTLIBRARIES = libapport.la
+ +
@ -107,8 +107,8 @@ Index: plugins/apport/Makefile.am
+@GSD_INTLTOOL_PLUGIN_RULE@ +@GSD_INTLTOOL_PLUGIN_RULE@
Index: plugins/apport/apport.gnome-settings-plugin.in Index: plugins/apport/apport.gnome-settings-plugin.in
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ plugins/apport/apport.gnome-settings-plugin.in 2010-01-13 16:44:52.000000000 +1100 +++ plugins/apport/apport.gnome-settings-plugin.in
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+[GNOME Settings Plugin] +[GNOME Settings Plugin]
+Module=apport +Module=apport
@ -120,8 +120,8 @@ Index: plugins/apport/apport.gnome-settings-plugin.in
+Website= +Website=
Index: plugins/apport/gsd-apport-manager.c Index: plugins/apport/gsd-apport-manager.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ plugins/apport/gsd-apport-manager.c 2010-01-13 16:44:52.000000000 +1100 +++ plugins/apport/gsd-apport-manager.c
@@ -0,0 +1,220 @@ @@ -0,0 +1,220 @@
+/* +/*
+ * Copyright (C) 2008 Nikolay Derkach <nderkach@gmail.com> + * Copyright (C) 2008 Nikolay Derkach <nderkach@gmail.com>
@ -345,8 +345,8 @@ Index: plugins/apport/gsd-apport-manager.c
+} +}
Index: plugins/apport/gsd-apport-manager.h Index: plugins/apport/gsd-apport-manager.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ plugins/apport/gsd-apport-manager.h 2010-01-13 16:44:52.000000000 +1100 +++ plugins/apport/gsd-apport-manager.h
@@ -0,0 +1,58 @@ @@ -0,0 +1,58 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ * + *
@ -408,8 +408,8 @@ Index: plugins/apport/gsd-apport-manager.h
+#endif /* __GSD_APPORT_MANAGER_H */ +#endif /* __GSD_APPORT_MANAGER_H */
Index: plugins/apport/gsd-apport-plugin.c Index: plugins/apport/gsd-apport-plugin.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ plugins/apport/gsd-apport-plugin.c 2010-01-13 16:44:52.000000000 +1100 +++ plugins/apport/gsd-apport-plugin.c
@@ -0,0 +1,104 @@ @@ -0,0 +1,104 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ * + *
@ -517,8 +517,8 @@ Index: plugins/apport/gsd-apport-plugin.c
+} +}
Index: plugins/apport/gsd-apport-plugin.h Index: plugins/apport/gsd-apport-plugin.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ plugins/apport/gsd-apport-plugin.h 2010-01-13 16:44:52.000000000 +1100 +++ plugins/apport/gsd-apport-plugin.h
@@ -0,0 +1,57 @@ @@ -0,0 +1,57 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ * + *

4
gnome-settings-daemon-system-proxy-configuration.diff
View File

@ -1143,17 +1143,17 @@ Index: configure.ac
plugins/media-keys/cut-n-paste/Makefile plugins/media-keys/cut-n-paste/Makefile
plugins/mouse/Makefile plugins/mouse/Makefile
+plugins/proxy/Makefile +plugins/proxy/Makefile
plugins/smartcard/Makefile
plugins/sound/Makefile plugins/sound/Makefile
plugins/typing-break/Makefile plugins/typing-break/Makefile
plugins/xrandr/Makefile
Index: data/Makefile.am Index: data/Makefile.am
=================================================================== ===================================================================
--- data/Makefile.am.orig 2009-07-28 07:37:28.000000000 +1000 --- data/Makefile.am.orig 2009-07-28 07:37:28.000000000 +1000
+++ data/Makefile.am 2010-01-13 16:44:52.000000000 +1100 +++ data/Makefile.am 2010-01-13 16:44:52.000000000 +1100
@@ -11,6 +11,7 @@ schemas_in_files = \ @@ -11,6 +11,7 @@ schemas_in_files = \
desktop_gnome_keybindings.schemas.in \
apps_gnome_settings_daemon_xrandr.schemas.in \ apps_gnome_settings_daemon_xrandr.schemas.in \
desktop_gnome_peripherals_touchpad.schemas.in \ desktop_gnome_peripherals_touchpad.schemas.in \
desktop_gnome_peripherals_smartcard.schemas.in \
+ system_proxy.schemas.in \ + system_proxy.schemas.in \
$(NULL) $(NULL)

63
gnome-settings-daemon.changes
View File

@ -1,3 +1,66 @@
-------------------------------------------------------------------
Fri Aug 6 11:31:50 CEST 2010 - vuntz@opensuse.org
- Update to version 2.31.6:
+ Apply keyboard a11y settings for new keyboards
+ Require gnome-2.32 modules, not 3.0
+ Updated translations.
- Changes from version 2.31.5.1:
+ Include fixes from 2.31.4.2
+ Updated translations.
- Changes from version 2.31.5:
+ Depend on gnome-desktop-3.0
+ Updated translations.
- Changes from version 2.31.4.2:
+ Fix the binary name in the datetime DBus .service file
+ Updated translations.
- Changes from version 2.31.4.1:
+ Fix the datetime DBus .service file
- Changes from version 2.31.4:
+ Fix build for --disable-smartcard-support (bgo#617748)
+ Use gtk+-3.0
+ Fix launching the display configuration tool
+ Move clock service from gnome-panel
+ Define plugindir in .pc file
+ Updated translations.
- Changes from version 2.31.3:
+ Fixed icon names, prefixed with kbd-
+ Use "show layout" dialog from libgnomekbd
+ Updated translations.
- Changes from version 2.31.2:
+ Fix installation of the xrandr helper binary (bgo#617782)
+ Always dist smartcard.gnome-settings-plugin (bgo#617748)
+ Adjust XF86Display timestamps if they are out of order with RANDR
timestamps (bgo#610482)
+ Don't install template files into the icon theme
+ Fix loading OSD icons when there's no SVG version (bgo#618023)
+ Only check for baobob if we're about to show a dialog
+ Updated translations.
- Changes from version 2.31.1:
+ Create the directory for the system's RANDR configuration
+ Add the logic needed for the "Make Default" button in
gnome-display-properties
+ Use $sysconfdir for /etc installation
+ Replace deprecated GTK_WIDGET_STATE
+ Compile with -DGSEAL_ENABLE (bgo#612588)
+ Use Layouts instead of Groups (bgo#553108)
+ Add smartcard plugin to lock screen/log out when a card is
removed
+ Software LED indicators (bgo#616380)
+ Use LED icons instead of files
+ Updated translations.
- Rebase gnome-settings-daemon-system-proxy-configuration.diff.
- Update gnome-settings-daemon-apport-monitor.patch to apply
without fuzz.
- Update gnome-settings-daemon-add-layout-switcher.patch to use new
API from libgnomekbd that helps remove some code.
- Add mozilla-nss-devel and polkit-devel BuildRequires for
smartcard support and datetime PolicyKit helper.
- Create a gnome-settings-daemon-polkit-datetime subpackage because
this polkit helper can be useful to other users that might not
want to depend on gnome-settings-daemon. The main package
requires it.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 4 17:03:23 CEST 2010 - sbrabec@suse.cz Fri Jun 4 17:03:23 CEST 2010 - sbrabec@suse.cz

49
gnome-settings-daemon.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gnome-settings-daemon (Version 2.30.1) # spec file for package gnome-settings-daemon (Version 2.31.6)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -18,14 +18,13 @@
Name: gnome-settings-daemon Name: gnome-settings-daemon
%define _name gnome-settings-daemon Version: 2.31.6
Version: 2.30.1 Release: 1
Release: 2
License: GPLv2+ License: GPLv2+
Summary: Settings daemon for the GNOME desktop Summary: Settings daemon for the GNOME desktop
Url: http://www.gnome.org Url: http://www.gnome.org
Group: System/GUI/GNOME Group: System/GUI/GNOME
Source: %{_name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.diff # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.diff
Patch2: 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. # 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.
@ -47,10 +46,14 @@ BuildRequires: libcanberra-devel
BuildRequires: libgnomekbd-devel BuildRequires: libgnomekbd-devel
BuildRequires: libnotify-devel BuildRequires: libnotify-devel
BuildRequires: libpulse-devel BuildRequires: libpulse-devel
BuildRequires: mozilla-nss-devel
BuildRequires: polkit-devel
BuildRequires: translation-update-upstream BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: xorg-x11 BuildRequires: xorg-x11
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
# Split so people can depend on this only if needed
Requires: %{name}-polkit-datetime = %{version}
Obsoletes: resapplet Obsoletes: resapplet
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq %gconf_schemas_prereq
@ -64,6 +67,16 @@ the startup of the screensaver, etc.
This module was previously part of GNOME Control Center, but has been This module was previously part of GNOME Control Center, but has been
splitted from it for a more general use. splitted from it for a more general use.
%package polkit-datetime
License: GPLv2+
Summary: PolicyKit helper to set the system date and time
Group: System/GUI/GNOME
Requires: timezone
%description polkit-datetime
This package contains a PolicyKit helper to set the system date and
time.
%package devel %package devel
License: GPLv2+ License: GPLv2+
Summary: Development package for the GNOME settings daemon Summary: Development package for the GNOME settings daemon
@ -87,7 +100,7 @@ contact the settings daemon via its DBus interface.
%lang_package %lang_package
%prep %prep
%setup -q -n %{_name}-%{version} %setup -q
translation-update-upstream translation-update-upstream
gnome-patch-translation-prepare gnome-patch-translation-prepare
%patch2 -p0 %patch2 -p0
@ -113,9 +126,8 @@ make %{?jobs:-j%jobs}
%endif %endif
rm %{buildroot}%{_libdir}/gnome-settings-daemon-2.0/*.*a rm %{buildroot}%{_libdir}/gnome-settings-daemon-2.0/*.*a
%suse_update_desktop_file gnome-settings-daemon %suse_update_desktop_file gnome-settings-daemon
%find_lang %{_name} %find_lang %{name}
%find_gconf_schemas %find_gconf_schemas
cat %{name}.schemas_list >gnome-%{name}.lst
%fdupes %{buildroot} %fdupes %{buildroot}
%clean %clean
@ -131,13 +143,15 @@ rm -rf %{buildroot}
%preun -f %{name}.schemas_preun %preun -f %{name}.schemas_preun
%files -f gnome-%{name}.lst %files -f %{name}.schemas_list
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS %doc AUTHORS COPYING ChangeLog NEWS
%{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service %{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service
%{_datadir}/gnome-settings-daemon %{_datadir}/gnome-settings-daemon/
%{_prefix}/lib/gnome-settings-daemon %{_libexecdir}/gnome-settings-daemon/
%{_libdir}/gnome-settings-daemon-2.0 # lives in another package
%exclude %{_libexecdir}/gnome-settings-daemon/gsd-datetime-mechanism
%{_libdir}/gnome-settings-daemon-2.0/
%{_sysconfdir}/xdg/autostart/*.desktop %{_sysconfdir}/xdg/autostart/*.desktop
%{_datadir}/icons/*/*/* %{_datadir}/icons/*/*/*
# Own the directories to avoid a build dependency on gnome-control-center # Own the directories to avoid a build dependency on gnome-control-center
@ -146,11 +160,18 @@ rm -rf %{buildroot}
%dir %{_datadir}/gnome-control-center/keybindings %dir %{_datadir}/gnome-control-center/keybindings
%{_datadir}/gnome-control-center/keybindings/50-accessibility.xml %{_datadir}/gnome-control-center/keybindings/50-accessibility.xml
%files lang -f %{_name}.lang %files polkit-datetime
%defattr(-,root,root)
%{_libexecdir}/gnome-settings-daemon/gsd-datetime-mechanism
%{_datadir}/dbus-1/system-services/org.gnome.SettingsDaemon.DateTimeMechanism.service
%{_datadir}/polkit-1/actions/org.gnome.settingsdaemon.datetimemechanism.policy
%{_sysconfdir}/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
%files lang -f %{name}.lang
%files devel %files devel
%defattr (-, root, root) %defattr (-, root, root)
%{_includedir}/gnome-settings-daemon-2.0 %{_includedir}/gnome-settings-daemon-2.0/
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%changelog %changelog