[arch-commits] Commit in cinnamon/repos (8 files)

Balló György bgyorgy at archlinux.org
Sun Nov 23 00:10:05 UTC 2014


    Date: Sunday, November 23, 2014 @ 01:10:05
  Author: bgyorgy
Revision: 122970

archrelease: copy trunk to community-i686, community-x86_64

Deleted:
  cinnamon/repos/community-i686/PKGBUILD
  cinnamon/repos/community-i686/cinnamon.install
  cinnamon/repos/community-i686/gnome-3.14.patch
  cinnamon/repos/community-i686/set_wheel.patch
  cinnamon/repos/community-x86_64/PKGBUILD
  cinnamon/repos/community-x86_64/cinnamon.install
  cinnamon/repos/community-x86_64/gnome-3.14.patch
  cinnamon/repos/community-x86_64/set_wheel.patch

-----------------------------------+
 community-i686/PKGBUILD           |   91 ------------------------------------
 community-i686/cinnamon.install   |   12 ----
 community-i686/gnome-3.14.patch   |   25 ---------
 community-i686/set_wheel.patch    |   53 --------------------
 community-x86_64/PKGBUILD         |   91 ------------------------------------
 community-x86_64/cinnamon.install |   12 ----
 community-x86_64/gnome-3.14.patch |   25 ---------
 community-x86_64/set_wheel.patch  |   53 --------------------
 8 files changed, 362 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-11-23 00:09:44 UTC (rev 122969)
+++ community-i686/PKGBUILD	2014-11-23 00:10:05 UTC (rev 122970)
@@ -1,91 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
-# Contributor: M0Rf30
-# Contributor: unifiedlinux
-# Contributor: CReimer
-
-pkgname=cinnamon
-pkgver=2.4.3
-pkgrel=2
-pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
-arch=('i686' 'x86_64')
-url="http://cinnamon.linuxmint.com/"
-license=('GPL2')
-depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session'
-         'cinnamon-translations' 'cjs' 'clutter-gtk' 'gnome-backgrounds' 'gconf'
-         'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' 'librsvg'
-         'networkmanager' 'muffin' 'python2-cairo' 'python2-dbus' 'python2-pillow'
-         'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk'
-         'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd'
-         'network-manager-applet' 'nemo' 'polkit-gnome')
-makedepends=('gnome-common' 'intltool')
-options=('!emptydirs')
-install=${pkgname}.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
-        "ignore-bluetooth-applet.patch"
-        "fix-cinnamon2d.patch"
-        "set_wheel.patch"
-        "gnome-3.14.patch"
-        "default-theme.patch")
-sha256sums=('959094294919f977ae3c88ef51e2cd8e1e35530e36fe089eeb5a5961fb5b00df'
-            '5dd8fc761884931a8f13a802b262155fc5058d6f42aa6fb655f08736c565c2db'
-            '8df4c41c6f9e3e878c02e976f6c7bc170405ffae539ec4fbad64eae8270e6eda'
-            '3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444'
-            'da763a88b4ee2e889afffd189b877708ca34b704fe7e9b62c0cc2bd970564058'
-            '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5')
-
-prepare() {
-  cd ${srcdir}/Cinnamon*
-
-  # Python2 fix
-  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@'
-
-  # Upstream fixes
-  patch -Np1 -i ../ignore-bluetooth-applet.patch
-  patch -Np1 -i ../fix-cinnamon2d.patch
-
-  # Use wheel group instread of sudo
-  patch -Np1 -i ../set_wheel.patch
-
-  # Some fixes for GNOME 3.14
-  patch -Np1 -i ../gnome-3.14.patch
-
-  # Set default theme to 'cinnamon'
-  patch -Np1 -i ../default-theme.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
-
-  # Use pkexec instead of gksu
-  sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
-
-  # Check for the cc-panel path, not for the unneeded binary
-  sed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings
-
-  # 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
-}
-
-build() {
-  cd ${srcdir}/Cinnamon*
-
-  ./autogen.sh --prefix=/usr \
-               --sysconfdir=/etc \
-               --libexecdir=/usr/lib/cinnamon \
-               --localstatedir=/var \
-               --disable-static \
-               --disable-schemas-compile \
-               --enable-compile-warnings=yes \
-               --with-session-tracking=systemd
-  make
-}
-
-package() {
-  cd ${srcdir}/Cinnamon*
-  make DESTDIR="${pkgdir}" install
-}

Deleted: community-i686/cinnamon.install
===================================================================
--- community-i686/cinnamon.install	2014-11-23 00:09:44 UTC (rev 122969)
+++ community-i686/cinnamon.install	2014-11-23 00:10:05 UTC (rev 122970)
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Deleted: community-i686/gnome-3.14.patch
===================================================================
--- community-i686/gnome-3.14.patch	2014-11-23 00:09:44 UTC (rev 122969)
+++ community-i686/gnome-3.14.patch	2014-11-23 00:10:05 UTC (rev 122970)
@@ -1,25 +0,0 @@
-diff -Naur Cinnamon-2.2.16.orig/data/theme/cinnamon.css Cinnamon-2.2.16/data/theme/cinnamon.css
---- Cinnamon-2.2.16.orig/data/theme/cinnamon.css	2014-08-12 13:00:36.000000000 +0200
-+++ Cinnamon-2.2.16/data/theme/cinnamon.css	2014-10-01 02:51:45.859630151 +0200
-@@ -1445,7 +1445,8 @@
- .applet-icon:hover,
- .applet-box:hover > .applet-icon {
- 	color: #fff;
--	icon-shadow: white 0px 0px 3px;
-+/* Broken with GNOME 3.14 (icon-size is not honoured)
-+ *	icon-shadow: white 0px 0px 3px;*/
- }
- 
- /* ===================================================================
-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
-@@ -91,7 +91,7 @@
-     
-     def _load_icon_themes(self):
-         dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"), ".icons"))
--        valid = walk_directories(dirs, lambda d: os.path.isdir(d) and not os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d, "index.theme")))
-+        valid = walk_directories(dirs, lambda d: os.path.isdir(d) and os.path.exists(os.path.join(d, "index.theme")))
-         valid.sort(lambda a,b: cmp(a.lower(), b.lower()))
-         res = []
-         for i in valid:

Deleted: community-i686/set_wheel.patch
===================================================================
--- community-i686/set_wheel.patch	2014-11-23 00:09:44 UTC (rev 122969)
+++ community-i686/set_wheel.patch	2014-11-23 00:10:05 UTC (rev 122970)
@@ -1,53 +0,0 @@
---- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-+++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -144,12 +144,11 @@ class EditableEntry (Gtk.Notebook):
- 
- class PasswordDialog(Gtk.Dialog):
- 
--    def __init__ (self, user, password_mask, group_mask):            
-+    def __init__ (self, user, password_mask):
-         super(PasswordDialog, self).__init__()
- 
-         self.user = user
-         self.password_mask = password_mask
--        self.group_mask = group_mask
- 
-         self.set_modal(True)
-         self.set_skip_taskbar_hint(True)
-@@ -215,12 +214,6 @@ class PasswordDialog(Gtk.Dialog):
-     def change_password(self):        
-         newpass = self.new_password.get_text()
-         self.user.set_password(newpass, "")
--        os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
--        mask = self.group_mask.get_text()
--        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.destroy()  
- 
-@@ -515,7 +508,7 @@ class Module:
-         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)                
-             response = dialog.run()
- 
-     def _on_groups_button_clicked(self, widget): 
-@@ -745,11 +738,11 @@ class Module:
-             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])
--            # 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)) 
-             else:
--                os.system("usermod %s -G %s,nopasswdlogin" % (username, username))
-+                os.system("usermod %s -G %s" % (username, username))
-             self.load_groups()
-         dialog.destroy()
-          

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-11-23 00:09:44 UTC (rev 122969)
+++ community-x86_64/PKGBUILD	2014-11-23 00:10:05 UTC (rev 122970)
@@ -1,91 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
-# Contributor: M0Rf30
-# Contributor: unifiedlinux
-# Contributor: CReimer
-
-pkgname=cinnamon
-pkgver=2.4.3
-pkgrel=2
-pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
-arch=('i686' 'x86_64')
-url="http://cinnamon.linuxmint.com/"
-license=('GPL2')
-depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session'
-         'cinnamon-translations' 'cjs' 'clutter-gtk' 'gnome-backgrounds' 'gconf'
-         'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' 'librsvg'
-         'networkmanager' 'muffin' 'python2-cairo' 'python2-dbus' 'python2-pillow'
-         'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk'
-         'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd'
-         'network-manager-applet' 'nemo' 'polkit-gnome')
-makedepends=('gnome-common' 'intltool')
-options=('!emptydirs')
-install=${pkgname}.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
-        "ignore-bluetooth-applet.patch"
-        "fix-cinnamon2d.patch"
-        "set_wheel.patch"
-        "gnome-3.14.patch"
-        "default-theme.patch")
-sha256sums=('959094294919f977ae3c88ef51e2cd8e1e35530e36fe089eeb5a5961fb5b00df'
-            '5dd8fc761884931a8f13a802b262155fc5058d6f42aa6fb655f08736c565c2db'
-            '8df4c41c6f9e3e878c02e976f6c7bc170405ffae539ec4fbad64eae8270e6eda'
-            '3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444'
-            'da763a88b4ee2e889afffd189b877708ca34b704fe7e9b62c0cc2bd970564058'
-            '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5')
-
-prepare() {
-  cd ${srcdir}/Cinnamon*
-
-  # Python2 fix
-  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@'
-
-  # Upstream fixes
-  patch -Np1 -i ../ignore-bluetooth-applet.patch
-  patch -Np1 -i ../fix-cinnamon2d.patch
-
-  # Use wheel group instread of sudo
-  patch -Np1 -i ../set_wheel.patch
-
-  # Some fixes for GNOME 3.14
-  patch -Np1 -i ../gnome-3.14.patch
-
-  # Set default theme to 'cinnamon'
-  patch -Np1 -i ../default-theme.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
-
-  # Use pkexec instead of gksu
-  sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
-
-  # Check for the cc-panel path, not for the unneeded binary
-  sed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings
-
-  # 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
-}
-
-build() {
-  cd ${srcdir}/Cinnamon*
-
-  ./autogen.sh --prefix=/usr \
-               --sysconfdir=/etc \
-               --libexecdir=/usr/lib/cinnamon \
-               --localstatedir=/var \
-               --disable-static \
-               --disable-schemas-compile \
-               --enable-compile-warnings=yes \
-               --with-session-tracking=systemd
-  make
-}
-
-package() {
-  cd ${srcdir}/Cinnamon*
-  make DESTDIR="${pkgdir}" install
-}

Deleted: community-x86_64/cinnamon.install
===================================================================
--- community-x86_64/cinnamon.install	2014-11-23 00:09:44 UTC (rev 122969)
+++ community-x86_64/cinnamon.install	2014-11-23 00:10:05 UTC (rev 122970)
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Deleted: community-x86_64/gnome-3.14.patch
===================================================================
--- community-x86_64/gnome-3.14.patch	2014-11-23 00:09:44 UTC (rev 122969)
+++ community-x86_64/gnome-3.14.patch	2014-11-23 00:10:05 UTC (rev 122970)
@@ -1,25 +0,0 @@
-diff -Naur Cinnamon-2.2.16.orig/data/theme/cinnamon.css Cinnamon-2.2.16/data/theme/cinnamon.css
---- Cinnamon-2.2.16.orig/data/theme/cinnamon.css	2014-08-12 13:00:36.000000000 +0200
-+++ Cinnamon-2.2.16/data/theme/cinnamon.css	2014-10-01 02:51:45.859630151 +0200
-@@ -1445,7 +1445,8 @@
- .applet-icon:hover,
- .applet-box:hover > .applet-icon {
- 	color: #fff;
--	icon-shadow: white 0px 0px 3px;
-+/* Broken with GNOME 3.14 (icon-size is not honoured)
-+ *	icon-shadow: white 0px 0px 3px;*/
- }
- 
- /* ===================================================================
-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
-@@ -91,7 +91,7 @@
-     
-     def _load_icon_themes(self):
-         dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"), ".icons"))
--        valid = walk_directories(dirs, lambda d: os.path.isdir(d) and not os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d, "index.theme")))
-+        valid = walk_directories(dirs, lambda d: os.path.isdir(d) and os.path.exists(os.path.join(d, "index.theme")))
-         valid.sort(lambda a,b: cmp(a.lower(), b.lower()))
-         res = []
-         for i in valid:

Deleted: community-x86_64/set_wheel.patch
===================================================================
--- community-x86_64/set_wheel.patch	2014-11-23 00:09:44 UTC (rev 122969)
+++ community-x86_64/set_wheel.patch	2014-11-23 00:10:05 UTC (rev 122970)
@@ -1,53 +0,0 @@
---- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-+++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -144,12 +144,11 @@ class EditableEntry (Gtk.Notebook):
- 
- class PasswordDialog(Gtk.Dialog):
- 
--    def __init__ (self, user, password_mask, group_mask):            
-+    def __init__ (self, user, password_mask):
-         super(PasswordDialog, self).__init__()
- 
-         self.user = user
-         self.password_mask = password_mask
--        self.group_mask = group_mask
- 
-         self.set_modal(True)
-         self.set_skip_taskbar_hint(True)
-@@ -215,12 +214,6 @@ class PasswordDialog(Gtk.Dialog):
-     def change_password(self):        
-         newpass = self.new_password.get_text()
-         self.user.set_password(newpass, "")
--        os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
--        mask = self.group_mask.get_text()
--        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.destroy()  
- 
-@@ -515,7 +508,7 @@ class Module:
-         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)                
-             response = dialog.run()
- 
-     def _on_groups_button_clicked(self, widget): 
-@@ -745,11 +738,11 @@ class Module:
-             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])
--            # 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)) 
-             else:
--                os.system("usermod %s -G %s,nopasswdlogin" % (username, username))
-+                os.system("usermod %s -G %s" % (username, username))
-             self.load_groups()
-         dialog.destroy()
-          


More information about the arch-commits mailing list