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

[Alexandre Filgueira]

    Date: Friday, August 22, 2014 @ 12:05:29
  Author: faidoc
Revision: 117759

upgpkg: cinnamon 2.2.16-1

Modified:
  cinnamon/trunk/PKGBUILD
Deleted:
  cinnamon/trunk/fix_background.patch
  cinnamon/trunk/no-print-password.patch

-------------------------+
 PKGBUILD                |   16 +++-------------
 fix_background.patch    |   14 --------------
 no-print-password.patch |   14 --------------
 3 files changed, 3 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-22 10:02:27 UTC (rev 117758)
+++ PKGBUILD	2014-08-22 10:05:29 UTC (rev 117759)
@@ -5,8 +5,8 @@
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=2.2.14
-pkgrel=2
+pkgver=2.2.16
+pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="http://cinnamon.linuxmint.com/"
@@ -23,13 +23,9 @@
 install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
         "calendar-applet-upower-support.patch"
-        "fix_background.patch"
-        "no-print-password.patch"
         "set_wheel.patch")
-sha256sums=('ffccc44c8b4675ba76510172d8252c3c07a131a9ad7b5ba062740b686a3cb0f9'
+sha256sums=('1fc0bc1b6dbd071ca61f90c5cac5e41abfddbfa77577bdf3407afd1c1ca04793'
             '9ba15442531537759a78a4ab6d0be55dc2fa84a5157bb3fd912c259bfe24dcd8'
-            '1117ac6f76ae65637778a43bc18385a032d1244b578bb28aca6557c4007f9d0a'
-            '14f55e00ac399b19c41c8ab7de8b4cd530e30701c9f1f3f1ca73434ff00d8273'
             '3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444')
 
 prepare() {
@@ -42,12 +38,6 @@
   # Fix calendar applet with upower 0.99
   patch -Np1 -i ../calendar-applet-upower-support.patch
 
-  # Fix Background Module for python2-pillow 2.5.0
-  patch -Np1 -i ../fix_background.patch
-
-  # Don't print passwords to stdout
-  patch -Np1 -i ../no-print-password.patch
-
   # Use wheel group instread of sudo
   patch -Np1 -i ../set_wheel.patch
 

Deleted: fix_background.patch
===================================================================
--- fix_background.patch	2014-08-22 10:02:27 UTC (rev 117758)
+++ fix_background.patch	2014-08-22 10:05:29 UTC (rev 117759)
@@ -1,14 +0,0 @@
-Description: Fix Background Module for python2-pillow 2.5.0-1.
-Author: Claire Farron <diesal3 at googlemail.com>
-Origin: upstream
---- a/files/usr/lib/cinnamon-settings/bin/imtools.py
-+++ b/files/usr/lib/cinnamon-settings/bin/imtools.py
-@@ -859,7 +859,7 @@
-     :type force: bool
-     """
-     # Paste on top
--    if source == mask:
-+    if mask and source == mask:
-         if has_alpha(source):
-             # invert_alpha = the transparant pixels of the destination
-             if has_alpha(destination) and (destination.size == source.size

Deleted: no-print-password.patch
===================================================================
--- no-print-password.patch	2014-08-22 10:02:27 UTC (rev 117758)
+++ no-print-password.patch	2014-08-22 10:05:29 UTC (rev 117759)
@@ -1,14 +0,0 @@
-Description: Cinnamon Settings User: Don't print passwords to stdout
-when changing password and cinnamon-settings is run from terminal.
-Author: Clement Lefebvre
-Origin: upstream
---- a/files/usr/lib/cinnamon-settings/modules/cs_user.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_user.py
-@@ -398,7 +398,6 @@
-     def change_password(self):
-         oldpass = self.current_password.get_text()
-         newpass = self.new_password.get_text()
--        print "Changing %s to %s" % (oldpass, newpass)
-         passwd = pexpect.spawn("/usr/bin/passwd")
-         time.sleep(0.5)
-         passwd.sendline(oldpass)