Date: Friday, November 20, 2015 @ 21:43:46 Author: bgyorgy Revision: 147267
archrelease: copy trunk to community-testing-i686, community-testing-x86_64 Added: cinnamon/repos/community-testing-i686/ cinnamon/repos/community-testing-i686/PKGBUILD (from rev 147266, cinnamon/trunk/PKGBUILD) cinnamon/repos/community-testing-i686/cinnamon.install (from rev 147266, cinnamon/trunk/cinnamon.install) cinnamon/repos/community-testing-i686/default-theme.patch (from rev 147266, cinnamon/trunk/default-theme.patch) cinnamon/repos/community-testing-i686/dont-hardcode-nemo.patch (from rev 147266, cinnamon/trunk/dont-hardcode-nemo.patch) cinnamon/repos/community-testing-i686/gnome-3.14.patch (from rev 147266, cinnamon/trunk/gnome-3.14.patch) cinnamon/repos/community-testing-i686/set_wheel.patch (from rev 147266, cinnamon/trunk/set_wheel.patch) cinnamon/repos/community-testing-x86_64/ cinnamon/repos/community-testing-x86_64/PKGBUILD (from rev 147266, cinnamon/trunk/PKGBUILD) cinnamon/repos/community-testing-x86_64/cinnamon.install (from rev 147266, cinnamon/trunk/cinnamon.install) cinnamon/repos/community-testing-x86_64/default-theme.patch (from rev 147266, cinnamon/trunk/default-theme.patch) cinnamon/repos/community-testing-x86_64/dont-hardcode-nemo.patch (from rev 147266, cinnamon/trunk/dont-hardcode-nemo.patch) cinnamon/repos/community-testing-x86_64/gnome-3.14.patch (from rev 147266, cinnamon/trunk/gnome-3.14.patch) cinnamon/repos/community-testing-x86_64/set_wheel.patch (from rev 147266, cinnamon/trunk/set_wheel.patch) ---------------------------------------------------+ community-testing-i686/PKGBUILD | 120 ++++++++++++++++++++ community-testing-i686/cinnamon.install | 12 ++ community-testing-i686/default-theme.patch | 25 ++++ community-testing-i686/dont-hardcode-nemo.patch | 33 +++++ community-testing-i686/gnome-3.14.patch | 12 ++ community-testing-i686/set_wheel.patch | 56 +++++++++ community-testing-x86_64/PKGBUILD | 120 ++++++++++++++++++++ community-testing-x86_64/cinnamon.install | 12 ++ community-testing-x86_64/default-theme.patch | 25 ++++ community-testing-x86_64/dont-hardcode-nemo.patch | 33 +++++ community-testing-x86_64/gnome-3.14.patch | 12 ++ community-testing-x86_64/set_wheel.patch | 56 +++++++++ 12 files changed, 516 insertions(+) Copied: cinnamon/repos/community-testing-i686/PKGBUILD (from rev 147266, cinnamon/trunk/PKGBUILD) =================================================================== --- community-testing-i686/PKGBUILD (rev 0) +++ community-testing-i686/PKGBUILD 2015-11-20 20:43:46 UTC (rev 147267) @@ -0,0 +1,120 @@ +# $Id$ +# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com> +# Contributor: M0Rf30 +# Contributor: unifiedlinux +# Contributor: CReimer + +pkgname=cinnamon +pkgver=2.8.5 +pkgrel=1 +pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" +arch=('i686' 'x86_64') +url="https://github.com/linuxmint/Cinnamon" +license=('GPL2') +depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session' + 'cinnamon-translations' 'cjs' 'clutter-gtk' 'gnome-backgrounds' 'gconf' + 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' 'libkeybinder3' 'librsvg' + 'networkmanager' 'muffin' 'python2-cairo' 'python2-dbus' 'python2-pillow' + 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' + 'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd' + 'network-manager-applet' 'nemo' 'polkit-gnome') +makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gobject-introspection') +optdepends=('blueberry: Bluetooth support' + 'system-config-printer: printer settings') +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" + "dont-hardcode-nemo.patch") +sha256sums=('5058a927b80d7443ef547b543a2ccff4284a9587f4df77ef8032d6c6ea997131' + '97542a424fa83c18c8c8a6d27c089129f30b6fb4cc128c662ac0da3aebf42dcc' + '31479171797f9fc88b91ef1294cc338b29c247f589ab84ff87b60bff06a6920a' + '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5' + '26a9fb9a3855759cc7d5fa9a195ae8860d5c6b3e12adc1bfe86269e047c119b4') + +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 (taken from Fedora) + patch -Np1 -i ../set_wheel.patch + + # Make Adwaita icon theme selectable in theme settings + patch -Np1 -i ../gnome-3.14.patch + + # Set default theme to 'cinnamon' + patch -Np1 -i ../default-theme.patch + + # Don't hardcode Nemo + patch -Np1 -i ../dont-hardcode-nemo.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/share/cinnamon/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/share/cinnamon/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/share/cinnamon/cinnamon-settings/cinnamon-settings.py + + # Fix missing icons with the Adwaita theme + sed -i 's/"gtk-file"/"text-x-generic"/' docs/applets-examples/fin...@cinnamon.org/applet.js src/cinnamon-util.c + sed -i "s/SECONDARY, 'ok'/SECONDARY, 'gtk-apply'/ + s/SECONDARY, 'stop'/SECONDARY, 'dialog-error'/" files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py + sed -i "s/'gnome-panel-launcher'/'system-run'/" files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py + sed -i 's/icon_name">gnome-panel-launcher/icon_name">system-run/' files/usr/share/cinnamon/cinnamon-desktop-editor/launcher-editor.ui + sed -i 's/"reload"/"view-refresh"/' files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py + sed -i 's/"gtk-dialog-question"/"dialog-question"/ + s/"gtk-directory"/"folder"/' files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py + sed -i 's/"display"/"video-display"/ + s/"access"/"preferences-desktop-accessibility"/ + s/"gnome-panel-launcher"/"system-run"/' files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py + sed -i 's/"stock_calendar"/"x-office-calendar"/' files/usr/share/cinnamon/applets/calen...@cinnamon.org/metadata.json + sed -i 's/"keyboard"/"input-keyboard"/' files/usr/share/cinnamon/applets/keybo...@cinnamon.org/metadata.json + sed -i 's/"desktop"/"user-desktop"/' files/usr/share/cinnamon/applets/show-desk...@cinnamon.org/metadata.json + sed -i 's/"stock_volume"/"multimedia-volume-control"/' files/usr/share/cinnamon/applets/so...@cinnamon.org/metadata.json + sed -i 's/"stock_calendar"/"x-office-calendar"/' files/usr/share/cinnamon/desklets/cl...@cinnamon.org/metadata.json + + # Remove broken symlink + rm files/etc/xdg/menus/cinnamon-applications-merged +} + +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 + + #https://bugzilla.gnome.org/show_bug.cgi?id=656231 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package() { + cd ${srcdir}/Cinnamon* + make DESTDIR="${pkgdir}" install +} Copied: cinnamon/repos/community-testing-i686/cinnamon.install (from rev 147266, cinnamon/trunk/cinnamon.install) =================================================================== --- community-testing-i686/cinnamon.install (rev 0) +++ community-testing-i686/cinnamon.install 2015-11-20 20:43:46 UTC (rev 147267) @@ -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 +} Copied: cinnamon/repos/community-testing-i686/default-theme.patch (from rev 147266, cinnamon/trunk/default-theme.patch) =================================================================== --- community-testing-i686/default-theme.patch (rev 0) +++ community-testing-i686/default-theme.patch 2015-11-20 20:43:46 UTC (rev 147267) @@ -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 + Copied: cinnamon/repos/community-testing-i686/dont-hardcode-nemo.patch (from rev 147266, cinnamon/trunk/dont-hardcode-nemo.patch) =================================================================== --- community-testing-i686/dont-hardcode-nemo.patch (rev 0) +++ community-testing-i686/dont-hardcode-nemo.patch 2015-11-20 20:43:46 UTC (rev 147267) @@ -0,0 +1,33 @@ +From 3dc5f008af8b726fd8cb1090b0a2056edb62876d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= <ballog...@gmail.com> +Date: Tue, 28 Jul 2015 03:27:32 +0200 +Subject: [PATCH] removable-drives applet: don't hardcode Nemo + +Use Gio to open the default file manager at 'computer:///'. +--- + .../share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/files/usr/share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js +index b3143de..8fb8f92 100644 +--- a/files/usr/share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js ++++ b/files/usr/share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js +@@ -1,6 +1,6 @@ + const Lang = imports.lang; + const St = imports.gi.St; +-const Cinnamon = imports.gi.Cinnamon; ++const Gio = imports.gi.Gio; + const Applet = imports.ui.applet; + const Main = imports.ui.main; + const PopupMenu = imports.ui.popupMenu; +@@ -63,9 +63,7 @@ MyApplet.prototype = { + + this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); + this.menu.addAction(_("Open file manager"), function(event) { +- let appSystem = Cinnamon.AppSystem.get_default(); +- let app = appSystem.lookup_app('nemo.desktop'); +- app.activate_full(-1, event.get_time()); ++ Gio.app_info_launch_default_for_uri("computer:///", null); + }); + + Main.placesManager.connect('mounts-updated', Lang.bind(this, this._update)); Copied: cinnamon/repos/community-testing-i686/gnome-3.14.patch (from rev 147266, cinnamon/trunk/gnome-3.14.patch) =================================================================== --- community-testing-i686/gnome-3.14.patch (rev 0) +++ community-testing-i686/gnome-3.14.patch 2015-11-20 20:43:46 UTC (rev 147267) @@ -0,0 +1,12 @@ +diff -Naur Cinnamon-2.2.16.orig/files/usr/share/cinnamon/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/share/cinnamon/cinnamon-settings/modules/cs_themes.py 2014-08-12 13:00:36.000000000 +0200 ++++ Cinnamon-2.2.16/files/usr/share/cinnamon/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-testing-i686/set_wheel.patch (from rev 147266, cinnamon/trunk/set_wheel.patch) =================================================================== --- community-testing-i686/set_wheel.patch (rev 0) +++ community-testing-i686/set_wheel.patch 2015-11-20 20:43:46 UTC (rev 147267) @@ -0,0 +1,56 @@ +--- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py ++++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py +@@ -147,12 +147,11 @@ + + 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) +@@ -218,14 +217,7 @@ + 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: +- subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"]) +- 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): +@@ -563,7 +555,7 @@ + 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): +@@ -807,11 +799,11 @@ + 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: +- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username]) ++ subprocess.call(["usermod", username, "-G", "%s,wheel" % username]) + else: +- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username]) ++ subprocess.call(["usermod", username, "-G", "%s" % username]) + self.load_groups() + dialog.destroy() + Copied: cinnamon/repos/community-testing-x86_64/PKGBUILD (from rev 147266, cinnamon/trunk/PKGBUILD) =================================================================== --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2015-11-20 20:43:46 UTC (rev 147267) @@ -0,0 +1,120 @@ +# $Id$ +# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com> +# Contributor: M0Rf30 +# Contributor: unifiedlinux +# Contributor: CReimer + +pkgname=cinnamon +pkgver=2.8.5 +pkgrel=1 +pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" +arch=('i686' 'x86_64') +url="https://github.com/linuxmint/Cinnamon" +license=('GPL2') +depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session' + 'cinnamon-translations' 'cjs' 'clutter-gtk' 'gnome-backgrounds' 'gconf' + 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' 'libkeybinder3' 'librsvg' + 'networkmanager' 'muffin' 'python2-cairo' 'python2-dbus' 'python2-pillow' + 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' + 'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd' + 'network-manager-applet' 'nemo' 'polkit-gnome') +makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gobject-introspection') +optdepends=('blueberry: Bluetooth support' + 'system-config-printer: printer settings') +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" + "dont-hardcode-nemo.patch") +sha256sums=('5058a927b80d7443ef547b543a2ccff4284a9587f4df77ef8032d6c6ea997131' + '97542a424fa83c18c8c8a6d27c089129f30b6fb4cc128c662ac0da3aebf42dcc' + '31479171797f9fc88b91ef1294cc338b29c247f589ab84ff87b60bff06a6920a' + '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5' + '26a9fb9a3855759cc7d5fa9a195ae8860d5c6b3e12adc1bfe86269e047c119b4') + +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 (taken from Fedora) + patch -Np1 -i ../set_wheel.patch + + # Make Adwaita icon theme selectable in theme settings + patch -Np1 -i ../gnome-3.14.patch + + # Set default theme to 'cinnamon' + patch -Np1 -i ../default-theme.patch + + # Don't hardcode Nemo + patch -Np1 -i ../dont-hardcode-nemo.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/share/cinnamon/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/share/cinnamon/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/share/cinnamon/cinnamon-settings/cinnamon-settings.py + + # Fix missing icons with the Adwaita theme + sed -i 's/"gtk-file"/"text-x-generic"/' docs/applets-examples/fin...@cinnamon.org/applet.js src/cinnamon-util.c + sed -i "s/SECONDARY, 'ok'/SECONDARY, 'gtk-apply'/ + s/SECONDARY, 'stop'/SECONDARY, 'dialog-error'/" files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py + sed -i "s/'gnome-panel-launcher'/'system-run'/" files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py + sed -i 's/icon_name">gnome-panel-launcher/icon_name">system-run/' files/usr/share/cinnamon/cinnamon-desktop-editor/launcher-editor.ui + sed -i 's/"reload"/"view-refresh"/' files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py + sed -i 's/"gtk-dialog-question"/"dialog-question"/ + s/"gtk-directory"/"folder"/' files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py + sed -i 's/"display"/"video-display"/ + s/"access"/"preferences-desktop-accessibility"/ + s/"gnome-panel-launcher"/"system-run"/' files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py + sed -i 's/"stock_calendar"/"x-office-calendar"/' files/usr/share/cinnamon/applets/calen...@cinnamon.org/metadata.json + sed -i 's/"keyboard"/"input-keyboard"/' files/usr/share/cinnamon/applets/keybo...@cinnamon.org/metadata.json + sed -i 's/"desktop"/"user-desktop"/' files/usr/share/cinnamon/applets/show-desk...@cinnamon.org/metadata.json + sed -i 's/"stock_volume"/"multimedia-volume-control"/' files/usr/share/cinnamon/applets/so...@cinnamon.org/metadata.json + sed -i 's/"stock_calendar"/"x-office-calendar"/' files/usr/share/cinnamon/desklets/cl...@cinnamon.org/metadata.json + + # Remove broken symlink + rm files/etc/xdg/menus/cinnamon-applications-merged +} + +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 + + #https://bugzilla.gnome.org/show_bug.cgi?id=656231 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package() { + cd ${srcdir}/Cinnamon* + make DESTDIR="${pkgdir}" install +} Copied: cinnamon/repos/community-testing-x86_64/cinnamon.install (from rev 147266, cinnamon/trunk/cinnamon.install) =================================================================== --- community-testing-x86_64/cinnamon.install (rev 0) +++ community-testing-x86_64/cinnamon.install 2015-11-20 20:43:46 UTC (rev 147267) @@ -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 +} Copied: cinnamon/repos/community-testing-x86_64/default-theme.patch (from rev 147266, cinnamon/trunk/default-theme.patch) =================================================================== --- community-testing-x86_64/default-theme.patch (rev 0) +++ community-testing-x86_64/default-theme.patch 2015-11-20 20:43:46 UTC (rev 147267) @@ -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 + Copied: cinnamon/repos/community-testing-x86_64/dont-hardcode-nemo.patch (from rev 147266, cinnamon/trunk/dont-hardcode-nemo.patch) =================================================================== --- community-testing-x86_64/dont-hardcode-nemo.patch (rev 0) +++ community-testing-x86_64/dont-hardcode-nemo.patch 2015-11-20 20:43:46 UTC (rev 147267) @@ -0,0 +1,33 @@ +From 3dc5f008af8b726fd8cb1090b0a2056edb62876d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= <ballog...@gmail.com> +Date: Tue, 28 Jul 2015 03:27:32 +0200 +Subject: [PATCH] removable-drives applet: don't hardcode Nemo + +Use Gio to open the default file manager at 'computer:///'. +--- + .../share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/files/usr/share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js +index b3143de..8fb8f92 100644 +--- a/files/usr/share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js ++++ b/files/usr/share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js +@@ -1,6 +1,6 @@ + const Lang = imports.lang; + const St = imports.gi.St; +-const Cinnamon = imports.gi.Cinnamon; ++const Gio = imports.gi.Gio; + const Applet = imports.ui.applet; + const Main = imports.ui.main; + const PopupMenu = imports.ui.popupMenu; +@@ -63,9 +63,7 @@ MyApplet.prototype = { + + this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); + this.menu.addAction(_("Open file manager"), function(event) { +- let appSystem = Cinnamon.AppSystem.get_default(); +- let app = appSystem.lookup_app('nemo.desktop'); +- app.activate_full(-1, event.get_time()); ++ Gio.app_info_launch_default_for_uri("computer:///", null); + }); + + Main.placesManager.connect('mounts-updated', Lang.bind(this, this._update)); Copied: cinnamon/repos/community-testing-x86_64/gnome-3.14.patch (from rev 147266, cinnamon/trunk/gnome-3.14.patch) =================================================================== --- community-testing-x86_64/gnome-3.14.patch (rev 0) +++ community-testing-x86_64/gnome-3.14.patch 2015-11-20 20:43:46 UTC (rev 147267) @@ -0,0 +1,12 @@ +diff -Naur Cinnamon-2.2.16.orig/files/usr/share/cinnamon/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/share/cinnamon/cinnamon-settings/modules/cs_themes.py 2014-08-12 13:00:36.000000000 +0200 ++++ Cinnamon-2.2.16/files/usr/share/cinnamon/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-testing-x86_64/set_wheel.patch (from rev 147266, cinnamon/trunk/set_wheel.patch) =================================================================== --- community-testing-x86_64/set_wheel.patch (rev 0) +++ community-testing-x86_64/set_wheel.patch 2015-11-20 20:43:46 UTC (rev 147267) @@ -0,0 +1,56 @@ +--- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py ++++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py +@@ -147,12 +147,11 @@ + + 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) +@@ -218,14 +217,7 @@ + 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: +- subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"]) +- 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): +@@ -563,7 +555,7 @@ + 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): +@@ -807,11 +799,11 @@ + 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: +- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username]) ++ subprocess.call(["usermod", username, "-G", "%s,wheel" % username]) + else: +- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username]) ++ subprocess.call(["usermod", username, "-G", "%s" % username]) + self.load_groups() + dialog.destroy() +