Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/avant-window-navigator/PKGBUILD
	community/awn-extras-applets/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/gnome-menus2/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gpsim/PKGBUILD
	community/kgraphviewer/PKGBUILD
	community/kpovmodeler/PKGBUILD
	community/libdesktop-agnostic/PKGBUILD
	community/python-basemap/PKGBUILD
	community/python-mpi4py/PKGBUILD
	community/python-psutil/PKGBUILD
	community/qgo/PKGBUILD
	community/ude/PKGBUILD
	community/virtkey/PKGBUILD
	extra/alsaplayer/PKGBUILD
	extra/aterm/PKGBUILD
	extra/cups-pdf/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/kdeplasma-applets-networkmanagement/PKGBUILD
	extra/libffado/PKGBUILD
	extra/libtar/PKGBUILD
	extra/maxima/PKGBUILD
	extra/php-xcache/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xauth/PKGBUILD

1 files changed, 30 insertions, 16 deletions

diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index fc345c2e4..2a7c3c3e7 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 98186 2013-10-07 12:08:20Z jgc $
+# $Id: PKGBUILD 98400 2013-10-09 16:38:23Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=1.9.2
+pkgver=2.0.2
 pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cinnamon.linuxmint.com/"
 license=('GPL2')
-depends=('accountsservice' 'caribou' 'clutter-gtk' 'cjs' 'gnome-bluetooth'
-         'gnome-icon-theme' 'gnome-menus' 'cinnamon-settings-daemon' 'cinnamon-session'
-         'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring' 'librsvg'
-         'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow' 'python2-pexpect'
-         'python2-pyinotify' 'python2-lxml' 'webkitgtk' 'gnome-panel' 'python2' 'cinnamon-translations')
+depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session'
+         'cinnamon-translations' 'cjs' 'clutter-gtk' 'gconf' 'gnome-icon-theme'
+         'gnome-menus' 'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring'
+         'librsvg' 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow'
+         'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk')
 makedepends=('gnome-common' 'intltool')
 optdepends=('cinnamon-control-center: extended configurations for Cinnamon'
             'cinnamon-screensaver: lock screen'
@@ -25,13 +25,17 @@ optdepends=('cinnamon-control-center: extended configurations for Cinnamon'
 options=('!libtool' '!emptydirs')
 install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
-        "remove_GC.patch"
         "fix-control-center-check.patch"
-        "background.patch")
-sha256sums=('0abaa8da02c4d626084aa482adc551af154796c4c35faaebebdac896ce72aa6d'
-            '3d362efd15f8cfeca1713f5bcf88d4be787b39d7c7f24b73cd13f867af33a680'
+        "background.patch"
+        "keyboard_applet.patch"
+        "input_keybindings.patch"
+        "org.archlinux.pkexec.cinnamon-settings-users.policy")
+sha256sums=('3b7043a603c19d96bf1e5ccaafde24ca507c93ee51e81e8c5c8754457a18a5ac'
             'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426'
-            '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f')
+            '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f'
+            '6acb07393105ddced8a4c3c869a596350d1a7d81a808ca5307d2ad770653a9d3'
+            'e28c40eb844105154fa6106f5b4de3151a22805b3a7b2f84be9ea6c15cec3de6'
+            '371beac9e55d36f7629d2fc5cb40d6a3e6c0f4aac014f6fefdcd6743b5194b23')
 
 prepare() {
   cd ${srcdir}/Cinnamon*
@@ -40,20 +44,26 @@ 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 crasher when disconnecting from wifi
-  patch -Np1 -i ../remove_GC.patch
-
   # Check for the cc-panel path, not for the unneeded binary
   patch -Np1 -i ../fix-control-center-check.patch
 
   # Fix missing backgrounds
   patch -Np1 -i ../background.patch
 
+  # Fix keyboard applet
+  patch -Np1 -i ../keyboard_applet.patch
+
+  # Add input keybindings
+  patch -Np1 -i ../input_keybindings.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.desktop
+  sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' files/usr/share/applications/cinnamon-settings{,-users}.desktop
 
   # fix for the python2 PAM module  
   sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py
+
+  # Use pkexec instead of gksu
+  sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
 }
 
 build() {
@@ -76,4 +86,8 @@ package() {
 
   # Remove leftover files after patching
   find "$pkgdir" -type f -name *.orig | xargs rm
+
+  # 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"
 }