[cinnamon] update to latest git

leigh123linux leigh123linux at fedoraproject.org
Thu Jul 25 11:33:08 UTC 2013


commit 2eb3a489e290615312323578309b41dd563ad154
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Jul 25 12:32:58 2013 +0100

    update to latest git
    
    - fix default theme
    - use fedora firewall in settings
    - use beesu for user accounts instead of gksu

 .gitignore                |    1 +
 cinnamon.spec             |   24 ++++++++++++++++++------
 fix_default_theme.patch   |   20 ++++++++++++++++++++
 replace_gksu.patch        |    9 +++++++++
 sources                   |    2 +-
 use_fedora_firewall.patch |   11 +++++++++++
 6 files changed, 60 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 90f0dd1..06ae932 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /gnome-settings-daemon-compat-3.6.4.tar.xz
 /gnome-settings-daemon-compat-3.6.4-1.tar.xz
 /cinnamon-1.9.2.gitc321232.tar.gz
+/cinnamon-1.9.2.git435e7a2.tar.gz
diff --git a/cinnamon.spec b/cinnamon.spec
index 47928fa..3cada16 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,8 +1,8 @@
-%global _internal_version  c321232
+%global _internal_version  435e7a2
 
 Name:           cinnamon
 Version:        1.9.2
-Release:        0.2.git%{_internal_version}%{?dist}
+Release:        0.3.git%{_internal_version}%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com
@@ -20,8 +20,11 @@ Patch1:         bluetooth_obex_transfer.patch
 Patch2:         autostart_nemo.patch
 Patch3:         menu_editor.patch
 Patch4:         screensaver.patch
-Patch5:         keyboard_applet.patch
-Patch6:         idle-dim.patch
+Patch5:         fix_default_theme.patch
+Patch6:         replace_gksu.patch
+Patch7:         use_fedora_firewall.patch
+Patch8:         keyboard_applet.patch
+Patch9:         idle-dim.patch
 
 %global clutter_version 1.12.2
 %global gobject_introspection_version 1.34.2
@@ -130,8 +133,11 @@ The emphasis is put on making users feel at home and providing
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-#patch5 -p1
-#patch6 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+#patch8 -p1
+#patch9 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -205,6 +211,12 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Thu Jul 25 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.9.2-0.3.git435e7a2
+- update to latest git
+- fix default theme
+- use fedora firewall in settings
+- use beesu for user accounts instead of gksu
+
 * Wed Jul 24 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.9.2-0.2.gitc321232
 - fix control-center settings on x86_64
 - drop clutter xinput patch
diff --git a/fix_default_theme.patch b/fix_default_theme.patch
new file mode 100644
index 0000000..815b0f0
--- /dev/null
+++ b/fix_default_theme.patch
@@ -0,0 +1,20 @@
+--- a/js/ui/main.js
++++ b/js/ui/main.js
+@@ -90,8 +90,6 @@ const LAYOUT_TRADITIONAL = "traditional"
+ const LAYOUT_FLIPPED = "flipped";
+ const LAYOUT_CLASSIC = "classic";
+ 
+-const FALLBACK_THEME_PATH = "/usr/share/cinnamon/theme/cinnamon.css"
+-
+ const CIN_LOG_FOLDER = GLib.get_home_dir() + '/.cinnamon/';
+ 
+ let automountManager = null;
+@@ -777,7 +775,7 @@ function loadTheme() {
+     if (_cssStylesheet != null)
+         cssStylesheet = _cssStylesheet;
+ 
+-    let theme = new St.Theme( {default_stylesheet: FALLBACK_THEME_PATH} );
++    let theme = new St.Theme();
+     theme.load_stylesheet(cssStylesheet);
+     
+     themeContext.set_theme (theme);
diff --git a/replace_gksu.patch b/replace_gksu.patch
new file mode 100644
index 0000000..f532d70
--- /dev/null
+++ b/replace_gksu.patch
@@ -0,0 +1,9 @@
+--- a/files/usr/bin/cinnamon-settings-users
++++ b/files/usr/bin/cinnamon-settings-users
+@@ -2,5 +2,5 @@
+ 
+ import os
+ 
+-os.system("gksu /usr/lib/cinnamon-settings-users/cinnamon-settings-users.py")
++os.system("beesu /usr/lib/cinnamon-settings-users/cinnamon-settings-users.py")
+ 
diff --git a/sources b/sources
index bd97d6a..e29b004 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-355ca8a3f87306b6f56718f2a3206f73  cinnamon-1.9.2.gitc321232.tar.gz
+52ef252447d508de440ba7ed486f866d  cinnamon-1.9.2.git435e7a2.tar.gz
diff --git a/use_fedora_firewall.patch b/use_fedora_firewall.patch
new file mode 100644
index 0000000..e24fc34
--- /dev/null
+++ b/use_fedora_firewall.patch
@@ -0,0 +1,11 @@
+--- a/files/usr/lib/cinnamon-settings/cinnamon-settings.py
++++ b/files/usr/lib/cinnamon-settings/cinnamon-settings.py
+@@ -64,7 +64,7 @@ STANDALONE_MODULES = [
+ #         Label                          Executable                          Icon                Category        Advanced?               Keywords for filter
+     [_("Printers"),                      "system-config-printer",        "printer.svg",         "hardware",       False,          _("printers, laser, inkjet")],
+     [_("Bluetooth"),                     "blueman-manager",              "bluetooth.svg",       "hardware",       False,          _("bluetooth, dongle, transfer, mobile")],
+-    [_("Firewall"),                      "gufw",                         "firewall.svg",        "prefs",          True,           _("firewall, block, filter, programs")],
++    [_("Firewall"),                      "firewall-config",              "firewall.svg",        "prefs",          True,           _("firewall, block, filter, programs")],
+     [_("Languages"),                     "gnome-language-selector",      "language.svg",        "prefs",          False,          _("language, install, foreign")],
+     [_("Login Screen"),                  "gksu /usr/sbin/mdmsetup",      "login.svg",           "prefs",          True,           _("login, mdm, gdm, manager, user, password, startup, switch")],
+     [_("Startup Programs"),              "cinnamon-session-properties",  "startup-programs.svg","prefs",          False,          _("startup, programs, boot, init, session")],


More information about the scm-commits mailing list