[cinnamon-settings-daemon] add patch to remove obsolete gsettins for menu and button icon till upstream fixes it
leigh123linux
leigh123linux at fedoraproject.org
Sat Aug 10 15:52:06 UTC 2013
commit 2322930893d52f8bcde32b901867dd3224ca9716
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Sat Aug 10 16:51:43 2013 +0100
add patch to remove obsolete gsettins for menu and button icon till upstream fixes it
cinnamon-settings-daemon.spec | 7 ++++++-
gsettings_obsolete.patch | 22 ++++++++++++++++++++++
2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index 97bb270..5c552c0 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -2,7 +2,7 @@
Name: cinnamon-settings-daemon
Version: 1.0.0
-Release: 0.7.git%{_internal_version}%{?dist}
+Release: 0.8.git%{_internal_version}%{?dist}
Summary: The daemon sharing settings from CINNAMON to GTK+/KDE applications
Group: System Environment/Daemons
@@ -12,6 +12,7 @@ URL: http://cinnamon.linuxmint.com
# wget https://github.com/linuxmint/cinnamon-settings-daemon/tarball/%%{_internal_version} -O cinnamon-settings-daemon-%%{version}.git%%{_internal_version}.tar.gz
Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-settings-daemon/source/cinnamon-settings-daemon-%{version}.git%{_internal_version}.tar.gz
Patch0: %{name}_gnome_3.9.patch
+Patch1: gsettings_obsolete.patch
Requires: cinnamon-control-center-filesystem
Obsoletes: cinnamon-settings-daemon-updates
@@ -66,6 +67,7 @@ developing applications that use %{name}.
%prep
%setup -q -n linuxmint-cinnamon-settings-daemon-%{_internal_version}
%patch0 -p1
+%patch1 -p1
sed -i -e 's@{ACLOCAL_FLAGS}@{ACLOCAL_FLAGS} -I m4 at g' Makefile.am
echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac
NOCONFIGURE=1 ./autogen.sh
@@ -221,6 +223,9 @@ fi
%{_libexecdir}/csd-test-xsettings
%changelog
+* Sat Aug 10 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.0.0-0.8.git3f73d50
+- add patch to remove obsolete gsettins for menu and button icon till upstream fixes it
+
* Tue Aug 06 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.0.0-0.7.git3f73d50
- update to latest git
- remove dead bits from spec file
diff --git a/gsettings_obsolete.patch b/gsettings_obsolete.patch
new file mode 100644
index 0000000..af35497
--- /dev/null
+++ b/gsettings_obsolete.patch
@@ -0,0 +1,22 @@
+--- a/plugins/xsettings/csd-xsettings-manager.c
++++ b/plugins/xsettings/csd-xsettings-manager.c
+@@ -353,15 +353,15 @@
+ { "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 },
+- { "org.gnome.desktop.interface", "menus-have-icons", "Gtk/MenuImages", translate_bool_int },
+- { "org.gnome.desktop.interface", "buttons-have-icons", "Gtk/ButtonImages", translate_bool_int },
++ /* { "org.gnome.desktop.interface", "menus-have-icons", "Gtk/MenuImages", translate_bool_int },
++ { "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", "enable-animations", "Gtk/EnableAnimations", translate_bool_int },
+ { "org.gnome.desktop.interface", "cursor-theme", "Gtk/CursorThemeName", translate_string_string },
+ { "org.gnome.desktop.interface", "cursor-size", "Gtk/CursorThemeSize", translate_int_int },
+- { "org.gnome.desktop.interface", "show-input-method-menu", "Gtk/ShowInputMethodMenu", translate_bool_int },
++ /* { "org.gnome.desktop.interface", "show-input-method-menu", "Gtk/ShowInputMethodMenu", translate_bool_int },
+ { "org.gnome.desktop.interface", "show-unicode-menu", "Gtk/ShowUnicodeMenu", translate_bool_int },
+- { "org.gnome.desktop.interface", "automatic-mnemonics", "Gtk/AutoMnemonics", translate_bool_int },
++ { "org.gnome.desktop.interface", "automatic-mnemonics", "Gtk/AutoMnemonics", translate_bool_int }, */
+
+ { "org.gnome.desktop.sound", "theme-name", "Net/SoundThemeName", translate_string_string },
+ { "org.gnome.desktop.sound", "event-sounds", "Net/EnableEventSounds" , translate_bool_int },
More information about the scm-commits
mailing list