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

Conflicts:
	community/abe/PKGBUILD
	community/account-plugins/PKGBUILD
	community/adesklets/PKGBUILD
	community/aircrack-ng/PKGBUILD
	community/audit/PKGBUILD
	community/bchunk/PKGBUILD
	community/bibutils/PKGBUILD
	community/cantata/PKGBUILD
	community/cdck/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/clusterssh/PKGBUILD
	community/consonance/PKGBUILD
	community/credentials-preferences/PKGBUILD
	community/dee/PKGBUILD
	community/dosbox/PKGBUILD
	community/drbd/PKGBUILD
	community/dvdisaster/PKGBUILD
	community/ekg/PKGBUILD
	community/ekg2/PKGBUILD
	community/emelfm2/PKGBUILD
	community/erlang/PKGBUILD
	community/ettercap/PKGBUILD
	community/evilwm/PKGBUILD
	community/fatrat/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/fcrackzip/PKGBUILD
	community/ffmpegsource/PKGBUILD
	community/fssos-nsvs/PKGBUILD
	community/geda-gaf/PKGBUILD
	community/gnome-applets/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gwibber/PKGBUILD
	community/html2text/PKGBUILD
	community/intellij-idea-libs/PKGBUILD
	community/libcgns2/PKGBUILD
	community/libmatio/PKGBUILD
	community/librcc/PKGBUILD
	community/libsignon-glib/PKGBUILD
	community/linux-tools/PKGBUILD
	community/minitube/PKGBUILD
	community/mpdscribble/PKGBUILD
	community/mplayer2/PKGBUILD
	community/musepack-tools/PKGBUILD
	community/nginx/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/portaudio/PKGBUILD
	community/portaudio_cpp/PKGBUILD
	community/prelink/PKGBUILD
	community/projectm/PKGBUILD
	community/prosody/PKGBUILD
	community/python-basemap/PKGBUILD
	community/qgit/PKGBUILD
	community/raptor1/PKGBUILD
	community/sensors-applet/PKGBUILD
	community/signon-keyring-extension/PKGBUILD
	community/signon-plugin-oauth2/PKGBUILD
	community/signon-ui/PKGBUILD
	community/sshguard/PKGBUILD
	community/tea/PKGBUILD
	community/tint2/PKGBUILD
	community/tremulous/PKGBUILD
	community/vobcopy/PKGBUILD
	community/windowlab/PKGBUILD
	community/xdelta/PKGBUILD
	community/xmms2/PKGBUILD
	community/xosd/PKGBUILD
	core/gdbm/PKGBUILD
	core/heirloom-mailx/PKGBUILD
	core/libffi/PKGBUILD
	core/procps-ng/PKGBUILD
	core/systemd/PKGBUILD
	core/tar/PKGBUILD
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/arj/PKGBUILD
	extra/audacity/PKGBUILD
	extra/cdparanoia/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gstreamer/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/indent/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/lcms/PKGBUILD
	extra/lesstif/PKGBUILD
	extra/libchewing/PKGBUILD
	extra/libdrm/PKGBUILD
	extra/libmodplug/PKGBUILD
	extra/libnotify/PKGBUILD
	extra/libsm/PKGBUILD
	extra/libxmu/PKGBUILD
	extra/libxpm/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/neon/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/php-xcache/PKGBUILD
	extra/polkit/PKGBUILD
	extra/pycups/PKGBUILD
	extra/python-cairo/PKGBUILD
	extra/python/PKGBUILD
	extra/ruby/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/talloc/PKGBUILD
	extra/thunar-archive-plugin/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/totem/PKGBUILD
	extra/vinagre/PKGBUILD
	extra/vino/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wget/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-twm/PKGBUILD
	extra/xorg-xclipboard/PKGBUILD
	extra/xorg-xclock/PKGBUILD
	extra/xorg-xkill/PKGBUILD
	extra/xorg-xlsclients/PKGBUILD
	extra/xorg-xman/PKGBUILD
	extra/xorg-xrdb/PKGBUILD
	extra/xpdf/PKGBUILD
	extra/xvidcore/PKGBUILD
	extra/yelp/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	libre/mc-libre/PKGBUILD
	libre/python2-reportlab-libre/PKGBUILD

1 files changed, 21 insertions, 53 deletions

diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index c8d32fbab..fc345c2e4 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 95592 2013-08-14 21:28:25Z bgyorgy $
+# $Id: PKGBUILD 98186 2013-10-07 12:08:20Z jgc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=1.8.8
-pkgrel=4
+pkgver=1.9.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' 'gjs' 'gnome-bluetooth'
-         'gnome-icon-theme' 'gnome-menus' 'gnome-settings-daemon' 'gnome-session'
+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-imaging'
-         'python2-pyinotify' 'python2-lxml' 'webkitgtk3' 'gnome-settings-daemon-compat'
-         'gnome-panel')
+         'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow' 'python2-pexpect'
+         'python2-pyinotify' 'python2-lxml' 'webkitgtk' 'gnome-panel' 'python2' 'cinnamon-translations')
 makedepends=('gnome-common' 'intltool')
 optdepends=('cinnamon-control-center: extended configurations for Cinnamon'
             'cinnamon-screensaver: lock screen'
@@ -27,66 +26,38 @@ options=('!libtool' '!emptydirs')
 install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
         "remove_GC.patch"
-        "keyboard_applet.patch"
         "fix-control-center-check.patch"
-        "gnome-3.8.patch"
-        "switch-applications.patch"
-        "fallback-helpers.patch"
-        "idle-dim.patch"
-        "background.patch"
-        "bluetooth_obex_transfer.patch"
-        "disable-mpris-support.patch")
-sha256sums=('1bce982e6333e7bd27a1df9f37eb9139360c2fef667c7a998a79f216d4a0921d'
+        "background.patch")
+sha256sums=('0abaa8da02c4d626084aa482adc551af154796c4c35faaebebdac896ce72aa6d'
             '3d362efd15f8cfeca1713f5bcf88d4be787b39d7c7f24b73cd13f867af33a680'
-            'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30'
             'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426'
-            '01508c4f41664d5e29f700dc77c9f5c5441f128ab759f0ae8325c5fdda70b00e'
-            '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262'
-            'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e'
-            'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100'
-            '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f'
-            '4497f3e0a97c364845d8a3a3b3b75e7dc9d475dc39f56b2106f8c4b9e5111ac2'
-            'f1eb8110718434e1dc2cf0a308757a787390382dfccd1c8cc80488b93cf6a9f7')
+            '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f')
 
-build() {
+prepare() {
   cd ${srcdir}/Cinnamon*
 
   # Python2 fix
-  sed -i 's|#! /usr/bin/python|#! /usr/bin/python2|' \
-    files/usr/bin/$pkgname-menu-editor \
-    files/usr/share/$pkgname/applets/panel-launchers@$pkgname.org/$pkgname-add-panel-launcher.py
+  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
 
-  # Fix Keyboard applet
-  # https://github.com/linuxmint/Cinnamon/issues/1337
-  patch -Np1 -i ../keyboard_applet.patch
-
   # Check for the cc-panel path, not for the unneeded binary
   patch -Np1 -i ../fix-control-center-check.patch
 
-  # https://github.com/linuxmint/Cinnamon/pull/1888
-  patch -Np1 -i ../gnome-3.8.patch
-
-  # Fix windows switcher keybinding with default settings in GNOME 3.8
-  patch -Np1 -i ../switch-applications.patch
-
-  # Start media keys and mount helpers with the session
-  patch -Np1 -i ../fallback-helpers.patch
-
-  # Fix brightness applet for GNOME 3.8
-  patch -Np1 -i ../idle-dim.patch
-
   # Fix missing backgrounds
   patch -Np1 -i ../background.patch
 
-  # Remove "Browse Files..." option as it's gone from gnome-bluetooth 3.8
-  patch -Np1 -i ../bluetooth_obex_transfer.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
 
-  # Disable MPRIS support (workaround for FS#35282)
-  patch -Np1 -i ../disable-mpris-support.patch
+  # fix for the python2 PAM module  
+  sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py
+}
+
+build() {
+  cd ${srcdir}/Cinnamon*
 
   ./autogen.sh --prefix=/usr \
                --sysconfdir=/etc \
@@ -96,7 +67,7 @@ build() {
                --disable-schemas-compile \
                --enable-compile-warnings=yes \
                --with-session-tracking=systemd
-  make
+  make CFLAGS="${CFLAGS} -Wno-deprecated -Wno-deprecated-declarations"
 }
 
 package() {
@@ -105,7 +76,4 @@ package() {
 
   # Remove leftover files after patching
   find "$pkgdir" -type f -name *.orig | xargs rm
-
-  # Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center
-  sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' "$pkgdir/usr/share/applications/cinnamon-settings.desktop"
 }