From c6f4cd18ab706868be0eff10327a0dcd58cecdf3 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 17 Feb 2013 00:45:16 -0800
Subject: Sun Feb 17 00:45:00 PST 2013

---
 community/cinnamon/PKGBUILD | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'community/cinnamon/PKGBUILD')

diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index ab7686196..20e4f3d2f 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,37 +1,45 @@
-# $Id: PKGBUILD 83983 2013-02-07 22:10:55Z bgyorgy $
+# $Id: PKGBUILD 84329 2013-02-16 17:25:27Z bgyorgy $
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
 # Contributor: CReimer
 
 pkgname=cinnamon
 pkgver=1.6.7
-pkgrel=6
+pkgrel=7
 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' 'gjs' 'gnome-bluetooth' 'gnome-icon-theme'
          'gnome-menus' 'gnome-settings-daemon' 'gnome-session' 'gnome-themes-standard'
-         'gstreamer0.10' 'libgnomekbd' 'networkmanager' 'muffin' 'python2-dbus'
+         'gstreamer0.10' 'networkmanager' 'muffin' 'python2-dbus'
          'python2-gconf' 'python2-imaging' 'python2-lxml')
 makedepends=('gnome-common' 'intltool')
 optdepends=('gnome-control-center: open settings from various applets'
             'gnome-screensaver: lock screen'
+            'gucharmap: show character table from Keyboard applet'
+            'libgnomekbd: show keyboard layout from Keyboard applet'
             'nautilus: the official Gnome file manager')
 options=('!libtool' '!emptydirs')
 install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver"
         "cinnamon-screensaver.desktop"
         "cinnamon2d-screensaver.desktop"
-        "gnome-autogen.sh")
+        "gnome-autogen.sh"
+        "keyboard_applet.patch")
 md5sums=('ea73c6367d43d82c61f977477bf0c08c'
          'd55c079cdc8bec606f510f87b2a6f776'
          '5c6af851ab1cf7e9219f11d86353196a'
-         'a925691c9b57a6a884dcf07da057fd1f')
+         'a925691c9b57a6a884dcf07da057fd1f'
+         '2b1ece84416c3e4de030be15f1774d82')
 
 build() {
   cd ${srcdir}/linuxmint-Cinnamon*
 
+  # Fix Keyboard applet
+  # https://github.com/linuxmint/Cinnamon/issues/1337
+  patch -Np1 -i ${srcdir}/keyboard_applet.patch
+
   cp ${srcdir}/gnome-autogen.sh .
   sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am
   sed -i 's/gnome-autogen.sh/.\/gnome-autogen.sh/g' autogen.sh
-- 
cgit v1.2.3-54-g00ecf