[arch-commits] Commit in cinnamon/trunk (3 files)
Alexandre Filgueira
faidoc at archlinux.org
Mon Nov 7 23:04:27 UTC 2016
Date: Monday, November 7, 2016 @ 23:04:26
Author: faidoc
Revision: 195103
upgpkg: cinnamon 3.2.0-1
Modified:
cinnamon/trunk/PKGBUILD
Deleted:
cinnamon/trunk/0001-Remove-dependency-on-GConf.patch
cinnamon/trunk/0001-removable-drives-applet-don-t-hardcode-Nemo.patch
--------------------------------------------------------+
0001-Remove-dependency-on-GConf.patch | 118 ---------------
0001-removable-drives-applet-don-t-hardcode-Nemo.patch | 39 ----
PKGBUILD | 20 --
3 files changed, 5 insertions(+), 172 deletions(-)
Deleted: 0001-Remove-dependency-on-GConf.patch
===================================================================
--- 0001-Remove-dependency-on-GConf.patch 2016-11-07 23:03:37 UTC (rev 195102)
+++ 0001-Remove-dependency-on-GConf.patch 2016-11-07 23:04:26 UTC (rev 195103)
@@ -1,118 +0,0 @@
-From a4da077b8098e000b7791f1de6d59102c0f4ab68 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Sat, 15 Oct 2016 13:08:41 +0200
-Subject: [PATCH] Remove dependency on GConf
-
-It was used only in a11y applet to get /apps/metacity/general/visual_bell config. But metacity don't use this config a long time ago.
----
- configure.ac | 2 +-
- debian/control | 3 ---
- .../cinnamon/applets/a11y at cinnamon.org/applet.js | 23 ----------------------
- 3 files changed, 1 insertion(+), 27 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 147e108..db9e9d2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -75,7 +75,7 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
- gtk+-3.0 >= $GTK_MIN_VERSION
- libmuffin >= $MUFFIN_MIN_VERSION
- cjs-internals-1.0 >= $GJS_MIN_VERSION
-- libcinnamon-menu-3.0 $recorder_modules gconf-2.0
-+ libcinnamon-menu-3.0 $recorder_modules
- gdk-x11-3.0 libsoup-2.4 gl
- clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
- libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
-diff --git a/debian/control b/debian/control
-index 71df6c1..a4f0761 100644
---- a/debian/control
-+++ b/debian/control
-@@ -18,7 +18,6 @@ Build-Depends: debhelper (>= 9),
- libcaribou-dev,
- libcroco3-dev (>= 0.6.2),
- libdbus-glib-1-dev,
-- libgconf2-dev,
- libgirepository1.0-dev (>= 0.9.2),
- libglib2.0-dev (>= 2.37.3),
- libgnome-bluetooth-dev (>= 3.1.0),
-@@ -68,7 +67,6 @@ Depends: cinnamon-common (= ${source:Version}),
- gnome-icon-theme-symbolic (>= 2.91),
- ${icon-theme:Depends},
- gir1.2-accountsservice-1.0,
-- gir1.2-gconf-2.0,
- gir1.2-gkbd-3.0,
- gir1.2-gnomebluetooth-1.0,
- gir1.2-keybinder-3.0,
-@@ -91,7 +89,6 @@ Depends: cinnamon-common (= ${source:Version}),
- python3-dbus,
- python,
- python-dbus,
-- python-gconf,
- python-imaging,
- python-gi-cairo,
- python-gtk2,
-diff --git a/files/usr/share/cinnamon/applets/a11y at cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/a11y at cinnamon.org/applet.js
-index c92a73a..9392fbc 100644
---- a/files/usr/share/cinnamon/applets/a11y at cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/a11y at cinnamon.org/applet.js
-@@ -2,7 +2,6 @@ const PopupMenu = imports.ui.popupMenu;
- const Gio = imports.gi.Gio;
- const Lang = imports.lang;
- const Applet = imports.ui.applet;
--const GConf = imports.gi.GConf;
- const Main = imports.ui.main;
- const Gdk = imports.gi.Gdk;
-
-@@ -21,9 +20,6 @@ const DPI_FACTOR_LARGE = 1.25;
- const DPI_FACTOR_LARGER = 1.5;
- const DPI_FACTOR_LARGEST = 2.0;
-
--const KEY_META_DIR = '/apps/metacity/general';
--const KEY_VISUAL_BELL = KEY_META_DIR + '/visual_bell';
--
- const DESKTOP_INTERFACE_SCHEMA = 'org.cinnamon.desktop.interface';
- const KEY_GTK_THEME = 'gtk-theme';
- const KEY_ICON_THEME = 'icon-theme';
-@@ -54,9 +50,6 @@ MyApplet.prototype = {
- this.menu = new Applet.AppletPopupMenu(this, orientation);
- this.menuManager.addMenu(this.menu);
-
-- let client = GConf.Client.get_default();
-- client.add_dir(KEY_META_DIR, GConf.ClientPreloadType.PRELOAD_ONELEVEL, null);
--
- let highContrast = this._buildHCItem();
- this.menu.addMenuItem(highContrast);
-
-@@ -75,9 +68,6 @@ MyApplet.prototype = {
- 'screen-keyboard-enabled');
- this.menu.addMenuItem(screenKeyboard);
-
-- let visualBell = this._buildItemGConf(_("Visual Alerts"), client, KEY_VISUAL_BELL);
-- this.menu.addMenuItem(visualBell);
--
- let stickyKeys = this._buildItem(_("Sticky Keys"), A11Y_SCHEMA, KEY_STICKY_KEYS_ENABLED);
- this.menu.addMenuItem(stickyKeys);
-
-@@ -152,19 +142,6 @@ MyApplet.prototype = {
- return widget;
- },
-
-- _buildItemGConf: function(string, client, key) {
-- function on_get() {
-- return client.get_bool(key);
-- }
-- let widget = this._buildItemExtended(string,
-- client.get_bool(key),
-- client.key_is_writable(key),
-- function(enabled) {
-- client.set_bool(key, enabled);
-- });
-- return widget;
-- },
--
- _buildItem: function(string, schema, key) {
- let settings = new Gio.Settings({ schema_id: schema });
- let widget = this._buildItemExtended(string,
---
-2.10.0
-
Deleted: 0001-removable-drives-applet-don-t-hardcode-Nemo.patch
===================================================================
--- 0001-removable-drives-applet-don-t-hardcode-Nemo.patch 2016-11-07 23:03:37 UTC (rev 195102)
+++ 0001-removable-drives-applet-don-t-hardcode-Nemo.patch 2016-11-07 23:04:26 UTC (rev 195103)
@@ -1,39 +0,0 @@
-From bbfec76b2e914df74c1ccf1a59d9a95df0294846 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Wed, 14 Sep 2016 14:21:34 +0200
-Subject: [PATCH] removable-drives applet: don't hardcode Nemo
-
-Use Gio to open the default file manager at home dir.
----
- .../cinnamon/applets/removable-drives at cinnamon.org/applet.js | 9 +++++----
- 1 file changed, 5 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..b61445c 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,7 @@
- const Lang = imports.lang;
- const St = imports.gi.St;
--const Cinnamon = imports.gi.Cinnamon;
-+const GLib = imports.gi.GLib;
-+const Gio = imports.gi.Gio;
- const Applet = imports.ui.applet;
- const Main = imports.ui.main;
- const PopupMenu = imports.ui.popupMenu;
-@@ -63,9 +64,9 @@ 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());
-+ let homeFile = Gio.file_new_for_path(GLib.get_home_dir());
-+ let homeUri = homeFile.get_uri();
-+ Gio.app_info_launch_default_for_uri(homeUri, null);
- });
-
- Main.placesManager.connect('mounts-updated', Lang.bind(this, this._update));
---
-2.10.0
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-11-07 23:03:37 UTC (rev 195102)
+++ PKGBUILD 2016-11-07 23:04:26 UTC (rev 195103)
@@ -5,8 +5,8 @@
# Contributor: CReimer
pkgname=cinnamon
-pkgver=3.0.7
-pkgrel=2
+pkgver=3.2.0
+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"
@@ -24,14 +24,10 @@
options=('!emptydirs')
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
"set_wheel.patch"
- "default-theme.patch"
- "0001-removable-drives-applet-don-t-hardcode-Nemo.patch"
- "0001-Remove-dependency-on-GConf.patch")
-sha256sums=('0aa0ce174a4638f54ddb2f0dc1f93a847678fa225c7a4fae718ffd14f1c8694f'
+ "default-theme.patch")
+sha256sums=('c1473aabb01329c07bf1e28148cb410255700f4dd237195b7790e9bcdb69b89d'
'97542a424fa83c18c8c8a6d27c089129f30b6fb4cc128c662ac0da3aebf42dcc'
- '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5'
- '3c686ba7f180c24c845cd29ffaf431d5d0d64aa71992353ed2304b8e2a962b43'
- 'dc7e976c2868cde6c69e36516da50d985de028738c78d10017507bb1867c99ba')
+ '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5')
prepare() {
cd ${srcdir}/Cinnamon*
@@ -46,12 +42,6 @@
# Set default theme to 'cinnamon'
patch -Np1 -i ../default-theme.patch
- # removable-drives applet: don't hardcode Nemo
- patch -Np1 -i ../0001-removable-drives-applet-don-t-hardcode-Nemo.patch
-
- # Remove dependency on GConf
- patch -Np1 -i ../0001-Remove-dependency-on-GConf.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
More information about the arch-commits
mailing list