[arch-commits] Commit in cinnamon/trunk (4 files)

Balló György bgyorgy at archlinux.org
Fri Nov 20 20:43:33 UTC 2015


    Date: Friday, November 20, 2015 @ 21:43:33
  Author: bgyorgy
Revision: 147266

upgpkg: cinnamon 2.8.5-1

Update to new version

Modified:
  cinnamon/trunk/PKGBUILD
  cinnamon/trunk/gnome-3.14.patch
  cinnamon/trunk/set_wheel.patch
Deleted:
  cinnamon/trunk/fix-keyboard-flags.patch

--------------------------+
 PKGBUILD                 |   48 +++++++++++++++++++++++----------------------
 fix-keyboard-flags.patch |   21 -------------------
 gnome-3.14.patch         |    6 ++---
 set_wheel.patch          |   40 ++++++++++++++++++-------------------
 4 files changed, 48 insertions(+), 67 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-20 20:16:44 UTC (rev 147265)
+++ PKGBUILD	2015-11-20 20:43:33 UTC (rev 147266)
@@ -5,11 +5,11 @@
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=2.6.13
-pkgrel=3
+pkgver=2.8.5
+pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
-url="http://cinnamon.linuxmint.com/"
+url="https://github.com/linuxmint/Cinnamon"
 license=('GPL2')
 depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session'
          'cinnamon-translations' 'cjs' 'clutter-gtk' 'gnome-backgrounds' 'gconf'
@@ -27,14 +27,12 @@
         "set_wheel.patch"
         "gnome-3.14.patch"
         "default-theme.patch"
-        "dont-hardcode-nemo.patch"
-        "fix-keyboard-flags.patch")
-sha256sums=('f349403901bf3e84cda2ebd425dc6f58850059092775e285862067f120debe86'
-            '2f0fec7d733aa19be426a0e1aecff1af451183de038d2868a2ee3195f227956e'
-            '5ecce3c1617c0479ef97290494aaaa4e5a58d24de31d00a527d44921e2a44d91'
+        "dont-hardcode-nemo.patch")
+sha256sums=('5058a927b80d7443ef547b543a2ccff4284a9587f4df77ef8032d6c6ea997131'
+            '97542a424fa83c18c8c8a6d27c089129f30b6fb4cc128c662ac0da3aebf42dcc'
+            '31479171797f9fc88b91ef1294cc338b29c247f589ab84ff87b60bff06a6920a'
             '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5'
-            '26a9fb9a3855759cc7d5fa9a195ae8860d5c6b3e12adc1bfe86269e047c119b4'
-            '35478dd7df2ecee484bbe758885ed55797e0567643615984973d153f34700016')
+            '26a9fb9a3855759cc7d5fa9a195ae8860d5c6b3e12adc1bfe86269e047c119b4')
             
 prepare() {
   cd ${srcdir}/Cinnamon*
@@ -43,7 +41,7 @@
   sed -i 's:/usr/bin/python :/usr/bin/python2 :' files/usr/bin/cinnamon-menu-editor
   find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
-  # Use wheel group instread of sudo
+  # Use wheel group instread of sudo (taken from Fedora)
   patch -Np1 -i ../set_wheel.patch
 
   # Make Adwaita icon theme selectable in theme settings
@@ -55,15 +53,12 @@
   # Don't hardcode Nemo
   patch -Np1 -i ../dont-hardcode-nemo.patch
 
-  # Fix missing flags in keyboard applet (FS#45615)
-  patch -Np1 -i ../fix-keyboard-flags.patch
-
   # Add polkit agent to required components
   sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
     files/usr/share/cinnamon-session/sessions/cinnamon*.session
 
   # Fix for the python2 PAM module  
-  sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py
+  sed -i 's:import PAM:import pam:' files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
 
   # Use pkexec instead of gksu
   sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
@@ -74,29 +69,32 @@
 
   # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
   sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \
-    files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
+    files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
 
   # Fix selected background color in Cinnamon Settings for Adwaita theme
   sed -i 's/@selected_bg_color;/@theme_selected_bg_color;/' \
-    files/usr/lib/cinnamon-settings/cinnamon-settings.py
+    files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
 
   # Fix missing icons with the Adwaita theme
   sed -i 's/"gtk-file"/"text-x-generic"/' docs/applets-examples/finder at cinnamon.org/applet.js  src/cinnamon-util.c
   sed -i "s/SECONDARY, 'ok'/SECONDARY, 'gtk-apply'/
-          s/SECONDARY, 'stop'/SECONDARY, 'dialog-error'/" files/usr/lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py
-  sed -i "s/'gnome-panel-launcher'/'system-run'/" files/usr/lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py
-  sed -i 's/icon_name">gnome-panel-launcher/icon_name">system-run/' files/usr/lib/cinnamon-desktop-editor/launcher-editor.ui
-  sed -i 's/"reload"/"view-refresh"/' files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
+          s/SECONDARY, 'stop'/SECONDARY, 'dialog-error'/" files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+  sed -i "s/'gnome-panel-launcher'/'system-run'/" files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+  sed -i 's/icon_name">gnome-panel-launcher/icon_name">system-run/' files/usr/share/cinnamon/cinnamon-desktop-editor/launcher-editor.ui
+  sed -i 's/"reload"/"view-refresh"/' files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
   sed -i 's/"gtk-dialog-question"/"dialog-question"/
-          s/"gtk-directory"/"folder"/' files/usr/lib/cinnamon-settings/modules/cs_default.py
+          s/"gtk-directory"/"folder"/' files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py
   sed -i 's/"display"/"video-display"/
           s/"access"/"preferences-desktop-accessibility"/
-          s/"gnome-panel-launcher"/"system-run"/' files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
+          s/"gnome-panel-launcher"/"system-run"/' files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py
   sed -i 's/"stock_calendar"/"x-office-calendar"/' files/usr/share/cinnamon/applets/calendar at cinnamon.org/metadata.json
   sed -i 's/"keyboard"/"input-keyboard"/' files/usr/share/cinnamon/applets/keyboard at cinnamon.org/metadata.json
   sed -i 's/"desktop"/"user-desktop"/' files/usr/share/cinnamon/applets/show-desktop at cinnamon.org/metadata.json
   sed -i 's/"stock_volume"/"multimedia-volume-control"/' files/usr/share/cinnamon/applets/sound at cinnamon.org/metadata.json
   sed -i 's/"stock_calendar"/"x-office-calendar"/' files/usr/share/cinnamon/desklets/clock at cinnamon.org/metadata.json
+
+  # Remove broken symlink
+  rm files/etc/xdg/menus/cinnamon-applications-merged
 }
 
 build() {
@@ -109,6 +107,10 @@
                --disable-static \
                --disable-schemas-compile \
                --enable-compile-warnings=yes
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 

Deleted: fix-keyboard-flags.patch
===================================================================
--- fix-keyboard-flags.patch	2015-11-20 20:16:44 UTC (rev 147265)
+++ fix-keyboard-flags.patch	2015-11-20 20:43:33 UTC (rev 147266)
@@ -1,21 +0,0 @@
-diff -Naur Cinnamon-2.6.13.old/files/usr/share/cinnamon/applets/keyboard at cinnamon.org/applet.js Cinnamon-2.6.13/files/usr/share/cinnamon/applets/keyboard at cinnamon.org/applet.js
---- Cinnamon-2.6.13.old/files/usr/share/cinnamon/applets/keyboard at cinnamon.org/applet.js	2015-08-11 14:00:42.008882266 +0000
-+++ Cinnamon-2.6.13/files/usr/share/cinnamon/applets/keyboard at cinnamon.org/applet.js	2015-08-11 14:09:14.683803907 +0000
-@@ -139,7 +139,7 @@
-         for (let i = 0; i < groups.length; i++) {
-             let icon_name = this._config.get_group_name(i);
-             let actor;
--            if (this._showFlags && this.icon_theme.has_icon(icon_name))
-+            if (this._showFlags)
-                 actor = new St.Icon({ icon_name: icon_name, icon_type: St.IconType.FULLCOLOR, style_class: 'popup-menu-icon' });
-             else
-                 actor = new St.Label({ text: short_names[i] });
-@@ -171,7 +171,7 @@
-         let selectedLabel = this._labelActors[selected];
-
-         this.set_applet_tooltip(item._long_name)
--        if (this._showFlags && this.icon_theme.has_icon(item._icon_name)) {
-+        if (this._showFlags) {
-             this.set_applet_icon_name(item._icon_name);
-             this.set_applet_label("");
-         } else {

Modified: gnome-3.14.patch
===================================================================
--- gnome-3.14.patch	2015-11-20 20:16:44 UTC (rev 147265)
+++ gnome-3.14.patch	2015-11-20 20:43:33 UTC (rev 147266)
@@ -1,6 +1,6 @@
-diff -Naur Cinnamon-2.2.16.orig/files/usr/lib/cinnamon-settings/modules/cs_themes.py Cinnamon-2.2.16/files/usr/lib/cinnamon-settings/modules/cs_themes.py
---- Cinnamon-2.2.16.orig/files/usr/lib/cinnamon-settings/modules/cs_themes.py	2014-08-12 13:00:36.000000000 +0200
-+++ Cinnamon-2.2.16/files/usr/lib/cinnamon-settings/modules/cs_themes.py	2014-10-01 02:52:56.897767729 +0200
+diff -Naur Cinnamon-2.2.16.orig/files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py Cinnamon-2.2.16/files/usr/lib/cinnamon-settings/modules/cs_themes.py
+--- Cinnamon-2.2.16.orig/files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py	2014-08-12 13:00:36.000000000 +0200
++++ Cinnamon-2.2.16/files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py	2014-10-01 02:52:56.897767729 +0200
 @@ -91,7 +91,7 @@
      
      def _load_icon_themes(self):

Modified: set_wheel.patch
===================================================================
--- set_wheel.patch	2015-11-20 20:16:44 UTC (rev 147265)
+++ set_wheel.patch	2015-11-20 20:43:33 UTC (rev 147266)
@@ -1,11 +1,11 @@
---- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-+++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -145,12 +145,11 @@ class EditableEntry (Gtk.Notebook):
+--- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
++++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+@@ -147,12 +147,11 @@
  
  class PasswordDialog(Gtk.Dialog):
  
--    def __init__ (self, user, password_mask, group_mask):            
-+    def __init__ (self, user, password_mask):            
+-    def __init__ (self, user, password_mask, group_mask):
++    def __init__ (self, user, password_mask):
          super(PasswordDialog, self).__init__()
  
          self.user = user
@@ -14,32 +14,32 @@
  
          self.set_modal(True)
          self.set_skip_taskbar_hint(True)
-@@ -216,14 +215,7 @@ class PasswordDialog(Gtk.Dialog):
-     def change_password(self):        
+@@ -218,14 +217,7 @@
+     def change_password(self):
          newpass = self.new_password.get_text()
          self.user.set_password(newpass, "")
 -        mask = self.group_mask.get_text()
 -        if "nopasswdlogin" in mask:
--            os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
+-            subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"])
 -            mask = mask.split(", ")
 -            mask.remove("nopasswdlogin")
 -            mask = ", ".join(mask)
 -            self.group_mask.set_text(mask)
 -            self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
-+	self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
-         self.destroy()  
++        self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
+         self.destroy()
  
      def set_passwords_visibility(self):
-@@ -517,7 +509,7 @@ class Module:
+@@ -563,7 +555,7 @@
          model, treeiter = self.users_treeview.get_selection().get_selected()
          if treeiter != None:
-             user = model[treeiter][INDEX_USER_OBJECT]       
--            dialog = PasswordDialog(user, self.password_mask, self.groups_label)                
-+            dialog = PasswordDialog(user, self.password_mask)                
+             user = model[treeiter][INDEX_USER_OBJECT]
+-            dialog = PasswordDialog(user, self.password_mask, self.groups_label)
++            dialog = PasswordDialog(user, self.password_mask)
              response = dialog.run()
  
-     def _on_groups_button_clicked(self, widget): 
-@@ -756,11 +748,11 @@ class Module:
+     def _on_groups_button_clicked(self, widget):
+@@ -807,11 +799,11 @@
              pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
              description = "<b>%s</b>\n%s" % (fullname, username)
              piter = self.users.append(None, [new_user, pixbuf, description])
@@ -46,11 +46,11 @@
 -            # Add the user to his/her own group and sudo if Administrator was selected
 +            # Add the user to his/her own group and wheel if Administrator was selected
              if dialog.account_type_combo.get_active() == 1:
--                os.system("usermod %s -G %s,sudo,nopasswdlogin" % (username, username)) 
-+                os.system("usermod %s -G %s,wheel" % (username, username)) 
+-                subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
++                subprocess.call(["usermod", username, "-G", "%s,wheel" % username])
              else:
--                os.system("usermod %s -G %s,nopasswdlogin" % (username, username))
-+                os.system("usermod %s -G %s" % (username, username))
+-                subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
++                subprocess.call(["usermod", username, "-G", "%s" % username])
              self.load_groups()
          dialog.destroy()
  



More information about the arch-commits mailing list