[arch-commits] Commit in cinnamon/trunk (3 files)
Balló György
bgyorgy at archlinux.org
Tue Aug 11 14:52:18 UTC 2015
Date: Tuesday, August 11, 2015 @ 16:52:17
Author: bgyorgy
Revision: 138244
upgpkg: cinnamon 2.6.13-3
Apply some fixes (FS#45615)
Added:
cinnamon/trunk/dont-hardcode-nemo.patch
cinnamon/trunk/fix-keyboard-flags.patch
Modified:
cinnamon/trunk/PKGBUILD
--------------------------+
PKGBUILD | 36 ++++++++++++++++++++++++++++++++----
dont-hardcode-nemo.patch | 33 +++++++++++++++++++++++++++++++++
fix-keyboard-flags.patch | 21 +++++++++++++++++++++
3 files changed, 86 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-08-11 13:41:06 UTC (rev 138243)
+++ PKGBUILD 2015-08-11 14:52:17 UTC (rev 138244)
@@ -6,7 +6,7 @@
pkgname=cinnamon
pkgver=2.6.13
-pkgrel=2
+pkgrel=3
pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
arch=('i686' 'x86_64')
url="http://cinnamon.linuxmint.com/"
@@ -26,11 +26,15 @@
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
"set_wheel.patch"
"gnome-3.14.patch"
- "default-theme.patch")
+ "default-theme.patch"
+ "dont-hardcode-nemo.patch"
+ "fix-keyboard-flags.patch")
sha256sums=('f349403901bf3e84cda2ebd425dc6f58850059092775e285862067f120debe86'
'2f0fec7d733aa19be426a0e1aecff1af451183de038d2868a2ee3195f227956e'
'5ecce3c1617c0479ef97290494aaaa4e5a58d24de31d00a527d44921e2a44d91'
- '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5')
+ '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5'
+ '26a9fb9a3855759cc7d5fa9a195ae8860d5c6b3e12adc1bfe86269e047c119b4'
+ '35478dd7df2ecee484bbe758885ed55797e0567643615984973d153f34700016')
prepare() {
cd ${srcdir}/Cinnamon*
@@ -42,12 +46,18 @@
# Use wheel group instread of sudo
patch -Np1 -i ../set_wheel.patch
- # Some fixes for GNOME 3.14
+ # 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
+
+ # Fix missing flags in keyboard applet (FS#45615)
+ patch -Np1 -i ../fix-keyboard-flags.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
@@ -69,6 +79,24 @@
# 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
+
+ # Fix missing icons with the Adwaita theme
+ sed -i 's/"gtk-file"/"text-x-generic"/' docs/applets-examples/finder at cinnamon.org/applet.js src/cinnamon-util.c
+ sed -i "s/SECONDARY, 'ok'/SECONDARY, 'gtk-apply'/
+ s/SECONDARY, 'stop'/SECONDARY, 'dialog-error'/" files/usr/lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+ sed -i "s/'gnome-panel-launcher'/'system-run'/" files/usr/lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+ sed -i 's/icon_name">gnome-panel-launcher/icon_name">system-run/' files/usr/lib/cinnamon-desktop-editor/launcher-editor.ui
+ sed -i 's/"reload"/"view-refresh"/' files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
+ sed -i 's/"gtk-dialog-question"/"dialog-question"/
+ s/"gtk-directory"/"folder"/' files/usr/lib/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/lib/cinnamon-settings/modules/cs_keyboard.py
+ sed -i 's/"stock_calendar"/"x-office-calendar"/' files/usr/share/cinnamon/applets/calendar at cinnamon.org/metadata.json
+ sed -i 's/"keyboard"/"input-keyboard"/' files/usr/share/cinnamon/applets/keyboard at cinnamon.org/metadata.json
+ sed -i 's/"desktop"/"user-desktop"/' files/usr/share/cinnamon/applets/show-desktop at cinnamon.org/metadata.json
+ sed -i 's/"stock_volume"/"multimedia-volume-control"/' files/usr/share/cinnamon/applets/sound at cinnamon.org/metadata.json
+ sed -i 's/"stock_calendar"/"x-office-calendar"/' files/usr/share/cinnamon/desklets/clock at cinnamon.org/metadata.json
}
build() {
Added: dont-hardcode-nemo.patch
===================================================================
--- dont-hardcode-nemo.patch (rev 0)
+++ dont-hardcode-nemo.patch 2015-08-11 14:52:17 UTC (rev 138244)
@@ -0,0 +1,33 @@
+From 3dc5f008af8b726fd8cb1090b0a2056edb62876d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= <ballogyor at 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-drives at cinnamon.org/applet.js | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/files/usr/share/cinnamon/applets/removable-drives at cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/removable-drives at cinnamon.org/applet.js
+index b3143de..8fb8f92 100644
+--- a/files/usr/share/cinnamon/applets/removable-drives at cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/removable-drives at 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));
Added: fix-keyboard-flags.patch
===================================================================
--- fix-keyboard-flags.patch (rev 0)
+++ fix-keyboard-flags.patch 2015-08-11 14:52:17 UTC (rev 138244)
@@ -0,0 +1,21 @@
+diff -Naur Cinnamon-2.6.13.old/files/usr/share/cinnamon/applets/keyboard at cinnamon.org/applet.js Cinnamon-2.6.13/files/usr/share/cinnamon/applets/keyboard at cinnamon.org/applet.js
+--- Cinnamon-2.6.13.old/files/usr/share/cinnamon/applets/keyboard at cinnamon.org/applet.js 2015-08-11 14:00:42.008882266 +0000
++++ Cinnamon-2.6.13/files/usr/share/cinnamon/applets/keyboard at cinnamon.org/applet.js 2015-08-11 14:09:14.683803907 +0000
+@@ -139,7 +139,7 @@
+ for (let i = 0; i < groups.length; i++) {
+ let icon_name = this._config.get_group_name(i);
+ let actor;
+- if (this._showFlags && this.icon_theme.has_icon(icon_name))
++ if (this._showFlags)
+ actor = new St.Icon({ icon_name: icon_name, icon_type: St.IconType.FULLCOLOR, style_class: 'popup-menu-icon' });
+ else
+ actor = new St.Label({ text: short_names[i] });
+@@ -171,7 +171,7 @@
+ let selectedLabel = this._labelActors[selected];
+
+ this.set_applet_tooltip(item._long_name)
+- if (this._showFlags && this.icon_theme.has_icon(item._icon_name)) {
++ if (this._showFlags) {
+ this.set_applet_icon_name(item._icon_name);
+ this.set_applet_label("");
+ } else {
More information about the arch-commits
mailing list