From dd7665f53eec48ef4f81111ec3059cb0918a5a9f Mon Sep 17 00:00:00 2001 From: Ting-Wei Lan Date: Tue, 26 May 2015 02:13:02 +0800 Subject: gnome-restore-gtk-icons: Rebased to GNOME 3.16 for Fedora 22 --- .../gnome-settings-daemon.spec | 52 +++++++++++++--------- ...esktop-schemas-3.14-revert-icons-settings.patch | 52 ---------------------- ...esktop-schemas-3.16-revert-icons-settings.patch | 38 ++++++++++++++++ .../gsettings-desktop-schemas.spec | 30 +++++++++---- 4 files changed, 92 insertions(+), 80 deletions(-) delete mode 100644 gnome-restore-gtk-icons/gsettings-desktop-schemas/gsettings-desktop-schemas-3.14-revert-icons-settings.patch create mode 100644 gnome-restore-gtk-icons/gsettings-desktop-schemas/gsettings-desktop-schemas-3.16-revert-icons-settings.patch 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 42d45cc..a9079e0 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,25 +1,25 @@ -%global gtk3_version 3.12.0 +%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.9.91 +%global gsettings_desktop_schemas_version 3.15.4 %global geoclue_version 2.1.2 %global geocode_glib_version 3.10.0 Name: gnome-settings-daemon -Version: 3.14.4 -Release: 1%{?dist} +Version: 3.16.2 +Release: 1%{?dist}.1 Summary: The daemon sharing settings from GNOME to GTK+/KDE applications (Copr: lantw44/gnome-restore-gtk-icons) Group: System Environment/Daemons License: GPLv2+ URL: http://download.gnome.org/sources/%{name} #VCS: git:git://git.gnome.org/gnome-settings-daemon -Source: http://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.16/%{name}-%{version}.tar.xz # disable wacom for ppc/ppc64 (used on RHEL) Patch0: %{name}-3.5.4-ppc-no-wacom.patch # respect menus-have-icons and buttons-have-icons settings -Patch2: %{name}-3.14-respect-menus-buttons-icons.patch +Patch1: %{name}-3.14-respect-menus-buttons-icons.patch BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: gnome-desktop3-devel >= %{gnome_desktop_version} @@ -78,7 +78,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.14. +buttons and menus in GNOME 3.16. A daemon to share settings from GNOME to other applications. It also handles global keybindings, as well as a number of desktop-wide settings. @@ -98,7 +98,7 @@ developing applications that use %{name}. %patch0 -p1 -b .ppc-no-wacom %endif -%patch2 -p1 -b .menus-buttons-icons +%patch1 -p1 -b .menus-buttons-icons autoreconf -i -f @@ -134,7 +134,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %files -f %{name}.lang -%doc AUTHORS COPYING NEWS +%license COPYING +%doc AUTHORS NEWS # list plugins explicitly, so we notice if one goes missing # some of these don't have a separate gschema @@ -215,9 +216,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_libdir}/gnome-settings-daemon-3.0/orientation.gnome-settings-plugin %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.orientation.gschema.xml -%{_libdir}/gnome-settings-daemon-3.0/libcursor.so -%{_libdir}/gnome-settings-daemon-3.0/cursor.gnome-settings-plugin - %{_libdir}/gnome-settings-daemon-3.0/libsharing.so %{_libdir}/gnome-settings-daemon-3.0/sharing.gnome-settings-plugin %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.sharing.gschema.xml @@ -253,7 +251,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %endif %{_libexecdir}/gsd-test-a11y-keyboard %{_libexecdir}/gsd-test-a11y-settings -%{_libexecdir}/gsd-test-cursor %{_libexecdir}/gsd-test-datetime %{_libexecdir}/gsd-test-housekeeping %{_libexecdir}/gsd-test-input-helper @@ -270,15 +267,30 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_libexecdir}/gsd-test-xsettings %changelog -* Fri May 01 2015 David King - 3.14.4-1 -- Update to 3.14.4 +* Tue May 12 2015 Kalev Lember - 3.16.2-1 +- Update to 3.16.2 + +* Tue Apr 14 2015 Kalev Lember - 3.16.1-1 +- Update to 3.16.1 + +* Mon Mar 23 2015 Kalev Lember - 3.16.0-1 +- Update to 3.16.0 + +* Tue Mar 17 2015 Kalev Lember - 3.15.92-1 +- Update to 3.15.92 + +* Tue Mar 03 2015 Kalev Lember - 3.15.91-1 +- Update to 3.15.91 +- Use the %%license macro for the COPYING file + +* Tue Feb 17 2015 Richard Hughes - 3.15.90-1 +- Update to 3.15.90 -* Tue Mar 24 2015 Rui Matos - 3.14.3-1 -- Update to 3.14.3 -- Remove upstreamed patch +* Thu Jan 22 2015 Richard Hughes - 3.15.4-1 +- Update to 3.15.4 -* Tue Jan 20 2015 Bastien Nocera 3.14.2-2 -- Fix disabled touchscreens when resuming from suspend (#1173849) +* Thu Nov 27 2014 Kalev Lember - 3.15.1-1 +- Update to 3.15.1 * Tue Nov 11 2014 Kalev Lember - 3.14.2-1 - Update to 3.14.2 diff --git a/gnome-restore-gtk-icons/gsettings-desktop-schemas/gsettings-desktop-schemas-3.14-revert-icons-settings.patch b/gnome-restore-gtk-icons/gsettings-desktop-schemas/gsettings-desktop-schemas-3.14-revert-icons-settings.patch deleted file mode 100644 index e0e1ea4..0000000 --- a/gnome-restore-gtk-icons/gsettings-desktop-schemas/gsettings-desktop-schemas-3.14-revert-icons-settings.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/schemas/gsettings-desktop-schemas.convert b/schemas/gsettings-desktop-schemas.convert -index 98539c3..2e42a2f 100644 ---- a/schemas/gsettings-desktop-schemas.convert -+++ b/schemas/gsettings-desktop-schemas.convert -@@ -34,6 +34,8 @@ enable-animations = /desktop/gnome/interface/enable_animations - #menus-have-tearoff = /desktop/gnome/interface/menus_have_tearoff - #can-change-accels = /desktop/gnome/interface/can_change_accels - #toolbar-style = /desktop/gnome/interface/toolbar_style -+#menus-have-icons = /desktop/gnome/interface/menus_have_icons -+#buttons-have-icons = /desktop/gnome/interface/buttons_have_icons - #menubar-detachable = /desktop/gnome/interface/menubar_detachable - #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.in b/schemas/org.gnome.desktop.interface.gschema.xml.in.in -index 82c7984..e56d82a 100644 ---- a/schemas/org.gnome.desktop.interface.gschema.xml.in.in -+++ b/schemas/org.gnome.desktop.interface.gschema.xml.in.in -@@ -38,6 +38,20 @@ - and "text". - - -+ -+ false -+ <_summary>Menus Have Icons -+ <_description> -+ Whether menus may display an icon next to a menu entry. -+ -+ -+ -+ false -+ <_summary>Buttons Have Icons -+ <_description> -+ Whether buttons may display an icon in addition to the button text. -+ -+ - - false - <_summary>Menubar Detachable -@@ -220,5 +234,13 @@ - If true, display date in the clock, in addition to time. - - -+ -+ true -+ <_summary>Only show mnemonics on when the Alt key is pressed -+ <_description> -+ Whether mnemonics should be automatically shown and hidden when the user -+ presses the Alt key. -+ -+ - - 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.16-revert-icons-settings.patch new file mode 100644 index 0000000..fed6889 --- /dev/null +++ b/gnome-restore-gtk-icons/gsettings-desktop-schemas/gsettings-desktop-schemas-3.16-revert-icons-settings.patch @@ -0,0 +1,38 @@ +diff --git a/schemas/gsettings-desktop-schemas.convert b/schemas/gsettings-desktop-schemas.convert +index 98539c3..0975ee6 100644 +--- a/schemas/gsettings-desktop-schemas.convert ++++ b/schemas/gsettings-desktop-schemas.convert +@@ -34,6 +34,8 @@ enable-animations = /desktop/gnome/interface/enable_animations + #menus-have-tearoff = /desktop/gnome/interface/menus_have_tearoff + #can-change-accels = /desktop/gnome/interface/can_change_accels + #toolbar-style = /desktop/gnome/interface/toolbar_style ++#menus-have-icons = /desktop/gnome/interface/menus_have_icons ++#buttons-have-icons = /desktop/gnome/interface/buttons_have_icons + #menubar-detachable = /desktop/gnome/interface/menubar_detachable + #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 +--- a/schemas/org.gnome.desktop.interface.gschema.xml.in ++++ b/schemas/org.gnome.desktop.interface.gschema.xml.in +@@ -38,6 +38,20 @@ + and "text". + + ++ ++ false ++ Menus Have Icons ++ ++ Whether menus may display an icon next to a menu entry. ++ ++ ++ ++ false ++ Buttons Have Icons ++ ++ Whether buttons may display an icon in addition to the button text. ++ ++ + + false + Menubar Detachable 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 d56bdb1..f31384a 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,8 +1,8 @@ %global debug_package %{nil} Name: gsettings-desktop-schemas -Version: 3.14.2 -Release: 1%{?dist} +Version: 3.16.1 +Release: 1%{?dist}.1 Summary: A collection of GSettings schemas (Copr: lantw44/gnome-restore-gtk-icons) Group: System Environment/Libraries @@ -10,9 +10,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 -Source: http://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.16/%{name}-%{version}.tar.xz # revert settings related to icons and buttons -Patch0: %{name}-3.14-revert-icons-settings.patch +Patch0: %{name}-3.16-revert-icons-settings.patch BuildRequires: glib2-devel >= 2.31.0 BuildRequires: intltool @@ -23,7 +23,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.14. +buttons and menus in GNOME 3.16. gsettings-desktop-schemas contains a collection of GSettings schemas for settings shared by various components of a desktop. @@ -62,7 +62,8 @@ fi %files -f %{name}.lang -%doc AUTHORS COPYING MAINTAINERS NEWS README +%doc AUTHORS MAINTAINERS NEWS README +%license COPYING %{_datadir}/glib-2.0/schemas/* %{_datadir}/GConf/gsettings/gsettings-desktop-schemas.convert %{_datadir}/GConf/gsettings/wm-schemas.convert @@ -76,8 +77,21 @@ fi %changelog -* Fri May 01 2015 David King - 3.14.2-1 -- Update to 3.14.2 +* Tue Apr 14 2015 Kalev Lember - 3.16.1-1 +- Update to 3.16.1 + +* Mon Mar 23 2015 Kalev Lember - 3.16.0-1 +- Update to 3.16.0 + +* Tue Mar 17 2015 Kalev Lember - 3.15.92-1 +- Update to 3.15.92 +- Use license macro for the COPYING file + +* Thu Feb 19 2015 Richard Hughes - 3.15.90-1 +- Update to 3.15.90 + +* Tue Jan 20 2015 Richard Hughes - 3.15.4-1 +- Update to 3.15.4 * Wed Oct 15 2014 Kalev Lember - 3.14.1-1 - Update to 3.14.1 -- cgit v1.2.3