Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/apvlv/PKGBUILD
	community/audit/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/dia/PKGBUILD
	community/gedit-plugins/PKGBUILD
	community/giggle/PKGBUILD
	community/gitg/PKGBUILD
	community/gmic/PKGBUILD
	community/gnome-applets/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gnome-screensaver/PKGBUILD
	community/gtranslator/PKGBUILD
	community/metacity/PKGBUILD
	community/zeitgeist-datahub/PKGBUILD
	core/glib2/PKGBUILD
	core/perl/PKGBUILD
	extra/anjuta-extras/PKGBUILD
	extra/anjuta/PKGBUILD
	extra/atkmm/PKGBUILD
	extra/brltty/PKGBUILD
	extra/cheese/PKGBUILD
	extra/clutter/PKGBUILD
	extra/cogl/PKGBUILD
	extra/devhelp/PKGBUILD
	extra/empathy/PKGBUILD
	extra/eog/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution/PKGBUILD
	extra/fontconfig/PKGBUILD
	extra/gcr/PKGBUILD
	extra/gdl/PKGBUILD
	extra/gedit/PKGBUILD
	extra/gjs/PKGBUILD
	extra/glade/PKGBUILD
	extra/glib-networking/PKGBUILD
	extra/gnome-calculator/PKGBUILD
	extra/gnome-contacts/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnome-disk-utility/PKGBUILD
	extra/gnome-documents/PKGBUILD
	extra/gnome-font-viewer/PKGBUILD
	extra/gnome-games/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-screenshot/PKGBUILD
	extra/gnome-session/PKGBUILD
	extra/gnome-terminal/PKGBUILD
	extra/gobject-introspection/PKGBUILD
	extra/grilo-plugins/PKGBUILD
	extra/gssdp/PKGBUILD
	extra/gthumb/PKGBUILD
	extra/gtkmm3/PKGBUILD
	extra/gtksourceview3/PKGBUILD
	extra/gucharmap/PKGBUILD
	extra/gupnp-av/PKGBUILD
	extra/gupnp-dlna/PKGBUILD
	extra/gupnp-igd/PKGBUILD
	extra/gupnp/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/js/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libgee/PKGBUILD
	extra/libgweather/PKGBUILD
	extra/liboauth/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/librsvg/PKGBUILD
	extra/libsocialweb/PKGBUILD
	extra/libsoup/PKGBUILD
	extra/mash/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/mutter/PKGBUILD
	extra/mysql/PKGBUILD
	extra/nautilus-sendto/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/network-manager-applet/PKGBUILD
	extra/notification-daemon/PKGBUILD
	extra/p11-kit/PKGBUILD
	extra/pango/PKGBUILD
	extra/pangomm/PKGBUILD
	extra/polkit/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/rest/PKGBUILD
	extra/rhythmbox/PKGBUILD
	extra/rygel/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/totem/PKGBUILD
	extra/vala/PKGBUILD
	extra/vinagre/PKGBUILD
	extra/vte3/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/yelp/PKGBUILD
	extra/zeitgeist/PKGBUILD
	libre/rp-pppoe-libre/PKGBUILD
	pcr/python-sfml2/PKGBUILD
	pcr/python2-sfml2/PKGBUILD

1 files changed, 28 insertions, 33 deletions

diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index dacad0d41..698a40277 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 87446 2013-03-31 19:54:32Z faidoc $
+# $Id: PKGBUILD 88934 2013-04-25 02:04:16Z bgyorgy $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=1.7.3
-pkgrel=2
+pkgver=1.7.4
+pkgrel=3
 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'
-         'gnome-themes-standard' 'gstreamer0.10' 'networkmanager' 'muffin' 'python2-dbus'
-         'python2-gconf' 'python2-imaging' 'python2-pyinotify' 'python2-lxml' 'webkitgtk3')
+         'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring' 'librsvg'
+         'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-imaging'
+         'python2-pyinotify' 'python2-lxml' 'webkitgtk3' 'gnome-settings-daemon-compat')
 makedepends=('gnome-common' 'intltool')
 optdepends=('cinnamon-control-center: extended configurations for Cinnamon'
             'cinnamon-screensaver: lock screen'
@@ -26,25 +27,40 @@ install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver"
         "keyboard_applet.patch"
         "fix-control-center-check.patch"
-        "fix-keyboard-settings.patch")
-md5sums=('c733e2a2280508aecf3ee010587e6743'
+        "gnome-3.8.patch"
+        "switch-applications.patch"
+        "fallback-helpers.patch")
+md5sums=('95260dc968ca9be32c265b35df2dd49d'
          '2b1ece84416c3e4de030be15f1774d82'
          'c3f25b06d345d9d36c197cd96e08f496'
-         'c36138eddde544b5c27b66d19451e7a5')
+         'cf2efbe1a5c48e1be53a0e8e4b7c3181'
+         '16258907bf51cd8c1569263791ffa620'
+         'f7aa8ace9c9543ba2fd66bd530244fed')
 
 build() {
   cd ${srcdir}/linuxmint-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
+  find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+
   # Fix Keyboard applet
   # https://github.com/linuxmint/Cinnamon/issues/1337
-  patch -Np1 -i ${srcdir}/keyboard_applet.patch
+  patch -Np1 -i ../keyboard_applet.patch
 
   # Check for the cc-panel path, not for the unneeded binary
-  patch -Np1 -i ${srcdir}/fix-control-center-check.patch
+  patch -Np1 -i ../fix-control-center-check.patch
 
-  # Fix Keyboard settings (https://bugs.archlinux.org/task/34472)
-  patch -Np1 -i ${srcdir}/fix-keyboard-settings.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
 
   ./autogen.sh --prefix=/usr \
                --sysconfdir=/etc \
@@ -54,31 +70,10 @@ build() {
                --disable-schemas-compile \
                --enable-compile-warnings=yes \
                --with-session-tracking=systemd
- 
   make
 }
 
 package() {
   cd ${srcdir}/linuxmint-Cinnamon*
   make DESTDIR="${pkgdir}" install
-
-  # Install autostart files for gnome-fallback-mount-helper
-  install -Dm644 /etc/xdg/autostart/gnome-fallback-mount-helper.desktop \
-    "${pkgdir}/etc/xdg/autostart/gnome-fallback-mount-helper-cinnamon.desktop"
-  sed -i 's/^AutostartCondition=.*/AutostartCondition=GNOME3 if-session cinnamon/' \
-    "${pkgdir}/etc/xdg/autostart/gnome-fallback-mount-helper-cinnamon.desktop"
-
-  install -Dm644 /etc/xdg/autostart/gnome-fallback-mount-helper.desktop \
-    "${pkgdir}/etc/xdg/autostart/gnome-fallback-mount-helper-cinnamon2d.desktop"
-  sed -i 's/^AutostartCondition=.*/AutostartCondition=GNOME3 if-session cinnamon2d/' \
-    "${pkgdir}/etc/xdg/autostart/gnome-fallback-mount-helper-cinnamon2d.desktop"
-
-  # Python2 fix
-  sed -i 's|#! /usr/bin/python|#! /usr/bin/python2|' \
-    "${pkgdir}/usr/bin/$pkgname-menu-editor" \
-    "${pkgdir}/usr/share/$pkgname/applets/panel-launchers@$pkgname.org/$pkgname-add-panel-launcher.py"
-
-  find "${pkgdir}" -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 }
-
-