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

[Alexandre Filgueira]

    Date: Saturday, November 1, 2014 @ 19:35:26
  Author: faidoc
Revision: 121665

upgpkg: cinnamon 2.4.0-1

Modified:
  cinnamon/trunk/PKGBUILD
Deleted:
  cinnamon/trunk/calendar-applet-upower-support.patch

--------------------------------------+
 PKGBUILD                             |   11 +++--------
 calendar-applet-upower-support.patch |   17 -----------------
 2 files changed, 3 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-01 18:18:47 UTC (rev 121664)
+++ PKGBUILD	2014-11-01 18:35:26 UTC (rev 121665)
@@ -5,8 +5,8 @@
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=2.2.16
-pkgrel=2
+pkgver=2.4.0
+pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="http://cinnamon.linuxmint.com/"
@@ -22,11 +22,9 @@
 options=('!emptydirs')
 install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
-        "calendar-applet-upower-support.patch"
         "set_wheel.patch"
         "gnome-3.14.patch")
-sha256sums=('1fc0bc1b6dbd071ca61f90c5cac5e41abfddbfa77577bdf3407afd1c1ca04793'
-            '9ba15442531537759a78a4ab6d0be55dc2fa84a5157bb3fd912c259bfe24dcd8'
+sha256sums=('8c995f60e28ac0efb3ee478c53425679f76b8d384a8d66d73dd3571f42d9f728'
             '3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444'
             'da763a88b4ee2e889afffd189b877708ca34b704fe7e9b62c0cc2bd970564058')
 
@@ -37,9 +35,6 @@
   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@'
 
-  # Fix calendar applet with upower 0.99
-  patch -Np1 -i ../calendar-applet-upower-support.patch
-
   # Use wheel group instread of sudo
   patch -Np1 -i ../set_wheel.patch
 

Deleted: calendar-applet-upower-support.patch
===================================================================
--- calendar-applet-upower-support.patch	2014-11-01 18:18:47 UTC (rev 121664)
+++ calendar-applet-upower-support.patch	2014-11-01 18:35:26 UTC (rev 121665)
@@ -1,17 +0,0 @@
-Index: cinnamon/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js
-===================================================================
---- cinnamon.orig/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js	2014-04-27 11:56:10.582581808 +0200
-+++ cinnamon/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js	2014-07-14 00:44:37.882215797 +0200
-@@ -94,7 +94,11 @@
- 
-             // https://bugzilla.gnome.org/show_bug.cgi?id=655129
-             this._upClient = new UPowerGlib.Client();
--            this._upClient.connect('notify-resume', this._updateClockAndDate);
-+            try {
-+                this._upClient.connect('notify-resume', this._updateClockAndDate);
-+            } catch (e) {
-+                this._upClient.connect('notify::resume', this._updateClockAndDate);
-+            }
- 
-             // Start the clock
-             this.on_settings_changed();