Date: Sunday, June 28, 2015 @ 13:51:40 Author: bgyorgy Revision: 136033
archrelease: copy trunk to community-i686, community-x86_64 Added: cinnamon/repos/community-i686/PKGBUILD (from rev 136032, cinnamon/trunk/PKGBUILD) cinnamon/repos/community-i686/cinnamon.install (from rev 136032, cinnamon/trunk/cinnamon.install) cinnamon/repos/community-i686/default-theme.patch (from rev 136032, cinnamon/trunk/default-theme.patch) cinnamon/repos/community-i686/gnome-3.14.patch (from rev 136032, cinnamon/trunk/gnome-3.14.patch) cinnamon/repos/community-i686/set_wheel.patch (from rev 136032, cinnamon/trunk/set_wheel.patch) cinnamon/repos/community-x86_64/PKGBUILD (from rev 136032, cinnamon/trunk/PKGBUILD) cinnamon/repos/community-x86_64/cinnamon.install (from rev 136032, cinnamon/trunk/cinnamon.install) cinnamon/repos/community-x86_64/default-theme.patch (from rev 136032, cinnamon/trunk/default-theme.patch) cinnamon/repos/community-x86_64/gnome-3.14.patch (from rev 136032, cinnamon/trunk/gnome-3.14.patch) cinnamon/repos/community-x86_64/set_wheel.patch (from rev 136032, cinnamon/trunk/set_wheel.patch) Deleted: cinnamon/repos/community-i686/PKGBUILD cinnamon/repos/community-i686/cinnamon.install cinnamon/repos/community-i686/default-theme.patch cinnamon/repos/community-i686/gnome-3.14.patch cinnamon/repos/community-i686/set_wheel.patch cinnamon/repos/community-x86_64/PKGBUILD cinnamon/repos/community-x86_64/cinnamon.install cinnamon/repos/community-x86_64/default-theme.patch cinnamon/repos/community-x86_64/gnome-3.14.patch cinnamon/repos/community-x86_64/set_wheel.patch --------------------------------------+ /PKGBUILD | 178 +++++++++++++++++++++++++++++++++ /cinnamon.install | 24 ++++ /default-theme.patch | 50 +++++++++ /gnome-3.14.patch | 24 ++++ /set_wheel.patch | 112 ++++++++++++++++++++ community-i686/PKGBUILD | 89 ---------------- community-i686/cinnamon.install | 12 -- community-i686/default-theme.patch | 25 ---- community-i686/gnome-3.14.patch | 25 ---- community-i686/set_wheel.patch | 17 --- community-x86_64/PKGBUILD | 89 ---------------- community-x86_64/cinnamon.install | 12 -- community-x86_64/default-theme.patch | 25 ---- community-x86_64/gnome-3.14.patch | 25 ---- community-x86_64/set_wheel.patch | 17 --- 15 files changed, 388 insertions(+), 336 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2015-06-28 11:51:28 UTC (rev 136032) +++ community-i686/PKGBUILD 2015-06-28 11:51:40 UTC (rev 136033) @@ -1,89 +0,0 @@ -# $Id$ -# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com> -# Contributor: M0Rf30 -# Contributor: unifiedlinux -# Contributor: CReimer - -pkgname=cinnamon -pkgver=2.6.9 -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' 'gnome-backgrounds' 'gconf' - 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' 'librsvg' - 'networkmanager' 'muffin' 'python2-cairo' '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' 'python3') -makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gobject-introspection') -options=('!emptydirs') -install=${pkgname}.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz" - "set_wheel.patch" - "gnome-3.14.patch" - "default-theme.patch") -sha256sums=('9bed52d586480b888a414af6e306c2d8d6cf536aeb49e65304b8f3e2e422e756' - '0f6a4055fc70f727b90c3d97ebc99f6bf3028b8cc7189736d8e0f1dac6fac137' - 'da763a88b4ee2e889afffd189b877708ca34b704fe7e9b62c0cc2bd970564058' - '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5') - -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@' - - # Use wheel group instread of sudo - patch -Np1 -i ../set_wheel.patch - - # Some fixes for GNOME 3.14 - patch -Np1 -i ../gnome-3.14.patch - - # Set default theme to 'cinnamon' - patch -Np1 -i ../default-theme.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 - - # Fix selected background color in Cinnamon Settings for Adwaita theme - sed -i 's/@selected_bg_color;/@theme_selected_bg_color;/' \ - files/usr/lib/cinnamon-settings/cinnamon-settings.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 136032, cinnamon/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2015-06-28 11:51:40 UTC (rev 136033) @@ -0,0 +1,89 @@ +# $Id$ +# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com> +# Contributor: M0Rf30 +# Contributor: unifiedlinux +# Contributor: CReimer + +pkgname=cinnamon +pkgver=2.6.11 +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' 'gnome-backgrounds' 'gconf' + 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' 'librsvg' + 'networkmanager' 'muffin' 'python2-cairo' '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' 'gtk-doc' 'gobject-introspection') +options=('!emptydirs') +install=${pkgname}.install +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz" + "set_wheel.patch" + "gnome-3.14.patch" + "default-theme.patch") +sha256sums=('ff81da04f076bd978e3a8d9001656ab60cd95a945603827f67214cb113f3fff6' + '2f0fec7d733aa19be426a0e1aecff1af451183de038d2868a2ee3195f227956e' + '5ecce3c1617c0479ef97290494aaaa4e5a58d24de31d00a527d44921e2a44d91' + '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5') + +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@' + + # Use wheel group instread of sudo + patch -Np1 -i ../set_wheel.patch + + # Some fixes for GNOME 3.14 + patch -Np1 -i ../gnome-3.14.patch + + # Set default theme to 'cinnamon' + patch -Np1 -i ../default-theme.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 + + # Fix selected background color in Cinnamon Settings for Adwaita theme + sed -i 's/@selected_bg_color;/@theme_selected_bg_color;/' \ + files/usr/lib/cinnamon-settings/cinnamon-settings.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 2015-06-28 11:51:28 UTC (rev 136032) +++ community-i686/cinnamon.install 2015-06-28 11:51:40 UTC (rev 136033) @@ -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 136032, cinnamon/trunk/cinnamon.install) =================================================================== --- community-i686/cinnamon.install (rev 0) +++ community-i686/cinnamon.install 2015-06-28 11:51:40 UTC (rev 136033) @@ -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/default-theme.patch =================================================================== --- community-i686/default-theme.patch 2015-06-28 11:51:28 UTC (rev 136032) +++ community-i686/default-theme.patch 2015-06-28 11:51:40 UTC (rev 136033) @@ -1,25 +0,0 @@ -From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> -Date: Sat, 22 Nov 2014 22:39:39 +0100 -Subject: [PATCH] Set default theme to 'cinnamon' - ---- - data/org.cinnamon.gschema.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in -index 91fa171..9f56e4c 100644 ---- a/data/org.cinnamon.gschema.xml.in -+++ b/data/org.cinnamon.gschema.xml.in -@@ -581,7 +581,7 @@ - <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/" - gettext-domain="@GETTEXT_PACKAGE@"> - <key name="name" type="s"> -- <default>""</default> -+ <default>"cinnamon"</default> - <_summary>Theme name</_summary> - <_description> - The name of the theme --- -2.1.3 - Copied: cinnamon/repos/community-i686/default-theme.patch (from rev 136032, cinnamon/trunk/default-theme.patch) =================================================================== --- community-i686/default-theme.patch (rev 0) +++ community-i686/default-theme.patch 2015-06-28 11:51:40 UTC (rev 136033) @@ -0,0 +1,25 @@ +From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> +Date: Sat, 22 Nov 2014 22:39:39 +0100 +Subject: [PATCH] Set default theme to 'cinnamon' + +--- + data/org.cinnamon.gschema.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in +index 91fa171..9f56e4c 100644 +--- a/data/org.cinnamon.gschema.xml.in ++++ b/data/org.cinnamon.gschema.xml.in +@@ -581,7 +581,7 @@ + <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/" + gettext-domain="@GETTEXT_PACKAGE@"> + <key name="name" type="s"> +- <default>""</default> ++ <default>"cinnamon"</default> + <_summary>Theme name</_summary> + <_description> + The name of the theme +-- +2.1.3 + Deleted: community-i686/gnome-3.14.patch =================================================================== --- community-i686/gnome-3.14.patch 2015-06-28 11:51:28 UTC (rev 136032) +++ community-i686/gnome-3.14.patch 2015-06-28 11:51:40 UTC (rev 136033) @@ -1,25 +0,0 @@ -diff -Naur Cinnamon-2.2.16.orig/data/theme/cinnamon.css Cinnamon-2.2.16/data/theme/cinnamon.css ---- Cinnamon-2.2.16.orig/data/theme/cinnamon.css 2014-08-12 13:00:36.000000000 +0200 -+++ Cinnamon-2.2.16/data/theme/cinnamon.css 2014-10-01 02:51:45.859630151 +0200 -@@ -1445,7 +1445,8 @@ - .applet-icon:hover, - .applet-box:hover > .applet-icon { - color: #fff; -- icon-shadow: white 0px 0px 3px; -+/* Broken with GNOME 3.14 (icon-size is not honoured) -+ * icon-shadow: white 0px 0px 3px;*/ - } - - /* =================================================================== -diff -Naur Cinnamon-2.2.16.orig/files/usr/lib/cinnamon-settings/modules/cs_themes.py Cinnamon-2.2.16/files/usr/lib/cinnamon-settings/modules/cs_themes.py ---- Cinnamon-2.2.16.orig/files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-08-12 13:00:36.000000000 +0200 -+++ Cinnamon-2.2.16/files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-10-01 02:52:56.897767729 +0200 -@@ -91,7 +91,7 @@ - - def _load_icon_themes(self): - dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"), ".icons")) -- valid = walk_directories(dirs, lambda d: os.path.isdir(d) and not os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d, "index.theme"))) -+ valid = walk_directories(dirs, lambda d: os.path.isdir(d) and os.path.exists(os.path.join(d, "index.theme"))) - valid.sort(lambda a,b: cmp(a.lower(), b.lower())) - res = [] - for i in valid: Copied: cinnamon/repos/community-i686/gnome-3.14.patch (from rev 136032, cinnamon/trunk/gnome-3.14.patch) =================================================================== --- community-i686/gnome-3.14.patch (rev 0) +++ community-i686/gnome-3.14.patch 2015-06-28 11:51:40 UTC (rev 136033) @@ -0,0 +1,12 @@ +diff -Naur Cinnamon-2.2.16.orig/files/usr/lib/cinnamon-settings/modules/cs_themes.py Cinnamon-2.2.16/files/usr/lib/cinnamon-settings/modules/cs_themes.py +--- Cinnamon-2.2.16.orig/files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-08-12 13:00:36.000000000 +0200 ++++ Cinnamon-2.2.16/files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-10-01 02:52:56.897767729 +0200 +@@ -91,7 +91,7 @@ + + def _load_icon_themes(self): + dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"), ".icons")) +- valid = walk_directories(dirs, lambda d: os.path.isdir(d) and not os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d, "index.theme"))) ++ valid = walk_directories(dirs, lambda d: os.path.isdir(d) and os.path.exists(os.path.join(d, "index.theme"))) + valid.sort(lambda a,b: cmp(a.lower(), b.lower())) + res = [] + for i in valid: Deleted: community-i686/set_wheel.patch =================================================================== --- community-i686/set_wheel.patch 2015-06-28 11:51:28 UTC (rev 136032) +++ community-i686/set_wheel.patch 2015-06-28 11:51:40 UTC (rev 136033) @@ -1,17 +0,0 @@ ---- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py -+++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py -@@ -745,11 +738,11 @@ 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,wheel" % (username, username)) - else: -- os.system("usermod %s -G %s,nopasswdlogin" % (username, username)) -+ os.system("usermod %s -G users,nopasswdlogin" % username) - self.load_groups() - dialog.destroy() - Copied: cinnamon/repos/community-i686/set_wheel.patch (from rev 136032, cinnamon/trunk/set_wheel.patch) =================================================================== --- community-i686/set_wheel.patch (rev 0) +++ community-i686/set_wheel.patch 2015-06-28 11:51:40 UTC (rev 136033) @@ -0,0 +1,56 @@ +--- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py ++++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py +@@ -145,12 +145,11 @@ class EditableEntry (Gtk.Notebook): + + class PasswordDialog(Gtk.Dialog): + +- def __init__ (self, user, password_mask, group_mask): ++ def __init__ (self, user, password_mask): + super(PasswordDialog, self).__init__() + + self.user = user + self.password_mask = password_mask +- self.group_mask = group_mask + + self.set_modal(True) + self.set_skip_taskbar_hint(True) +@@ -216,14 +215,7 @@ class PasswordDialog(Gtk.Dialog): + def change_password(self): + newpass = self.new_password.get_text() + self.user.set_password(newpass, "") +- mask = self.group_mask.get_text() +- if "nopasswdlogin" in mask: +- os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name()) +- mask = mask.split(", ") +- mask.remove("nopasswdlogin") +- mask = ", ".join(mask) +- self.group_mask.set_text(mask) +- self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') ++ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') + self.destroy() + + def set_passwords_visibility(self): +@@ -517,7 +509,7 @@ class Module: + model, treeiter = self.users_treeview.get_selection().get_selected() + if treeiter != None: + user = model[treeiter][INDEX_USER_OBJECT] +- dialog = PasswordDialog(user, self.password_mask, self.groups_label) ++ dialog = PasswordDialog(user, self.password_mask) + response = dialog.run() + + def _on_groups_button_clicked(self, widget): +@@ -756,11 +748,11 @@ 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,wheel" % (username, username)) + else: +- os.system("usermod %s -G %s,nopasswdlogin" % (username, username)) ++ os.system("usermod %s -G %s" % (username, username)) + self.load_groups() + dialog.destroy() + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2015-06-28 11:51:28 UTC (rev 136032) +++ community-x86_64/PKGBUILD 2015-06-28 11:51:40 UTC (rev 136033) @@ -1,89 +0,0 @@ -# $Id$ -# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com> -# Contributor: M0Rf30 -# Contributor: unifiedlinux -# Contributor: CReimer - -pkgname=cinnamon -pkgver=2.6.9 -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' 'gnome-backgrounds' 'gconf' - 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' 'librsvg' - 'networkmanager' 'muffin' 'python2-cairo' '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' 'python3') -makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gobject-introspection') -options=('!emptydirs') -install=${pkgname}.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz" - "set_wheel.patch" - "gnome-3.14.patch" - "default-theme.patch") -sha256sums=('9bed52d586480b888a414af6e306c2d8d6cf536aeb49e65304b8f3e2e422e756' - '0f6a4055fc70f727b90c3d97ebc99f6bf3028b8cc7189736d8e0f1dac6fac137' - 'da763a88b4ee2e889afffd189b877708ca34b704fe7e9b62c0cc2bd970564058' - '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5') - -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@' - - # Use wheel group instread of sudo - patch -Np1 -i ../set_wheel.patch - - # Some fixes for GNOME 3.14 - patch -Np1 -i ../gnome-3.14.patch - - # Set default theme to 'cinnamon' - patch -Np1 -i ../default-theme.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 - - # Fix selected background color in Cinnamon Settings for Adwaita theme - sed -i 's/@selected_bg_color;/@theme_selected_bg_color;/' \ - files/usr/lib/cinnamon-settings/cinnamon-settings.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 136032, cinnamon/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2015-06-28 11:51:40 UTC (rev 136033) @@ -0,0 +1,89 @@ +# $Id$ +# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com> +# Contributor: M0Rf30 +# Contributor: unifiedlinux +# Contributor: CReimer + +pkgname=cinnamon +pkgver=2.6.11 +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' 'gnome-backgrounds' 'gconf' + 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' 'librsvg' + 'networkmanager' 'muffin' 'python2-cairo' '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' 'gtk-doc' 'gobject-introspection') +options=('!emptydirs') +install=${pkgname}.install +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz" + "set_wheel.patch" + "gnome-3.14.patch" + "default-theme.patch") +sha256sums=('ff81da04f076bd978e3a8d9001656ab60cd95a945603827f67214cb113f3fff6' + '2f0fec7d733aa19be426a0e1aecff1af451183de038d2868a2ee3195f227956e' + '5ecce3c1617c0479ef97290494aaaa4e5a58d24de31d00a527d44921e2a44d91' + '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5') + +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@' + + # Use wheel group instread of sudo + patch -Np1 -i ../set_wheel.patch + + # Some fixes for GNOME 3.14 + patch -Np1 -i ../gnome-3.14.patch + + # Set default theme to 'cinnamon' + patch -Np1 -i ../default-theme.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 + + # Fix selected background color in Cinnamon Settings for Adwaita theme + sed -i 's/@selected_bg_color;/@theme_selected_bg_color;/' \ + files/usr/lib/cinnamon-settings/cinnamon-settings.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 2015-06-28 11:51:28 UTC (rev 136032) +++ community-x86_64/cinnamon.install 2015-06-28 11:51:40 UTC (rev 136033) @@ -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 136032, cinnamon/trunk/cinnamon.install) =================================================================== --- community-x86_64/cinnamon.install (rev 0) +++ community-x86_64/cinnamon.install 2015-06-28 11:51:40 UTC (rev 136033) @@ -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/default-theme.patch =================================================================== --- community-x86_64/default-theme.patch 2015-06-28 11:51:28 UTC (rev 136032) +++ community-x86_64/default-theme.patch 2015-06-28 11:51:40 UTC (rev 136033) @@ -1,25 +0,0 @@ -From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> -Date: Sat, 22 Nov 2014 22:39:39 +0100 -Subject: [PATCH] Set default theme to 'cinnamon' - ---- - data/org.cinnamon.gschema.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in -index 91fa171..9f56e4c 100644 ---- a/data/org.cinnamon.gschema.xml.in -+++ b/data/org.cinnamon.gschema.xml.in -@@ -581,7 +581,7 @@ - <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/" - gettext-domain="@GETTEXT_PACKAGE@"> - <key name="name" type="s"> -- <default>""</default> -+ <default>"cinnamon"</default> - <_summary>Theme name</_summary> - <_description> - The name of the theme --- -2.1.3 - Copied: cinnamon/repos/community-x86_64/default-theme.patch (from rev 136032, cinnamon/trunk/default-theme.patch) =================================================================== --- community-x86_64/default-theme.patch (rev 0) +++ community-x86_64/default-theme.patch 2015-06-28 11:51:40 UTC (rev 136033) @@ -0,0 +1,25 @@ +From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> +Date: Sat, 22 Nov 2014 22:39:39 +0100 +Subject: [PATCH] Set default theme to 'cinnamon' + +--- + data/org.cinnamon.gschema.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in +index 91fa171..9f56e4c 100644 +--- a/data/org.cinnamon.gschema.xml.in ++++ b/data/org.cinnamon.gschema.xml.in +@@ -581,7 +581,7 @@ + <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/" + gettext-domain="@GETTEXT_PACKAGE@"> + <key name="name" type="s"> +- <default>""</default> ++ <default>"cinnamon"</default> + <_summary>Theme name</_summary> + <_description> + The name of the theme +-- +2.1.3 + Deleted: community-x86_64/gnome-3.14.patch =================================================================== --- community-x86_64/gnome-3.14.patch 2015-06-28 11:51:28 UTC (rev 136032) +++ community-x86_64/gnome-3.14.patch 2015-06-28 11:51:40 UTC (rev 136033) @@ -1,25 +0,0 @@ -diff -Naur Cinnamon-2.2.16.orig/data/theme/cinnamon.css Cinnamon-2.2.16/data/theme/cinnamon.css ---- Cinnamon-2.2.16.orig/data/theme/cinnamon.css 2014-08-12 13:00:36.000000000 +0200 -+++ Cinnamon-2.2.16/data/theme/cinnamon.css 2014-10-01 02:51:45.859630151 +0200 -@@ -1445,7 +1445,8 @@ - .applet-icon:hover, - .applet-box:hover > .applet-icon { - color: #fff; -- icon-shadow: white 0px 0px 3px; -+/* Broken with GNOME 3.14 (icon-size is not honoured) -+ * icon-shadow: white 0px 0px 3px;*/ - } - - /* =================================================================== -diff -Naur Cinnamon-2.2.16.orig/files/usr/lib/cinnamon-settings/modules/cs_themes.py Cinnamon-2.2.16/files/usr/lib/cinnamon-settings/modules/cs_themes.py ---- Cinnamon-2.2.16.orig/files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-08-12 13:00:36.000000000 +0200 -+++ Cinnamon-2.2.16/files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-10-01 02:52:56.897767729 +0200 -@@ -91,7 +91,7 @@ - - def _load_icon_themes(self): - dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"), ".icons")) -- valid = walk_directories(dirs, lambda d: os.path.isdir(d) and not os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d, "index.theme"))) -+ valid = walk_directories(dirs, lambda d: os.path.isdir(d) and os.path.exists(os.path.join(d, "index.theme"))) - valid.sort(lambda a,b: cmp(a.lower(), b.lower())) - res = [] - for i in valid: Copied: cinnamon/repos/community-x86_64/gnome-3.14.patch (from rev 136032, cinnamon/trunk/gnome-3.14.patch) =================================================================== --- community-x86_64/gnome-3.14.patch (rev 0) +++ community-x86_64/gnome-3.14.patch 2015-06-28 11:51:40 UTC (rev 136033) @@ -0,0 +1,12 @@ +diff -Naur Cinnamon-2.2.16.orig/files/usr/lib/cinnamon-settings/modules/cs_themes.py Cinnamon-2.2.16/files/usr/lib/cinnamon-settings/modules/cs_themes.py +--- Cinnamon-2.2.16.orig/files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-08-12 13:00:36.000000000 +0200 ++++ Cinnamon-2.2.16/files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-10-01 02:52:56.897767729 +0200 +@@ -91,7 +91,7 @@ + + def _load_icon_themes(self): + dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"), ".icons")) +- valid = walk_directories(dirs, lambda d: os.path.isdir(d) and not os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d, "index.theme"))) ++ valid = walk_directories(dirs, lambda d: os.path.isdir(d) and os.path.exists(os.path.join(d, "index.theme"))) + valid.sort(lambda a,b: cmp(a.lower(), b.lower())) + res = [] + for i in valid: Deleted: community-x86_64/set_wheel.patch =================================================================== --- community-x86_64/set_wheel.patch 2015-06-28 11:51:28 UTC (rev 136032) +++ community-x86_64/set_wheel.patch 2015-06-28 11:51:40 UTC (rev 136033) @@ -1,17 +0,0 @@ ---- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py -+++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py -@@ -745,11 +738,11 @@ 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,wheel" % (username, username)) - else: -- os.system("usermod %s -G %s,nopasswdlogin" % (username, username)) -+ os.system("usermod %s -G users,nopasswdlogin" % username) - self.load_groups() - dialog.destroy() - Copied: cinnamon/repos/community-x86_64/set_wheel.patch (from rev 136032, cinnamon/trunk/set_wheel.patch) =================================================================== --- community-x86_64/set_wheel.patch (rev 0) +++ community-x86_64/set_wheel.patch 2015-06-28 11:51:40 UTC (rev 136033) @@ -0,0 +1,56 @@ +--- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py ++++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py +@@ -145,12 +145,11 @@ class EditableEntry (Gtk.Notebook): + + class PasswordDialog(Gtk.Dialog): + +- def __init__ (self, user, password_mask, group_mask): ++ def __init__ (self, user, password_mask): + super(PasswordDialog, self).__init__() + + self.user = user + self.password_mask = password_mask +- self.group_mask = group_mask + + self.set_modal(True) + self.set_skip_taskbar_hint(True) +@@ -216,14 +215,7 @@ class PasswordDialog(Gtk.Dialog): + def change_password(self): + newpass = self.new_password.get_text() + self.user.set_password(newpass, "") +- mask = self.group_mask.get_text() +- if "nopasswdlogin" in mask: +- os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name()) +- mask = mask.split(", ") +- mask.remove("nopasswdlogin") +- mask = ", ".join(mask) +- self.group_mask.set_text(mask) +- self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') ++ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') + self.destroy() + + def set_passwords_visibility(self): +@@ -517,7 +509,7 @@ class Module: + model, treeiter = self.users_treeview.get_selection().get_selected() + if treeiter != None: + user = model[treeiter][INDEX_USER_OBJECT] +- dialog = PasswordDialog(user, self.password_mask, self.groups_label) ++ dialog = PasswordDialog(user, self.password_mask) + response = dialog.run() + + def _on_groups_button_clicked(self, widget): +@@ -756,11 +748,11 @@ 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,wheel" % (username, username)) + else: +- os.system("usermod %s -G %s,nopasswdlogin" % (username, username)) ++ os.system("usermod %s -G %s" % (username, username)) + self.load_groups() + dialog.destroy() +