diff options
Diffstat (limited to 'community/cinnamon/PKGBUILD')
| -rw-r--r-- | community/cinnamon/PKGBUILD | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index ab77300c9..5b3209819 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99708 2013-10-30 23:09:50Z allan $ +# $Id: PKGBUILD 100100 2013-11-01 17:11:05Z bgyorgy $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=2.0.6 +pkgver=2.0.8 pkgrel=2 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') @@ -17,21 +17,17 @@ depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-sessio 'librsvg' 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow' 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk' 'cinnamon-control-center' 'cinnamon-screensaver' 'libgnomekbd' - 'network-manager-applet' 'nemo') + 'network-manager-applet' 'nemo' 'polkit-gnome') makedepends=('gnome-common' 'intltool') options=('!emptydirs') install=${pkgname}.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz" "cinnamon-gstreamer1.patch" - "fix-control-center-check.patch" - "background.patch" "keyboard_applet.patch" "input_keybindings.patch" "org.archlinux.pkexec.cinnamon-settings-users.policy") -sha256sums=('0acd307bb8e8d87f6083d5b112deda20967933f6c70387fee72b2a3b5143ef4f' +sha256sums=('f7868e3321a00dd2704a270b474ad0844b7e34e6c536b1b4a9c70b4be7c1f5f4' '2e10ba71fd9ba40afd7e9492b2fc0d5bcc27874bcde543cfd8a47ad20c52354a' - 'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426' - '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f' '6acb07393105ddced8a4c3c869a596350d1a7d81a808ca5307d2ad770653a9d3' 'e28c40eb844105154fa6106f5b4de3151a22805b3a7b2f84be9ea6c15cec3de6' '371beac9e55d36f7629d2fc5cb40d6a3e6c0f4aac014f6fefdcd6743b5194b23') @@ -43,20 +39,18 @@ 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@' - # 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{,-users}.desktop + # Port to GStreamer 1.0. Also backports some recorder bugfixes + patch -Np1 -i ../cinnamon-gstreamer1.patch + + # Fix required components + sed -i 's/cinnamon-fallback-mount-helper;/polkit-gnome-authentication-agent-1;/ + s/nm-applet;/cinnamon-nm-applet;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session # fix for the python2 PAM module sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py @@ -64,11 +58,15 @@ prepare() { # Use pkexec instead of gksu sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users - # Port to GStreamer 1.0. Also backports some recorder bugfixes - patch -Np1 -i ../cinnamon-gstreamer1.patch + # Check for the cc-panel path, not for the unneeded binary + sed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings - # Remove cinnamon-fallback-mount-helper from required components - sed -i 's/cinnamon-fallback-mount-helper;//' files/usr/share/cinnamon-session/sessions/cinnamon*.session + # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead + sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \ + files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py + + # 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{,-users}.desktop } build() { @@ -82,15 +80,16 @@ build() { --disable-schemas-compile \ --enable-compile-warnings=yes \ --with-session-tracking=systemd - make CFLAGS="${CFLAGS} -Wno-deprecated -Wno-deprecated-declarations" + make } package() { cd ${srcdir}/Cinnamon* make DESTDIR="${pkgdir}" install - # Remove leftover files after patching - find "$pkgdir" -type f -name *.orig | xargs rm + # Install cinnamon-nm-applet.desktop file + sed 's/^NotShowIn=.*/OnlyShowIn=GNOME/' /usr/share/applications/nm-applet.desktop \ + > "${pkgdir}/usr/share/applications/cinnamon-nm-applet.desktop" # Install policy file install -Dm644 "${srcdir}/org.archlinux.pkexec.cinnamon-settings-users.policy" \ |