[arch-commits] Commit in cinnamon/trunk (PKGBUILD git_rollup.patch)

[Alexandre Filgueira]

    Date: Wednesday, October 9, 2013 @ 18:36:22
  Author: faidoc
Revision: 98399

upgpkg: cinnamon 2.0.2-1

Modified:
  cinnamon/trunk/PKGBUILD
Deleted:
  cinnamon/trunk/git_rollup.patch

------------------+
 PKGBUILD         |   11 ++-----
 git_rollup.patch |   76 -----------------------------------------------------
 2 files changed, 3 insertions(+), 84 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-09 15:41:06 UTC (rev 98398)
+++ PKGBUILD	2013-10-09 16:36:22 UTC (rev 98399)
@@ -5,8 +5,8 @@
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=1.9.2
-pkgrel=3
+pkgver=2.0.2
+pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="http://cinnamon.linuxmint.com/"
@@ -29,14 +29,12 @@
         "background.patch"
         "keyboard_applet.patch"
         "input_keybindings.patch"
-        "git_rollup.patch"
         "org.archlinux.pkexec.cinnamon-settings-users.policy")
-sha256sums=('0abaa8da02c4d626084aa482adc551af154796c4c35faaebebdac896ce72aa6d'
+sha256sums=('3b7043a603c19d96bf1e5ccaafde24ca507c93ee51e81e8c5c8754457a18a5ac'
             'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426'
             '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f'
             '6acb07393105ddced8a4c3c869a596350d1a7d81a808ca5307d2ad770653a9d3'
             'e28c40eb844105154fa6106f5b4de3151a22805b3a7b2f84be9ea6c15cec3de6'
-            '03809dee8f374a450e6671771d4527161e5697c55f09745eac9db52b0fe0a7a6'
             '371beac9e55d36f7629d2fc5cb40d6a3e6c0f4aac014f6fefdcd6743b5194b23')
 
 prepare() {
@@ -58,9 +56,6 @@
   # Add input keybindings
   patch -Np1 -i ../input_keybindings.patch
 
-  # Add support for LightDM user switching
-  patch -Np1 -i ../git_rollup.patch
-
   # Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center
   sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' files/usr/share/applications/cinnamon-settings{,-users}.desktop
 

Deleted: git_rollup.patch
===================================================================
--- git_rollup.patch	2013-10-09 15:41:06 UTC (rev 98398)
+++ git_rollup.patch	2013-10-09 16:36:22 UTC (rev 98399)
@@ -1,76 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 2d807f5..46353a2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,7 +62,7 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
- 
- CLUTTER_MIN_VERSION=1.7.5
- GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
--GJS_MIN_VERSION=1.29.18
-+GJS_MIN_VERSION=1.9.0
- MUFFIN_MIN_VERSION=1.0.5
- GTK_MIN_VERSION=3.0.0
- GIO_MIN_VERSION=2.29.10
-diff --git a/files/usr/share/cinnamon/applets/sound at cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound at cinnamon.org/applet.js
-index e80d97b..73fb87c 100644
---- a/files/usr/share/cinnamon/applets/sound at cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/sound at cinnamon.org/applet.js
-@@ -108,8 +108,8 @@ let compatible_players = [
-     'deadbeef', 'smplayer', 'tomahawk'];
- let support_seek = [
-     'clementine', 'banshee', 'rhythmbox', 'rhythmbox3', 'pragha', 'quodlibet',
--    'amarok', 'noise', 'xnoise', 'gmusicbrowser', 'spotify', 'vlc', 'beatbox',
--    'gnome-mplayer', 'qmmp', 'deadbeef', 'tomahawk'];
-+    'amarok', 'xnoise', 'gmusicbrowser', 'spotify', 'vlc', 'beatbox',
-+    'gnome-mplayer', 'qmmp', 'deadbeef'];
- /* dummy vars for translation */
- let x = _("Playing");
- x = _("Paused");
-diff --git a/files/usr/share/cinnamon/applets/user at cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/user at cinnamon.org/applet.js
-index c2a4c61..0bdd671 100644
---- a/files/usr/share/cinnamon/applets/user at cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/user at cinnamon.org/applet.js
-@@ -94,7 +94,20 @@ MyApplet.prototype = {
-                 }       
-             }));
- 
--            if (GLib.file_test("/usr/bin/mdmflexiserver", GLib.FileTest.EXISTS)) {
-+            if (GLib.getenv("XDG_SEAT_PATH")) {
-+                // LightDM
-+                this.menu.addAction(_("Switch User"), Lang.bind(this, function() {
-+                    Util.spawnCommandLine("cinnamon-screensaver-command --lock");
-+                    Util.spawnCommandLine("dm-tool switch-to-greeter");
-+                }));
-+
-+                this.menu.addAction(_("Guest Session"), Lang.bind(this, function() {
-+                    Util.spawnCommandLine("cinnamon-screensaver-command --lock");
-+                    Util.spawnCommandLine("dm-tool switch-to-guest");
-+                }));
-+            }
-+            else if (GLib.file_test("/usr/bin/mdmflexiserver", GLib.FileTest.EXISTS)) {
-+                // MDM                
-                 this.menu.addAction(_("Switch User"), Lang.bind(this, function() {
-                     Util.spawnCommandLine("mdmflexiserver");
-                 }));
-diff --git a/js/ui/hotCorner.js b/js/ui/hotCorner.js
-index 82dafab..af91dda 100644
---- a/js/ui/hotCorner.js
-+++ b/js/ui/hotCorner.js
-@@ -230,17 +230,6 @@ HotCorner.prototype = {
-         this._animRipple(this._ripple3, 0.35,  1.0,   0.0,   0.3,     1);
-     },
- 
--    handleDragOver: function(source, actor, x, y, time) {
--        if (source != Main.xdndHandler)
--            return;
--
--        if (!Main.overview.visible && !Main.overview.animationInProgress && !Main.expo.visible) {
--            this.rippleAnimation();
--            Main.overview.showTemporarily();
--            Main.overview.beginItemDrag(actor);
--        }
--    },
--
-     runAction: function(){
-         this._activationTime = Date.now() / 1000;
-