diff options
| author | root <root@rshg054.dnsready.net> | 2013-03-04 00:03:49 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-03-04 00:03:49 -0800 |
| commit | 3a8d026e8e859ff4c9aa813d5f1eb2afa5663e78 (patch) | |
| tree | 48288f077555b04e1dd7cec1e637aeb94a322f0c /community/cinnamon | |
| parent | 945c9cd1e94fab87653f84598812dec707843d26 (diff) | |
Mon Mar 4 00:03:48 PST 2013
Diffstat (limited to 'community/cinnamon')
| -rw-r--r-- | community/cinnamon/PKGBUILD | 13 | ||||
| -rw-r--r-- | community/cinnamon/fix-control-center-check.patch | 12 |
2 files changed, 21 insertions, 4 deletions
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 5dc9ee675..ce4c8d209 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84919 2013-02-26 05:29:14Z bgyorgy $ +# $Id: PKGBUILD 85558 2013-03-03 05:39:31Z bgyorgy $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: M0Rf30 # Contributor: unifiedlinux @@ -6,7 +6,7 @@ pkgname=cinnamon pkgver=1.7.1 -pkgrel=3 +pkgrel=4 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -26,10 +26,12 @@ options=('!libtool' '!emptydirs') install=${pkgname}.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver" "gnome-autogen.sh" - "keyboard_applet.patch") + "keyboard_applet.patch" + "fix-control-center-check.patch") md5sums=('13daa8fde1480bbee25eddc2e2630319' 'a925691c9b57a6a884dcf07da057fd1f' - '2b1ece84416c3e4de030be15f1774d82') + '2b1ece84416c3e4de030be15f1774d82' + 'fd429779aa986ffb3f481149f19a0baf') build() { cd ${srcdir}/linuxmint-Cinnamon* @@ -38,6 +40,9 @@ build() { # https://github.com/linuxmint/Cinnamon/issues/1337 patch -Np1 -i ${srcdir}/keyboard_applet.patch + # Check for the cc-panel path, not for the unneeded binary + patch -Np1 -i ${srcdir}/fix-control-center-check.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 diff --git a/community/cinnamon/fix-control-center-check.patch b/community/cinnamon/fix-control-center-check.patch new file mode 100644 index 000000000..4c7b3bb0e --- /dev/null +++ b/community/cinnamon/fix-control-center-check.patch @@ -0,0 +1,12 @@ +diff -Naur cinnamon-1.7.1.orig/files/usr/bin/cinnamon-settings cinnamon-1.7.1/files/usr/bin/cinnamon-settings +--- cinnamon-1.7.1.orig/files/usr/bin/cinnamon-settings 2013-02-21 17:23:45.000000000 +0100 ++++ cinnamon-1.7.1/files/usr/bin/cinnamon-settings 2013-03-03 03:03:24.151209998 +0100 +@@ -7,7 +7,7 @@ + if os.path.exists("/usr/lib/cinnamon-settings/modules/cs_%s.py" % module): + print "Python module" + os.execvp("/usr/lib/cinnamon-settings/cinnamon-settings.py", ("",) + tuple(sys.argv[1:])) +- elif os.path.exists("/usr/bin/cinnamon-control-center"): ++ elif os.path.exists("/usr/lib/cinnamon-control-center-1/panels"): + print "Unknown module %s, using cinnamon-control-center" % module + os.execvp("/usr/lib/cinnamon-settings/cinnamon-settings.py", ("",) + tuple(sys.argv[1:])) + elif os.path.exists("/usr/bin/gnome-control-center"): |