[arch-commits] Commit in cinnamon/trunk (4 files)
Balló György
bgyorgy at nymeria.archlinux.org
Fri Apr 11 06:27:09 UTC 2014
Date: Friday, April 11, 2014 @ 08:27:09
Author: bgyorgy
Revision: 109186
upgpkg: cinnamon 2.0.14-4
- Rebuild for cogl 1.18 (FS#39810)
- Fix build
- Fix calendar applet with upower 0.99
- Use wheel group instread of sudo
Added:
cinnamon/trunk/compile_fix.patch
cinnamon/trunk/set_wheel.patch
cinnamon/trunk/upower_calender_fix.patch
Modified:
cinnamon/trunk/PKGBUILD
---------------------------+
PKGBUILD | 21 ++++++++++++++++++---
compile_fix.patch | 18 ++++++++++++++++++
set_wheel.patch | 14 ++++++++++++++
upower_calender_fix.patch | 22 ++++++++++++++++++++++
4 files changed, 72 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-04-11 06:07:08 UTC (rev 109185)
+++ PKGBUILD 2014-04-11 06:27:09 UTC (rev 109186)
@@ -6,7 +6,7 @@
pkgname=cinnamon
pkgver=2.0.14
-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/"
@@ -22,16 +22,22 @@
options=('!emptydirs')
install=${pkgname}.install
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
- "cinnamon-gstreamer1.patch"
+ "compile_fix.patch"
+ "upower_calender_fix.patch"
"keyboard_applet.patch"
"input_keybindings.patch"
+ "cinnamon-gstreamer1.patch"
"gtk3-lock-dialog.patch"
+ "set_wheel.patch"
"org.archlinux.pkexec.cinnamon-settings-users.policy")
sha256sums=('447f65ceb22a40717656d3d708d16ad450802298d783b23004b6e8d3c8d7da85'
- '2e10ba71fd9ba40afd7e9492b2fc0d5bcc27874bcde543cfd8a47ad20c52354a'
+ '5cfd312242664bfbff8f3fdf003619004dd28c03de965ac9c59e6c44a97f7ff8'
+ 'babfe88a3773f5369b05c7b61d0318cf969b482b9e0c3f281afaf488b0051e53'
'6acb07393105ddced8a4c3c869a596350d1a7d81a808ca5307d2ad770653a9d3'
'e28c40eb844105154fa6106f5b4de3151a22805b3a7b2f84be9ea6c15cec3de6'
+ '2e10ba71fd9ba40afd7e9492b2fc0d5bcc27874bcde543cfd8a47ad20c52354a'
'e10dd01201b9274b45a6c94319d4eb1e9ff800e63f10a3d5e42fc9f3a87e337c'
+ 'd5d5634b24e56837cb677e62669450c25f79005ed1388584760a131f461180ec'
'371beac9e55d36f7629d2fc5cb40d6a3e6c0f4aac014f6fefdcd6743b5194b23')
prepare() {
@@ -41,6 +47,12 @@
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@'
+ # Fix build
+ patch -Np1 -i ../compile_fix.patch
+
+ # Fix calendar applet with upower 0.99
+ patch -Np1 -i ../upower_calender_fix.patch
+
# Fix keyboard applet
patch -Np1 -i ../keyboard_applet.patch
@@ -53,6 +65,9 @@
# Port Lock screen dialog to GTK+ 3
patch -Np1 -i ../gtk3-lock-dialog.patch
+ # Use wheel group instread of sudo
+ patch -Np1 -i ../set_wheel.patch
+
# Fix required components
sed -i 's/cinnamon-fallback-mount-helper;/polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
Added: compile_fix.patch
===================================================================
--- compile_fix.patch (rev 0)
+++ compile_fix.patch 2014-04-11 06:27:09 UTC (rev 109186)
@@ -0,0 +1,18 @@
+--- a/src/cinnamon-global.c
++++ b/src/cinnamon-global.c
+@@ -477,12 +477,12 @@ cinnamon_global_class_init (CinnamonGlob
+ G_PARAM_READABLE));
+ }
+
+-/**•
+- * _cinnamon_global_init: (skip)•
++/**
++ * _cinnamon_global_init: (skip)
+ * @first_property_name: the name of the first property
+ * @...: the value of the first property, followed optionally by more
+ * name/value pairs, followed by %NULL
+- *•
++ *
+ * Initializes Cinnamon global singleton with the construction-time
+ * properties.
+ *
Added: set_wheel.patch
===================================================================
--- set_wheel.patch (rev 0)
+++ set_wheel.patch 2014-04-11 06:27:09 UTC (rev 109186)
@@ -0,0 +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:
+ pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
+ description = "<b>%s</b>\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))
+ else:
+ os.system("usermod %s -G %s" % (username, username))
+ self.load_groups()
Added: upower_calender_fix.patch
===================================================================
--- upower_calender_fix.patch (rev 0)
+++ upower_calender_fix.patch 2014-04-11 06:27:09 UTC (rev 109186)
@@ -0,0 +1,22 @@
+diff -Naur Cinnamon-2.0.14.orig/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js Cinnamon-2.0.14/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js
+--- Cinnamon-2.0.14.orig/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js 2013-11-25 19:41:30.000000000 +0100
++++ Cinnamon-2.0.14/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js 2014-04-11 08:10:28.785899903 +0200
+@@ -6,7 +6,6 @@
+ const St = imports.gi.St;
+ const Util = imports.misc.util;
+ const PopupMenu = imports.ui.popupMenu;
+-const UPowerGlib = imports.gi.UPowerGlib;
+ const Settings = imports.ui.settings;
+ const AppletDir = imports.ui.appletManager.applets['calendar at cinnamon.org'];
+ const Calendar = AppletDir.calendar;
+@@ -88,10 +87,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);
+
+- // https://bugzilla.gnome.org/show_bug.cgi?id=655129
+- this._upClient = new UPowerGlib.Client();
+- this._upClient.connect('notify-resume', this._updateClockAndDate);
+-
+ // Start the clock
+ this.on_settings_changed();
+ this._updateClockAndDatePeriodic();
More information about the arch-commits
mailing list