[arch-commits] Commit in cinnamon/repos (16 files)
Alexandre Filgueira
faidoc at nymeria.archlinux.org
Fri May 30 22:24:47 UTC 2014
Date: Saturday, May 31, 2014 @ 00:24:47
Author: faidoc
Revision: 112283
archrelease: copy trunk to community-i686, community-x86_64
Added:
cinnamon/repos/community-i686/PKGBUILD
(from rev 112282, cinnamon/trunk/PKGBUILD)
cinnamon/repos/community-i686/cinnamon.install
(from rev 112282, cinnamon/trunk/cinnamon.install)
cinnamon/repos/community-i686/set_wheel.patch
(from rev 112282, cinnamon/trunk/set_wheel.patch)
cinnamon/repos/community-i686/upower_calender_fix.patch
(from rev 112282, cinnamon/trunk/upower_calender_fix.patch)
cinnamon/repos/community-x86_64/PKGBUILD
(from rev 112282, cinnamon/trunk/PKGBUILD)
cinnamon/repos/community-x86_64/cinnamon.install
(from rev 112282, cinnamon/trunk/cinnamon.install)
cinnamon/repos/community-x86_64/set_wheel.patch
(from rev 112282, cinnamon/trunk/set_wheel.patch)
cinnamon/repos/community-x86_64/upower_calender_fix.patch
(from rev 112282, cinnamon/trunk/upower_calender_fix.patch)
Deleted:
cinnamon/repos/community-i686/PKGBUILD
cinnamon/repos/community-i686/cinnamon.install
cinnamon/repos/community-i686/set_wheel.patch
cinnamon/repos/community-i686/upower_calender_fix.patch
cinnamon/repos/community-x86_64/PKGBUILD
cinnamon/repos/community-x86_64/cinnamon.install
cinnamon/repos/community-x86_64/set_wheel.patch
cinnamon/repos/community-x86_64/upower_calender_fix.patch
--------------------------------------------+
/PKGBUILD | 156 +++++++++++++++++++++++++++
/cinnamon.install | 24 ++++
/set_wheel.patch | 28 ++++
/upower_calender_fix.patch | 42 +++++++
community-i686/PKGBUILD | 81 --------------
community-i686/cinnamon.install | 12 --
community-i686/set_wheel.patch | 14 --
community-i686/upower_calender_fix.patch | 22 ---
community-x86_64/PKGBUILD | 81 --------------
community-x86_64/cinnamon.install | 12 --
community-x86_64/set_wheel.patch | 14 --
community-x86_64/upower_calender_fix.patch | 22 ---
12 files changed, 250 insertions(+), 258 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-05-30 22:23:15 UTC (rev 112282)
+++ community-i686/PKGBUILD 2014-05-30 22:24:47 UTC (rev 112283)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
-# Contributor: M0Rf30
-# Contributor: unifiedlinux
-# Contributor: CReimer
-
-pkgname=cinnamon
-pkgver=2.2.8
-pkgrel=1
-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' 'cinnamon-settings-daemon' 'cinnamon-session'
- 'cinnamon-translations' 'cjs' 'clutter-gtk' 'gconf' 'gnome-icon-theme'
- 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring'
- 'librsvg' 'networkmanager' 'muffin' 'python2-dbus' 'python2-pillow'
- 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk'
- 'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd'
- '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"
- "upower_calender_fix.patch"
- "set_wheel.patch")
-sha256sums=('d145d9c8087668006da5177fbae99c06958a5b8d1ad32381720fa6d20579023b'
- 'babfe88a3773f5369b05c7b61d0318cf969b482b9e0c3f281afaf488b0051e53'
- 'd5d5634b24e56837cb677e62669450c25f79005ed1388584760a131f461180ec')
-
-prepare() {
- cd ${srcdir}/Cinnamon*
-
- # Python2 fix
- 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 calendar applet with upower 0.99
- patch -Np1 -i ../upower_calender_fix.patch
-
- # 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
-
- # Fix for the python2 PAM module
- sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py
-
- # Use pkexec instead of gksu
- sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
-
- # 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
-
- # 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
-}
-
-build() {
- cd ${srcdir}/Cinnamon*
-
- ./autogen.sh --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/cinnamon \
- --localstatedir=/var \
- --disable-static \
- --disable-schemas-compile \
- --enable-compile-warnings=yes \
- --with-session-tracking=systemd
- make
-}
-
-package() {
- cd ${srcdir}/Cinnamon*
- make DESTDIR="${pkgdir}" install
-}
Copied: cinnamon/repos/community-i686/PKGBUILD (from rev 112282, cinnamon/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-05-30 22:24:47 UTC (rev 112283)
@@ -0,0 +1,78 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Contributor: M0Rf30
+# Contributor: unifiedlinux
+# Contributor: CReimer
+
+pkgname=cinnamon
+pkgver=2.2.13
+pkgrel=1
+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' 'cinnamon-settings-daemon' 'cinnamon-session'
+ 'cinnamon-translations' 'cjs' 'clutter-gtk' 'gconf' 'gnome-icon-theme'
+ 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring'
+ 'librsvg' 'networkmanager' 'muffin' 'python2-dbus' 'python2-pillow'
+ 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk'
+ 'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd'
+ '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"
+ "upower_calender_fix.patch"
+ "set_wheel.patch")
+sha256sums=('123261a6a90954adc13f251489d708bc1b611808c63ae87c5189bf717f42483a'
+ '2edb96f42fb4da07eee635b1159e3ae869c64d7ac80f600bc509190648abcf3e'
+ 'dafb2b7b275053aa77d15f2ffab62ad1567aa9d93ed7a82077feeef86b81c7f7')
+
+prepare() {
+ cd ${srcdir}/Cinnamon*
+
+ # Python2 fix
+ 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 calendar applet with upower 0.99
+ patch -Np1 -i ../upower_calender_fix.patch
+
+ # Use wheel group instread of sudo
+ patch -Np1 -i ../set_wheel.patch
+
+ # Add polkit agent to required components
+ sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' 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
+
+ # Use pkexec instead of gksu
+ sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
+
+ # 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
+
+ # 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
+}
+
+build() {
+ cd ${srcdir}/Cinnamon*
+
+ ./autogen.sh --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/cinnamon \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-schemas-compile \
+ --enable-compile-warnings=yes \
+ --with-session-tracking=systemd
+ make
+}
+
+package() {
+ cd ${srcdir}/Cinnamon*
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-i686/cinnamon.install
===================================================================
--- community-i686/cinnamon.install 2014-05-30 22:23:15 UTC (rev 112282)
+++ community-i686/cinnamon.install 2014-05-30 22:24:47 UTC (rev 112283)
@@ -1,12 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: cinnamon/repos/community-i686/cinnamon.install (from rev 112282, cinnamon/trunk/cinnamon.install)
===================================================================
--- community-i686/cinnamon.install (rev 0)
+++ community-i686/cinnamon.install 2014-05-30 22:24:47 UTC (rev 112283)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-i686/set_wheel.patch
===================================================================
--- community-i686/set_wheel.patch 2014-05-30 22:23:15 UTC (rev 112282)
+++ community-i686/set_wheel.patch 2014-05-30 22:24:47 UTC (rev 112283)
@@ -1,14 +0,0 @@
---- 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()
Copied: cinnamon/repos/community-i686/set_wheel.patch (from rev 112282, cinnamon/trunk/set_wheel.patch)
===================================================================
--- community-i686/set_wheel.patch (rev 0)
+++ community-i686/set_wheel.patch 2014-05-30 22:24:47 UTC (rev 112283)
@@ -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
+@@ -747,7 +747,7 @@ 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,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()
Deleted: community-i686/upower_calender_fix.patch
===================================================================
--- community-i686/upower_calender_fix.patch 2014-05-30 22:23:15 UTC (rev 112282)
+++ community-i686/upower_calender_fix.patch 2014-05-30 22:24:47 UTC (rev 112283)
@@ -1,22 +0,0 @@
-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();
Copied: cinnamon/repos/community-i686/upower_calender_fix.patch (from rev 112282, cinnamon/trunk/upower_calender_fix.patch)
===================================================================
--- community-i686/upower_calender_fix.patch (rev 0)
+++ community-i686/upower_calender_fix.patch 2014-05-30 22:24:47 UTC (rev 112283)
@@ -0,0 +1,21 @@
+--- Cinnamon-2.2.13.orig/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js 2014-05-25 15:10:49.000000000 -0500
++++ Cinnamon-2.2.13/files/usr/share/cinnamon/applets/calendar at 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;
+ 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;
+@@ -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);
+
+- // 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();
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-05-30 22:23:15 UTC (rev 112282)
+++ community-x86_64/PKGBUILD 2014-05-30 22:24:47 UTC (rev 112283)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
-# Contributor: M0Rf30
-# Contributor: unifiedlinux
-# Contributor: CReimer
-
-pkgname=cinnamon
-pkgver=2.2.8
-pkgrel=1
-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' 'cinnamon-settings-daemon' 'cinnamon-session'
- 'cinnamon-translations' 'cjs' 'clutter-gtk' 'gconf' 'gnome-icon-theme'
- 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring'
- 'librsvg' 'networkmanager' 'muffin' 'python2-dbus' 'python2-pillow'
- 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk'
- 'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd'
- '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"
- "upower_calender_fix.patch"
- "set_wheel.patch")
-sha256sums=('d145d9c8087668006da5177fbae99c06958a5b8d1ad32381720fa6d20579023b'
- 'babfe88a3773f5369b05c7b61d0318cf969b482b9e0c3f281afaf488b0051e53'
- 'd5d5634b24e56837cb677e62669450c25f79005ed1388584760a131f461180ec')
-
-prepare() {
- cd ${srcdir}/Cinnamon*
-
- # Python2 fix
- 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 calendar applet with upower 0.99
- patch -Np1 -i ../upower_calender_fix.patch
-
- # 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
-
- # Fix for the python2 PAM module
- sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py
-
- # Use pkexec instead of gksu
- sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
-
- # 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
-
- # 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
-}
-
-build() {
- cd ${srcdir}/Cinnamon*
-
- ./autogen.sh --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/cinnamon \
- --localstatedir=/var \
- --disable-static \
- --disable-schemas-compile \
- --enable-compile-warnings=yes \
- --with-session-tracking=systemd
- make
-}
-
-package() {
- cd ${srcdir}/Cinnamon*
- make DESTDIR="${pkgdir}" install
-}
Copied: cinnamon/repos/community-x86_64/PKGBUILD (from rev 112282, cinnamon/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-05-30 22:24:47 UTC (rev 112283)
@@ -0,0 +1,78 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Contributor: M0Rf30
+# Contributor: unifiedlinux
+# Contributor: CReimer
+
+pkgname=cinnamon
+pkgver=2.2.13
+pkgrel=1
+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' 'cinnamon-settings-daemon' 'cinnamon-session'
+ 'cinnamon-translations' 'cjs' 'clutter-gtk' 'gconf' 'gnome-icon-theme'
+ 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring'
+ 'librsvg' 'networkmanager' 'muffin' 'python2-dbus' 'python2-pillow'
+ 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk'
+ 'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd'
+ '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"
+ "upower_calender_fix.patch"
+ "set_wheel.patch")
+sha256sums=('123261a6a90954adc13f251489d708bc1b611808c63ae87c5189bf717f42483a'
+ '2edb96f42fb4da07eee635b1159e3ae869c64d7ac80f600bc509190648abcf3e'
+ 'dafb2b7b275053aa77d15f2ffab62ad1567aa9d93ed7a82077feeef86b81c7f7')
+
+prepare() {
+ cd ${srcdir}/Cinnamon*
+
+ # Python2 fix
+ 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 calendar applet with upower 0.99
+ patch -Np1 -i ../upower_calender_fix.patch
+
+ # Use wheel group instread of sudo
+ patch -Np1 -i ../set_wheel.patch
+
+ # Add polkit agent to required components
+ sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' 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
+
+ # Use pkexec instead of gksu
+ sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
+
+ # 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
+
+ # 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
+}
+
+build() {
+ cd ${srcdir}/Cinnamon*
+
+ ./autogen.sh --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/cinnamon \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-schemas-compile \
+ --enable-compile-warnings=yes \
+ --with-session-tracking=systemd
+ make
+}
+
+package() {
+ cd ${srcdir}/Cinnamon*
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-x86_64/cinnamon.install
===================================================================
--- community-x86_64/cinnamon.install 2014-05-30 22:23:15 UTC (rev 112282)
+++ community-x86_64/cinnamon.install 2014-05-30 22:24:47 UTC (rev 112283)
@@ -1,12 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: cinnamon/repos/community-x86_64/cinnamon.install (from rev 112282, cinnamon/trunk/cinnamon.install)
===================================================================
--- community-x86_64/cinnamon.install (rev 0)
+++ community-x86_64/cinnamon.install 2014-05-30 22:24:47 UTC (rev 112283)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-x86_64/set_wheel.patch
===================================================================
--- community-x86_64/set_wheel.patch 2014-05-30 22:23:15 UTC (rev 112282)
+++ community-x86_64/set_wheel.patch 2014-05-30 22:24:47 UTC (rev 112283)
@@ -1,14 +0,0 @@
---- 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()
Copied: cinnamon/repos/community-x86_64/set_wheel.patch (from rev 112282, cinnamon/trunk/set_wheel.patch)
===================================================================
--- community-x86_64/set_wheel.patch (rev 0)
+++ community-x86_64/set_wheel.patch 2014-05-30 22:24:47 UTC (rev 112283)
@@ -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
+@@ -747,7 +747,7 @@ 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,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()
Deleted: community-x86_64/upower_calender_fix.patch
===================================================================
--- community-x86_64/upower_calender_fix.patch 2014-05-30 22:23:15 UTC (rev 112282)
+++ community-x86_64/upower_calender_fix.patch 2014-05-30 22:24:47 UTC (rev 112283)
@@ -1,22 +0,0 @@
-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();
Copied: cinnamon/repos/community-x86_64/upower_calender_fix.patch (from rev 112282, cinnamon/trunk/upower_calender_fix.patch)
===================================================================
--- community-x86_64/upower_calender_fix.patch (rev 0)
+++ community-x86_64/upower_calender_fix.patch 2014-05-30 22:24:47 UTC (rev 112283)
@@ -0,0 +1,21 @@
+--- Cinnamon-2.2.13.orig/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js 2014-05-25 15:10:49.000000000 -0500
++++ Cinnamon-2.2.13/files/usr/share/cinnamon/applets/calendar at 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;
+ 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;
+@@ -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);
+
+- // 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