From 8d64e04cb528732ef0844a120620acc64f9fbc41 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sun, 1 Jun 2014 03:41:51 +0000 Subject: Sun Jun 1 03:39:22 UTC 2014 --- community/cinnamon/PKGBUILD | 13 +++++-------- community/cinnamon/set_wheel.patch | 6 +++--- community/cinnamon/upower_calender_fix.patch | 7 +++---- 3 files changed, 11 insertions(+), 15 deletions(-) (limited to 'community/cinnamon') diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 5647c6b2e..bb46f1acf 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 110978 2014-05-11 17:05:35Z bgyorgy $ +# $Id: PKGBUILD 112283 2014-05-30 22:24:47Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=2.2.8 +pkgver=2.2.13 pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') @@ -24,9 +24,9 @@ install=${pkgname}.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz" "upower_calender_fix.patch" "set_wheel.patch") -sha256sums=('d145d9c8087668006da5177fbae99c06958a5b8d1ad32381720fa6d20579023b' - 'babfe88a3773f5369b05c7b61d0318cf969b482b9e0c3f281afaf488b0051e53' - 'd5d5634b24e56837cb677e62669450c25f79005ed1388584760a131f461180ec') +sha256sums=('123261a6a90954adc13f251489d708bc1b611808c63ae87c5189bf717f42483a' + '2edb96f42fb4da07eee635b1159e3ae869c64d7ac80f600bc509190648abcf3e' + 'dafb2b7b275053aa77d15f2ffab62ad1567aa9d93ed7a82077feeef86b81c7f7') prepare() { cd ${srcdir}/Cinnamon* @@ -41,9 +41,6 @@ prepare() { # Use wheel group instread of sudo patch -Np1 -i ../set_wheel.patch - # Use cinnamon-menus instead of gnome-menus in cinnamon-desktop-editor - sed -i 's/GMenu/CMenu/g' files/usr/lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py - # Add polkit agent to required components sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session diff --git a/community/cinnamon/set_wheel.patch b/community/cinnamon/set_wheel.patch index 372308342..5669b67e5 100644 --- a/community/cinnamon/set_wheel.patch +++ b/community/cinnamon/set_wheel.patch @@ -1,14 +1,14 @@ --- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py +++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py -@@ -734,9 +734,9 @@ class Module: +@@ -747,7 +747,7 @@ class Module: pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48) description = "%s\n%s" % (fullname, username) piter = self.users.append(None, [new_user, pixbuf, description]) - # Add the user to his/her own group and sudo if Administrator was selected + # Add the user to his/her own group and wheel if Administrator was selected if dialog.account_type_combo.get_active() == 1: -- os.system("usermod %s -G %s,sudo" % (username, username)) -+ os.system("usermod %s -G %s,wheel" % (username, username)) +- os.system("usermod %s -G %s,sudo,nopasswdlogin" % (username, username)) ++ os.system("usermod %s -G %s,sudo,wheel,nopasswdlogin" % (username, username)) else: os.system("usermod %s -G %s" % (username, username)) self.load_groups() diff --git a/community/cinnamon/upower_calender_fix.patch b/community/cinnamon/upower_calender_fix.patch index 9515736c8..57a5c772a 100644 --- a/community/cinnamon/upower_calender_fix.patch +++ b/community/cinnamon/upower_calender_fix.patch @@ -1,6 +1,5 @@ -diff -Naur Cinnamon-2.0.14.orig/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js Cinnamon-2.0.14/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js ---- Cinnamon-2.0.14.orig/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js 2013-11-25 19:41:30.000000000 +0100 -+++ Cinnamon-2.0.14/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js 2014-04-11 08:10:28.785899903 +0200 +--- Cinnamon-2.2.13.orig/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js 2014-05-25 15:10:49.000000000 -0500 ++++ Cinnamon-2.2.13/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js 2014-05-30 17:05:16.099584860 -0500 @@ -6,7 +6,6 @@ const St = imports.gi.St; const Util = imports.misc.util; @@ -9,7 +8,7 @@ diff -Naur Cinnamon-2.0.14.orig/files/usr/share/cinnamon/applets/calendar@cinnam const Settings = imports.ui.settings; const AppletDir = imports.ui.appletManager.applets['calendar@cinnamon.org']; const Calendar = AppletDir.calendar; -@@ -88,10 +87,6 @@ +@@ -92,10 +91,6 @@ this.settings.bindProperty(Settings.BindingDirection.IN, "use-custom-format", "use_custom_format", this.on_settings_changed, null); this.settings.bindProperty(Settings.BindingDirection.IN, "custom-format", "custom_format", this.on_settings_changed, null); -- cgit v1.2.3-54-g00ecf