[arch-commits] Commit in cinnamon/trunk (5 files)
Balló György
bgyorgy at nymeria.archlinux.org
Tue Apr 15 14:34:01 UTC 2014
Date: Tuesday, April 15, 2014 @ 16:34:01
Author: bgyorgy
Revision: 109535
upgpkg: cinnamon 2.2.3-2
Remove some stuff that no longer needed
Modified:
cinnamon/trunk/PKGBUILD
cinnamon/trunk/cinnamon.install
Deleted:
cinnamon/trunk/input_keybindings.patch
cinnamon/trunk/keyboard_applet.patch
cinnamon/trunk/org.archlinux.pkexec.cinnamon-settings-users.policy
-------------------------+
PKGBUILD | 38 ++-----------
cinnamon.install | 1
input_keybindings.patch | 11 ---
keyboard_applet.patch | 133 ----------------------------------------------
4 files changed, 8 insertions(+), 175 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-04-15 13:40:46 UTC (rev 109534)
+++ PKGBUILD 2014-04-15 14:34:01 UTC (rev 109535)
@@ -6,7 +6,7 @@
pkgname=cinnamon
pkgver=2.2.3
-pkgrel=1
+pkgrel=2
pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
arch=('i686' 'x86_64')
url="http://cinnamon.linuxmint.com/"
@@ -13,7 +13,7 @@
license=('GPL2')
depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session'
'cinnamon-translations' 'cjs' 'clutter-gtk' 'gconf' 'gnome-icon-theme'
- 'gnome-menus' 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring'
+ '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'
@@ -23,18 +23,11 @@
install=${pkgname}.install
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
"upower_calender_fix.patch"
- "keyboard_applet.patch"
- "input_keybindings.patch"
- "set_wheel.patch"
- "org.archlinux.pkexec.cinnamon-settings-users.policy")
+ "set_wheel.patch")
sha256sums=('9151452f81ffb7edc28cbdb107818f64bb9bd55610711781345418166372f0fe'
'babfe88a3773f5369b05c7b61d0318cf969b482b9e0c3f281afaf488b0051e53'
- '6acb07393105ddced8a4c3c869a596350d1a7d81a808ca5307d2ad770653a9d3'
- 'e28c40eb844105154fa6106f5b4de3151a22805b3a7b2f84be9ea6c15cec3de6'
- 'd5d5634b24e56837cb677e62669450c25f79005ed1388584760a131f461180ec'
- '371beac9e55d36f7629d2fc5cb40d6a3e6c0f4aac014f6fefdcd6743b5194b23')
+ 'd5d5634b24e56837cb677e62669450c25f79005ed1388584760a131f461180ec')
-
prepare() {
cd ${srcdir}/Cinnamon*
@@ -42,28 +35,18 @@
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
- # Fix keyboard applet
- patch -Np1 -i ../keyboard_applet.patch
-
- # Add input keybindings
- patch -Np1 -i ../input_keybindings.patch
-
# Use wheel group instread of sudo
patch -Np1 -i ../set_wheel.patch
- # Fix required components
- sed -i 's/cinnamon-fallback-mount-helper;/polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
+ # 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
+ # 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
@@ -70,9 +53,6 @@
# 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
-
- # Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center
- sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' files/usr/share/applications/cinnamon-settings{,-users}.desktop
}
build() {
@@ -92,8 +72,4 @@
package() {
cd ${srcdir}/Cinnamon*
make DESTDIR="${pkgdir}" install
-
- # Install policy file
- install -Dm644 "${srcdir}/org.archlinux.pkexec.cinnamon-settings-users.policy" \
- "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.cinnamon-settings-users.policy"
}
Modified: cinnamon.install
===================================================================
--- cinnamon.install 2014-04-15 13:40:46 UTC (rev 109534)
+++ cinnamon.install 2014-04-15 14:34:01 UTC (rev 109535)
@@ -1,5 +1,6 @@
post_install() {
glib-compile-schemas usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
post_upgrade() {
Deleted: input_keybindings.patch
===================================================================
--- input_keybindings.patch 2014-04-15 13:40:46 UTC (rev 109534)
+++ input_keybindings.patch 2014-04-15 14:34:01 UTC (rev 109535)
@@ -1,11 +0,0 @@
---- a/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
-@@ -119,6 +119,8 @@ KEYBINDINGS = [
- [_("Log out"), MEDIA_KEYS_SCHEMA, "logout", False, "system"],
- [_("Lock screen"), MEDIA_KEYS_SCHEMA, "screensaver", False, "system"],
- [_("Toggle recording desktop (must restart Cinnamon)"), MUFFIN_KEYBINDINGS_SCHEMA, "toggle-recording", True, "system"],
-+ [_("Switch to next source"), MEDIA_KEYS_SCHEMA, "switch-input-source", False, "system"],
-+ [_("Switch to previous source"), MEDIA_KEYS_SCHEMA, "switch-input-source-backward", False, "system"],
-
- # Launchers
- [_("Launch help browser"), MEDIA_KEYS_SCHEMA, "help", False, "launchers"],
Deleted: keyboard_applet.patch
===================================================================
--- keyboard_applet.patch 2014-04-15 13:40:46 UTC (rev 109534)
+++ keyboard_applet.patch 2014-04-15 14:34:01 UTC (rev 109535)
@@ -1,133 +0,0 @@
---- a/files/usr/share/cinnamon/applets/keyboard at cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/keyboard at cinnamon.org/applet.js
-@@ -1,9 +1,10 @@
- const Applet = imports.ui.applet;
--const Gkbd = imports.gi.Gkbd;
- const Lang = imports.lang;
--const Cinnamon = imports.gi.Cinnamon;
-+const Gio = imports.gi.Gio;
-+const GLib = imports.gi.GLib;
- const St = imports.gi.St;
- const Gtk = imports.gi.Gtk;
-+const CinnamonDesktop = imports.gi.CinnamonDesktop;
- const Main = imports.ui.main;
- const PopupMenu = imports.ui.popupMenu;
- const Util = imports.misc.util;
-@@ -16,11 +17,12 @@ function LayoutMenuItem() {
- LayoutMenuItem.prototype = {
- __proto__: PopupMenu.PopupBaseMenuItem.prototype,
-
-- _init: function(config, id, indicator, long_name) {
-+ _init: function(ipsettings, id, index, indicator, long_name) {
- PopupMenu.PopupBaseMenuItem.prototype._init.call(this);
-
-- this._config = config;
-+ this._ipsettings = ipsettings;
- this._id = id;
-+ this._index = index;
- this.label = new St.Label({ text: long_name });
- this.indicator = indicator;
- this.addActor(this.label);
-@@ -29,7 +31,7 @@ LayoutMenuItem.prototype = {
-
- activate: function(event) {
- PopupMenu.PopupBaseMenuItem.prototype.activate.call(this);
-- this._config.lock_group(this._id);
-+ this._ipsettings.set_value('current', GLib.Variant.new_uint32(this._index));
- }
- };
-
-@@ -62,18 +64,18 @@ MyApplet.prototype = {
- this._syncConfig,
- null);
-
-- this._config = Gkbd.Configuration.get();
-- this._config.connect('changed', Lang.bind(this, this._syncConfig));
-- this._config.connect('group-changed', Lang.bind(this, this._syncGroup));
-+ this._xkbInfo = new CinnamonDesktop.XkbInfo();
-+ this._ipsettings = new Gio.Settings({ schema: 'org.cinnamon.desktop.input-sources' });
-+ this._ipsettings.connect('changed::sources', Lang.bind(this, this._syncConfig));
-+ this._ipsettings.connect('changed::current', Lang.bind(this, this._syncGroup));
-
-- this._config.start_listen();
-
- this._syncConfig();
-
- this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
- this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, function() {
- Main.overview.hide();
-- Util.spawn(['gkbd-keyboard-display', '-g', String(this._config.get_current_group() + 1)]);
-+ Util.spawn(['gkbd-keyboard-display', '-l', this._selectedLayout._id]);
- }));
- this.menu.addAction(_("Show Character Table"), Lang.bind(this, function() {
- Main.overview.hide();
-@@ -113,8 +115,8 @@ MyApplet.prototype = {
- },
-
- _syncConfig: function() {
-- let groups = this._config.get_group_names();
-- if (groups.length > 1) {
-+ let sources = this._ipsettings.get_value('sources');
-+ if (sources.n_children() > 1) {
- this.actor.show();
- } else {
- this.menu.close();
-@@ -127,25 +129,30 @@ MyApplet.prototype = {
- for (let i = 0; i < this._labelActors.length; i++)
- this._labelActors[i].destroy();
-
-- let short_names = this._adjustGroupNames(this._config.get_short_group_names());
-
- this._selectedLayout = null;
- this._layoutItems = [ ];
- this._labelActors = [ ];
-- for (let i = 0; i < groups.length; i++) {
-- let icon_name = this._config.get_group_name(i);
-+ for (let i = 0; i < sources.n_children(); i++) {
-+ let [type, id] = sources.get_child_value(i).deep_unpack();
-+ let displayName = id;
-+ let shortName = id;
-+ let xkbLayout = id;
-+ if (type == 'xkb') {
-+ [_exists, displayName, shortName, xkbLayout, _xkbVariant] = this._xkbInfo.get_layout_info(id);
-+ } // TODO: errorhandling, handle 'ibus'
-+ let icon_name = xkbLayout; // FIXME: Really?
- let actor;
- 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] });
-- let item = new LayoutMenuItem(this._config, i, actor, groups[i]);
-- item._short_group_name = short_names[i];
-+ actor = new St.Label({ text: shortName });
-+ let item = new LayoutMenuItem(this._ipsettings, id, i, actor, displayName);
- item._icon_name = icon_name;
- this._layoutItems.push(item);
- this.menu.addMenuItem(item, i);
-
-- let shortLabel = new St.Label({ text: short_names[i] });
-+ let shortLabel = new St.Label({ text: shortName });
- this._labelActors.push(shortLabel);
- }
-
-@@ -153,17 +160,17 @@ MyApplet.prototype = {
- },
-
- _syncGroup: function() {
-- let selected = this._config.get_current_group();
-+ let current = this._ipsettings.get_uint('current');
-
- if (this._selectedLayout) {
- this._selectedLayout.setShowDot(false);
- this._selectedLayout = null;
- }
-
-- let item = this._layoutItems[selected];
-+ let item = this._layoutItems[current];
- item.setShowDot(true);
-
-- let selectedLabel = this._labelActors[selected];
-+ let selectedLabel = this._labelActors[current];
-
- if (this._showFlags) {
- this.set_applet_icon_name(item._icon_name);
Deleted: org.archlinux.pkexec.cinnamon-settings-users.policy
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list