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

Balló György bgyorgy at archlinux.org
Sun Nov 23 18:46:18 UTC 2014


    Date: Sunday, November 23, 2014 @ 19:46:18
  Author: bgyorgy
Revision: 123006

upgpkg: cinnamon 2.4.4-1

Update to version 2.4.4

Modified:
  cinnamon/trunk/PKGBUILD
Deleted:
  cinnamon/trunk/fix-cinnamon2d.patch
  cinnamon/trunk/ignore-bluetooth-applet.patch

-------------------------------+
 PKGBUILD                      |   14 ++-----------
 fix-cinnamon2d.patch          |   21 -------------------
 ignore-bluetooth-applet.patch |   43 ----------------------------------------
 3 files changed, 3 insertions(+), 75 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-23 17:40:25 UTC (rev 123005)
+++ PKGBUILD	2014-11-23 18:46:18 UTC (rev 123006)
@@ -5,8 +5,8 @@
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=2.4.3
-pkgrel=3
+pkgver=2.4.4
+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,14 +22,10 @@
 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'
+sha256sums=('991df51a78970ce92e730c4a36af004f83dde483f34b9b3abcd38ebf239ab45f'
             '3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444'
             'da763a88b4ee2e889afffd189b877708ca34b704fe7e9b62c0cc2bd970564058'
             '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5')
@@ -41,10 +37,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@'
 
-  # 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
 

Deleted: fix-cinnamon2d.patch
===================================================================
--- fix-cinnamon2d.patch	2014-11-23 17:40:25 UTC (rev 123005)
+++ fix-cinnamon2d.patch	2014-11-23 18:46:18 UTC (rev 123006)
@@ -1,21 +0,0 @@
-From e9c28b75626f180a67c8ed577ac284ea005e8a2d Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster at gmail.com>
-Date: Sat, 22 Nov 2014 12:45:30 -0500
-Subject: [PATCH] Fix 2d session requirements
-
----
- files/usr/share/cinnamon-session/sessions/cinnamon2d.session | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/files/usr/share/cinnamon-session/sessions/cinnamon2d.session b/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
-index 7f172ad..4e65c89 100644
---- a/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
-+++ b/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
-@@ -1,6 +1,6 @@
- [Cinnamon Session]
- Name=Cinnamon (Software Rendering)
--RequiredComponents=cinnamon;cinnamon-settings-daemon;cinnamon-screensaver;nemo-autostart;nm-applet;
-+RequiredComponents=cinnamon2d;cinnamon-settings-daemon;cinnamon-screensaver;nemo-autostart;nm-applet;
- DesktopName=X-Cinnamon
- 
- 

Deleted: ignore-bluetooth-applet.patch
===================================================================
--- ignore-bluetooth-applet.patch	2014-11-23 17:40:25 UTC (rev 123005)
+++ ignore-bluetooth-applet.patch	2014-11-23 18:46:18 UTC (rev 123006)
@@ -1,43 +0,0 @@
-From 9397158303284bff0b85a3b329e4e8b2fff7eba7 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster at gmail.com>
-Date: Mon, 17 Nov 2014 11:49:27 -0500
-Subject: [PATCH] xlets: silently ignore uninstalled items (like bluetooth)
-
----
- js/ui/extension.js | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/js/ui/extension.js b/js/ui/extension.js
-index 3de89a6..80b5734 100644
---- a/js/ui/extension.js
-+++ b/js/ui/extension.js
-@@ -377,8 +377,8 @@ function loadExtension(uuid, type) {
-         var forgetMeta = true;
-         try {
-             let dir = findExtensionDirectory(uuid, type);
--            if(dir == null) {
--                throw (type.name + ' ' + uuid + ' not found.');
-+            if (dir == null) {
-+                throw ("not-found");
-             }
-             extension = new Extension(dir, type);
-             forgetMeta = false;
-@@ -388,7 +388,17 @@ function loadExtension(uuid, type) {
- 
-             extension.finalize();
-             Main.cinnamonDBusService.EmitXletAddedComplete(true, uuid);
--        } catch(e) {
-+        } catch (e) {
-+            /* Silently fail to load xlets that aren't actually installed - 
-+               but no error, since the user can't do anything about it anyhow
-+               (short of editing gsettings).  Silent failure is consistent with
-+               other reactions in Cinnamon to missing items (e.g. panel launchers
-+               just don't show up if their program isn't installed, but we don't
-+               remove them or anything) */
-+            if (e == "not-found") {
-+                forgetExtension(uuid, forgetMeta);
-+                return null;
-+            }
-             Main.cinnamonDBusService.EmitXletAddedComplete(false, uuid);
-             Main.xlet_startup_error = true;
-             forgetExtension(uuid, forgetMeta);


More information about the arch-commits mailing list