Wed Apr 16 03:42:20 UTC 2014

1 files changed, 13 insertions, 34 deletions

diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index 1ed94ac4f..b96d658a7 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 109424 2014-04-14 20:15:29Z jgc $
+# $Id: PKGBUILD 109554 2014-04-15 18:16:46Z bgyorgy $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=2.2.1
-pkgrel=1
+pkgver=2.2.3
+pkgrel=3
 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' 'gconf' 'gnome-icon-theme'
-         'gnome-menus' 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring'
+         'gnome-themes-standard' 'gstreamer' 'libgnome-keyring'
          'librsvg' 'networkmanager' 'muffin' 'python2-dbus' 'python2-pillow'
          'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk'
          'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd'
@@ -23,17 +23,10 @@ options=('!emptydirs')
 install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
         "upower_calender_fix.patch"
-        "keyboard_applet.patch"
-        "input_keybindings.patch"
-        "set_wheel.patch"
-        "org.archlinux.pkexec.cinnamon-settings-users.policy")
-sha256sums=('34ad53f81cf57e8dca06fbd76b0be761b16d9f46a1b5aa22596cd07725703478'
+        "set_wheel.patch")
+sha256sums=('9151452f81ffb7edc28cbdb107818f64bb9bd55610711781345418166372f0fe'
             'babfe88a3773f5369b05c7b61d0318cf969b482b9e0c3f281afaf488b0051e53'
-            '6acb07393105ddced8a4c3c869a596350d1a7d81a808ca5307d2ad770653a9d3'
-            'e28c40eb844105154fa6106f5b4de3151a22805b3a7b2f84be9ea6c15cec3de6'
-            'd5d5634b24e56837cb677e62669450c25f79005ed1388584760a131f461180ec'
-            '371beac9e55d36f7629d2fc5cb40d6a3e6c0f4aac014f6fefdcd6743b5194b23')
-
+            'd5d5634b24e56837cb677e62669450c25f79005ed1388584760a131f461180ec')
 
 prepare() {
   cd ${srcdir}/Cinnamon*
@@ -42,27 +35,20 @@ prepare() {
   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 ../upower_calender_fix.patch
 
-  # Fix keyboard applet
-  patch -Np1 -i ../keyboard_applet.patch
-
-  # Add input keybindings
-  patch -Np1 -i ../input_keybindings.patch
-
   # Use wheel group instread of sudo
   patch -Np1 -i ../set_wheel.patch
 
-  # Fix required components
-  sed -i 's/cinnamon-fallback-mount-helper;/polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
+  # Use cinnamon-menus instead of gnome-menus in cinnamon-desktop-editor
+  sed -i 's/GMenu/CMenu/g' files/usr/lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py
 
-  # fix for the python2 PAM module  
-  sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py
+  # Add polkit agent to required components
+  sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
 
-  # Use pkexec instead of gksu
-  sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
+  # Fix for the python2 PAM module  
+  sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py
 
   # 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
@@ -70,9 +56,6 @@ prepare() {
   # 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
-
-  # 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
 }
 
 build() {
@@ -92,8 +75,4 @@ build() {
 package() {
   cd ${srcdir}/Cinnamon*
   make DESTDIR="${pkgdir}" install
-
-  # Install policy file
-  install -Dm644 "${srcdir}/org.archlinux.pkexec.cinnamon-settings-users.policy" \
-                 "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.cinnamon-settings-users.policy"
 }