diff options
| -rw-r--r-- | gnome-restore-gtk-icons/gnome-settings-daemon/gnome-settings-daemon-3.24-respect-menus-buttons-icons.patch (renamed from gnome-restore-gtk-icons/gnome-settings-daemon/gnome-settings-daemon-3.14-respect-menus-buttons-icons.patch) | 6 | ||||
| -rw-r--r-- | gnome-restore-gtk-icons/gnome-settings-daemon/gnome-settings-daemon.spec | 168 | ||||
| -rw-r--r-- | gnome-restore-gtk-icons/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24-revert-icons-settings.patch (renamed from gnome-restore-gtk-icons/gsettings-desktop-schemas/gsettings-desktop-schemas-3.16-revert-icons-settings.patch) | 4 | ||||
| -rw-r--r-- | gnome-restore-gtk-icons/gsettings-desktop-schemas/gsettings-desktop-schemas.spec | 21 |
4 files changed, 105 insertions, 94 deletions
diff --git a/gnome-restore-gtk-icons/gnome-settings-daemon/gnome-settings-daemon-3.14-respect-menus-buttons-icons.patch b/gnome-restore-gtk-icons/gnome-settings-daemon/gnome-settings-daemon-3.24-respect-menus-buttons-icons.patch index a6f837c..1c765c1 100644 --- a/gnome-restore-gtk-icons/gnome-settings-daemon/gnome-settings-daemon-3.14-respect-menus-buttons-icons.patch +++ b/gnome-restore-gtk-icons/gnome-settings-daemon/gnome-settings-daemon-3.24-respect-menus-buttons-icons.patch @@ -1,8 +1,8 @@ diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c -index 489021c..73a5d14 100644 +index 9835c02..4c25ceb 100644 --- a/plugins/xsettings/gsd-xsettings-manager.c +++ b/plugins/xsettings/gsd-xsettings-manager.c -@@ -411,6 +411,8 @@ static TranslationEntry translations [] = { +@@ -444,6 +444,8 @@ static TranslationEntry translations [] = { { "org.gnome.desktop.interface", "gtk-im-status-style", "Gtk/IMStatusStyle", translate_string_string }, { "org.gnome.desktop.interface", "gtk-im-module", "Gtk/IMModule", translate_string_string }, { "org.gnome.desktop.interface", "icon-theme", "Net/IconThemeName", translate_string_string }, @@ -10,4 +10,4 @@ index 489021c..73a5d14 100644 + { "org.gnome.desktop.interface", "buttons-have-icons", "Gtk/ButtonImages", translate_bool_int }, { "org.gnome.desktop.interface", "menubar-accel", "Gtk/MenuBarAccel", translate_string_string }, { "org.gnome.desktop.interface", "cursor-theme", "Gtk/CursorThemeName", translate_string_string }, - /* cursor-size is handled via the Xft side as it needs the scaling factor */ + { "org.gnome.desktop.interface", "gtk-enable-primary-paste", "Gtk/EnablePrimaryPaste", translate_bool_int }, diff --git a/gnome-restore-gtk-icons/gnome-settings-daemon/gnome-settings-daemon.spec b/gnome-restore-gtk-icons/gnome-settings-daemon/gnome-settings-daemon.spec index 7dfad18..3962dde 100644 --- a/gnome-restore-gtk-icons/gnome-settings-daemon/gnome-settings-daemon.spec +++ b/gnome-restore-gtk-icons/gnome-settings-daemon/gnome-settings-daemon.spec @@ -1,20 +1,22 @@ %global gtk3_version 3.15.3 %global gnome_desktop_version 3.11.1 %global libgweather_version 3.9.5 -%global gsettings_desktop_schemas_version 3.20.0 +%global gsettings_desktop_schemas_version 3.23.3 %global geocode_glib_version 3.10.0 %global geoclue_version 2.3.1 Name: gnome-settings-daemon -Version: 3.22.2 -Release: 1%{?dist}.1 +Version: 3.24.2 +Release: 2%{?dist}.1 Summary: The daemon sharing settings from GNOME to GTK+/KDE applications (Copr: lantw44/gnome-restore-gtk-icons) License: GPLv2+ URL: https://download.gnome.org/sources/%{name} -Source0: https://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/3.24/%{name}-%{version}.tar.xz +# Backported from upstream +Patch1: 0001-Backport-RFKILL-fixes.patch # respect menus-have-icons and buttons-have-icons settings -Patch1: %{name}-3.14-respect-menus-buttons-icons.patch +Patch2: %{name}-3.24-respect-menus-buttons-icons.patch BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(colord) >= 1.0.2 @@ -63,6 +65,7 @@ Requires: libgweather%{?_isa} >= %{libgweather_version} Obsoletes: %{name}-updates < 3.13.1 Obsoletes: drwright < 3.5.0-3 +Obsoletes: gnome-settings-daemon-devel < 3.23.1 # Input sources handling was moved to gnome-shell / mutter; make sure not to # break older gnome-shell versions. @@ -71,7 +74,7 @@ Conflicts: gnome-shell < 3.13.92 %description Copr: lantw44/gnome-restore-gtk-icons Note: This is a modified package. Install it if you want to see icons in GTK+ -buttons and menus in GNOME 3.22. +buttons and menus in GNOME 3.24. A daemon to share settings from GNOME to other applications. It also handles global keybindings, as well as a number of desktop-wide settings. @@ -86,7 +89,8 @@ developing applications that use %{name}. %prep %setup -q -%patch1 -p1 -b .menus-buttons-icons +%patch1 -p1 -b .backport_rfkill_fixes +%patch2 -p1 -b .menus-buttons-icons %build %configure --disable-static \ @@ -123,139 +127,133 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %license COPYING %doc AUTHORS NEWS -# list plugins explicitly, so we notice if one goes missing +# list daemons explicitly, so we notice if one goes missing # some of these don't have a separate gschema -%{_libdir}/gnome-settings-daemon-3.0/a11y-keyboard.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/liba11y-keyboard.so +%{_libexecdir}/gsd-a11y-keyboard +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.A11yKeyboard.desktop -%{_libdir}/gnome-settings-daemon-3.0/clipboard.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/libclipboard.so +%{_libexecdir}/gsd-clipboard +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Clipboard.desktop -%{_libdir}/gnome-settings-daemon-3.0/datetime.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/libdatetime.so -%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.datetime.gschema.xml +%{_libexecdir}/gsd-datetime +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Datetime.desktop -%{_libdir}/gnome-settings-daemon-3.0/housekeeping.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/libhousekeeping.so +%{_libexecdir}/gsd-dummy + +%{_libexecdir}/gsd-housekeeping +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Housekeeping.desktop %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml -%{_libdir}/gnome-settings-daemon-3.0/keyboard.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/libkeyboard.so -%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.keyboard.gschema.xml +%{_libexecdir}/gsd-keyboard +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Keyboard.desktop -%{_libdir}/gnome-settings-daemon-3.0/media-keys.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/libmedia-keys.so +%{_libexecdir}/gsd-media-keys +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.MediaKeys.desktop %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.media-keys.gschema.xml -%{_libdir}/gnome-settings-daemon-3.0/mouse.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/libmouse.so +%{_libexecdir}/gsd-mouse +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Mouse.desktop +%{_libexecdir}/gsd-locate-pointer %{_libexecdir}/gsd-backlight-helper %{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy -%{_libdir}/gnome-settings-daemon-3.0/power.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/libpower.so +%{_libexecdir}/gsd-power +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Power.desktop %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.power.gschema.xml -%{_libdir}/gnome-settings-daemon-3.0/print-notifications.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/libprint-notifications.so -%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml +%{_libexecdir}/gsd-print-notifications +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.PrintNotifications.desktop +%{_libexecdir}/gsd-printer -%{_libdir}/gnome-settings-daemon-3.0/librfkill.so -%{_libdir}/gnome-settings-daemon-3.0/rfkill.gnome-settings-plugin +%{_libexecdir}/gsd-rfkill +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Rfkill.desktop -%{_libdir}/gnome-settings-daemon-3.0/screensaver-proxy.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/libscreensaver-proxy.so +%{_libexecdir}/gsd-screensaver-proxy +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop -%{_libdir}/gnome-settings-daemon-3.0/smartcard.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/libsmartcard.so +%{_libexecdir}/gsd-smartcard +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Smartcard.desktop -%{_libdir}/gnome-settings-daemon-3.0/sound.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/libsound.so +%{_libexecdir}/gsd-sound +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Sound.desktop %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.wacom.gschema.xml +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop %ifnarch s390 s390x -%{_libdir}/gnome-settings-daemon-3.0/wacom.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/libgsdwacom.so +%{_libexecdir}/gsd-wacom %{_libexecdir}/gsd-wacom-led-helper %{_libexecdir}/gsd-wacom-oled-helper %{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.wacom.policy %endif -%{_libdir}/gnome-settings-daemon-3.0/xrandr.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/libxrandr.so +%{_libexecdir}/gsd-xrandr +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.XRANDR.desktop %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xrandr.gschema.xml -%{_libdir}/gnome-settings-daemon-3.0/xsettings.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/libxsettings.so +%{_libexecdir}/gsd-xsettings +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xsettings.gschema.xml -%{_libdir}/gnome-settings-daemon-3.0/a11y-settings.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/liba11y-settings.so +%{_libexecdir}/gsd-a11y-settings +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.desktop -%{_libdir}/gnome-settings-daemon-3.0/color.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/libcolor.so +%{_libexecdir}/gsd-color +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Color.desktop %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.color.gschema.xml -%{_libdir}/gnome-settings-daemon-3.0/liborientation.so -%{_libdir}/gnome-settings-daemon-3.0/orientation.gnome-settings-plugin -%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.orientation.gschema.xml +%{_libexecdir}/gsd-orientation +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Orientation.desktop -%{_libdir}/gnome-settings-daemon-3.0/libsharing.so -%{_libdir}/gnome-settings-daemon-3.0/sharing.gnome-settings-plugin +%{_libexecdir}/gsd-sharing +%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Sharing.desktop %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.sharing.gschema.xml %{_libdir}/gnome-settings-daemon-3.0/libgsd.so -%{_libexecdir}/gnome-settings-daemon -%{_libexecdir}/gnome-settings-daemon-localeexec -%{_libexecdir}/gsd-locate-pointer -%{_libexecdir}/gsd-printer - /usr/lib/udev/rules.d/*.rules %{_datadir}/gnome-settings-daemon/ -%{_sysconfdir}/xdg/autostart/gnome-settings-daemon.desktop %{_datadir}/icons/hicolor/*/apps/gsd-xrandr.* %{_datadir}/GConf/gsettings/gnome-settings-daemon.convert %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gschema.xml -%{_datadir}/man/man1/gnome-settings-daemon.1.gz - - %files devel %{_includedir}/gnome-settings-daemon-3.0 %{_libdir}/pkgconfig/gnome-settings-daemon.pc -%ifnarch s390 s390x -%{_libexecdir}/gsd-list-wacom -%{_libexecdir}/gsd-test-wacom -%{_libexecdir}/gsd-test-wacom-osd -%endif -%{_libexecdir}/gsd-test-a11y-keyboard -%{_libexecdir}/gsd-test-a11y-settings -%{_libexecdir}/gsd-test-datetime -%{_libexecdir}/gsd-test-housekeeping %{_libexecdir}/gsd-test-input-helper -%{_libexecdir}/gsd-test-keyboard -%{_libexecdir}/gsd-test-media-keys -%{_libexecdir}/gsd-test-mouse -%{_libexecdir}/gsd-test-orientation -%{_libexecdir}/gsd-test-print-notifications -%{_libexecdir}/gsd-test-rfkill -%{_libexecdir}/gsd-test-screensaver-proxy -%{_libexecdir}/gsd-test-smartcard -%{_libexecdir}/gsd-test-sound -%{_libexecdir}/gsd-test-xrandr -%{_libexecdir}/gsd-test-xsettings %changelog -* Thu Mar 16 2017 Kalev Lember <klember@redhat.com> - 3.22.2-1 -- Update to 3.22.2 +* Thu May 18 2017 Benjamin Berg <bberg@redhat.com> - 3.24.2-2 +- Backport RFKILL related fixes to Fedora 26 + +* Wed May 10 2017 Kalev Lember <klember@redhat.com> - 3.24.2-1 +- Update to 3.24.2 + +* Wed Apr 12 2017 Kalev Lember <klember@redhat.com> - 3.24.1-1 +- Update to 3.24.1 + +* Tue Mar 21 2017 Kalev Lember <klember@redhat.com> - 3.24.0-1 +- Update to 3.24.0 + +* Thu Mar 16 2017 Kalev Lember <klember@redhat.com> - 3.23.92-1 +- Update to 3.23.92 + +* Wed Feb 15 2017 Richard Hughes <rhughes@redhat.com> - 3.23.90-1 +- Update to 3.23.90 + +* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.23.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Jan 12 2017 Bastien Nocera <bnocera@redhat.com> - 3.23.3-1 ++ gnome-settings-daemon-3.23.3-1 +- Update to 3.23.3 -* Wed Oct 12 2016 Kalev Lember <klember@redhat.com> - 3.22.1-1 -- Update to 3.22.1 +* Tue Oct 11 2016 Bastien Nocera <bnocera@redhat.com> - 3.23.2-1 ++ gnome-settings-daemon-3.23.2-1 +- Update to 3.23.2 * Thu Sep 22 2016 Kalev Lember <klember@redhat.com> - 3.22.0-1 - Update to 3.22.0 diff --git a/gnome-restore-gtk-icons/gsettings-desktop-schemas/gsettings-desktop-schemas-3.16-revert-icons-settings.patch b/gnome-restore-gtk-icons/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24-revert-icons-settings.patch index fed6889..3df5182 100644 --- a/gnome-restore-gtk-icons/gsettings-desktop-schemas/gsettings-desktop-schemas-3.16-revert-icons-settings.patch +++ b/gnome-restore-gtk-icons/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24-revert-icons-settings.patch @@ -12,11 +12,11 @@ index 98539c3..0975ee6 100644 #toolbar-detachable = /desktop/gnome/interface/toolbar_detachable #toolbar-icons-size = /desktop/gnome/interface/toolbar_icons_size diff --git a/schemas/org.gnome.desktop.interface.gschema.xml.in b/schemas/org.gnome.desktop.interface.gschema.xml.in -index cf310a9..988d244 100644 +index 9e5fb20..1061e51 100644 --- a/schemas/org.gnome.desktop.interface.gschema.xml.in +++ b/schemas/org.gnome.desktop.interface.gschema.xml.in @@ -38,6 +38,20 @@ - and "text". + and “text”. </description> </key> + <key name="menus-have-icons" type="b"> diff --git a/gnome-restore-gtk-icons/gsettings-desktop-schemas/gsettings-desktop-schemas.spec b/gnome-restore-gtk-icons/gsettings-desktop-schemas/gsettings-desktop-schemas.spec index 6894df4..bd8d8e7 100644 --- a/gnome-restore-gtk-icons/gsettings-desktop-schemas/gsettings-desktop-schemas.spec +++ b/gnome-restore-gtk-icons/gsettings-desktop-schemas/gsettings-desktop-schemas.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: gsettings-desktop-schemas -Version: 3.22.0 +Version: 3.24.0 Release: 1%{?dist}.1 Summary: A collection of GSettings schemas (Copr: lantw44/gnome-restore-gtk-icons) @@ -9,9 +9,9 @@ License: LGPLv2+ # no homepage exists for this component URL: http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas #VCS: git:git://git.gnome.org/gsettings-desktop-schemas -Source0: http://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/%{name}/3.24/%{name}-%{version}.tar.xz # revert settings related to icons and buttons -Patch0: %{name}-3.16-revert-icons-settings.patch +Patch0: %{name}-3.24-revert-icons-settings.patch BuildRequires: glib2-devel >= 2.31.0 BuildRequires: intltool @@ -27,7 +27,7 @@ Requires: glib2 >= 2.31.0 %description Copr: lantw44/gnome-restore-gtk-icons Note: This is a modified package. Install it if you want to see icons in GTK+ -buttons and menus in GNOME 3.20. +buttons and menus in GNOME 3.24. gsettings-desktop-schemas contains a collection of GSettings schemas for settings shared by various components of a desktop. @@ -80,6 +80,19 @@ fi %changelog +* Tue Mar 21 2017 Kalev Lember <klember@redhat.com> - 3.24.0-1 +- Update to 3.24.0 + +* Tue Feb 14 2017 Richard Hughes <rhughes@redhat.com> - 3.23.90-1 +- Update to 3.23.90 + +* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.23.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Jan 11 2017 Bastien Nocera <bnocera@redhat.com> - 3.23.3-1 ++ gsettings-desktop-schemas-3.23.3-1 +- Update to 3.23.3 + * Wed Sep 21 2016 Kalev Lember <klember@redhat.com> - 3.22.0-1 - Update to 3.22.0 - Don't set group tags |