[arch-commits] Commit in cinnamon/trunk (4 files)
Balló György
bgyorgy at nymeria.archlinux.org
Wed Aug 14 19:29:30 UTC 2013
Date: Wednesday, August 14, 2013 @ 21:29:30
Author: bgyorgy
Revision: 95584
upgpkg: cinnamon 1.8.8-3
* Fix missing backgrounds
* Remove "Browse Files..." option as it's gone from gnome-bluetooth 3.8
* Disable MPRIS support (workaround for FS#35282)
* Remove leftover files after patching
* Prefix 'System Settings' with 'Cinnamon' to avoid confusion with
gnome-control-center
Added:
cinnamon/trunk/background.patch
cinnamon/trunk/bluetooth_obex_transfer.patch
cinnamon/trunk/disable-mpris-support.patch
Modified:
cinnamon/trunk/PKGBUILD
-------------------------------+
PKGBUILD | 27 ++++++++++++++++++++++++---
background.patch | 16 ++++++++++++++++
bluetooth_obex_transfer.patch | 25 +++++++++++++++++++++++++
disable-mpris-support.patch | 17 +++++++++++++++++
4 files changed, 82 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-08-14 16:11:46 UTC (rev 95583)
+++ PKGBUILD 2013-08-14 19:29:30 UTC (rev 95584)
@@ -6,7 +6,7 @@
pkgname=cinnamon
pkgver=1.8.8
-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/"
@@ -31,14 +31,20 @@
"gnome-3.8.patch"
"switch-applications.patch"
"fallback-helpers.patch"
- "idle-dim.patch")
+ "idle-dim.patch"
+ "background.patch"
+ "bluetooth_obex_transfer.patch"
+ "disable-mpris-support.patch")
sha256sums=('1bce982e6333e7bd27a1df9f37eb9139360c2fef667c7a998a79f216d4a0921d'
'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30'
'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426'
'01508c4f41664d5e29f700dc77c9f5c5441f128ab759f0ae8325c5fdda70b00e'
'921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262'
'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e'
- 'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100')
+ 'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100'
+ '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f'
+ '4497f3e0a97c364845d8a3a3b3b75e7dc9d475dc39f56b2106f8c4b9e5111ac2'
+ 'f1eb8110718434e1dc2cf0a308757a787390382dfccd1c8cc80488b93cf6a9f7')
build() {
cd ${srcdir}/Cinnamon*
@@ -68,6 +74,15 @@
# Fix brightness applet for GNOME 3.8
patch -Np1 -i ../idle-dim.patch
+ # Fix missing backgrounds
+ patch -Np1 -i ../background.patch
+
+ # Remove "Browse Files..." option as it's gone from gnome-bluetooth 3.8
+ patch -Np1 -i ../bluetooth_obex_transfer.patch
+
+ # Disable MPRIS support (workaround for FS#35282)
+ patch -Np1 -i ../disable-mpris-support.patch
+
./autogen.sh --prefix=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/lib/cinnamon \
@@ -82,4 +97,10 @@
package() {
cd ${srcdir}/Cinnamon*
make DESTDIR="${pkgdir}" install
+
+ # Remove leftover files after patching
+ find "$pkgdir" -type f -name *.orig | xargs rm
+
+ # Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center
+ sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' "$pkgdir/usr/share/applications/cinnamon-settings.desktop"
}
Added: background.patch
===================================================================
--- background.patch (rev 0)
+++ background.patch 2013-08-14 19:29:30 UTC (rev 95584)
@@ -0,0 +1,16 @@
+--- a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
++++ b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
+@@ -334,10 +334,9 @@ class BackgroundWallpaperPane (Gtk.VBox)
+
+ def update_icon_view(self):
+ pictures_list = []
+- if os.path.exists("/usr/share/cinnamon-background-properties"):
+- for i in os.listdir("/usr/share/cinnamon-background-properties"):
+- if i.endswith(".xml"):
+- pictures_list += self.parse_xml_backgrounds_list(os.path.join("/usr/share/cinnamon-background-properties", i))
++ for i in os.listdir("/usr/share/gnome-background-properties"):
++ if i.endswith(".xml"):
++ pictures_list += self.parse_xml_backgrounds_list(os.path.join("/usr/share/gnome-background-properties", i))
+
+ path = os.path.join(os.getenv("HOME"), ".cinnamon", "backgrounds")
+ if os.path.exists(path):
Added: bluetooth_obex_transfer.patch
===================================================================
--- bluetooth_obex_transfer.patch (rev 0)
+++ bluetooth_obex_transfer.patch 2013-08-14 19:29:30 UTC (rev 95584)
@@ -0,0 +1,25 @@
+--- a/files/usr/share/cinnamon/applets/bluetooth at cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/bluetooth at cinnamon.org/applet.js
+@@ -455,22 +455,6 @@ MyApplet.prototype = {
+ this._applet.send_to_address(device.bdaddr, device.alias);
+ }));
+ }
+- if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_FILE_TRANSFER) {
+- item.menu.addAction(_("Browse Files..."), Lang.bind(this, function(event) {
+- this._applet.browse_address(device.bdaddr, event.get_time(),
+- Lang.bind(this, function(applet, result) {
+- try {
+- applet.browse_address_finish(result);
+- } catch (e) {
+- this._ensureSource();
+- this._source.notify(new MessageTray.Notification(this._source,
+- _("Bluetooth"),
+- _("Error browsing device"),
+- { body: _("The requested device cannot be browsed, error is '%s'").format(e) }));
+- }
+- }));
+- }));
+- }
+
+ switch (device.type) {
+ case GnomeBluetoothApplet.Type.KEYBOARD:
Added: disable-mpris-support.patch
===================================================================
--- disable-mpris-support.patch (rev 0)
+++ disable-mpris-support.patch 2013-08-14 19:29:30 UTC (rev 95584)
@@ -0,0 +1,17 @@
+diff -Naur Cinnamon-1.8.8.orig/files/usr/share/cinnamon/applets/sound at cinnamon.org/applet.js Cinnamon-1.8.8/files/usr/share/cinnamon/applets/sound at cinnamon.org/applet.js
+--- Cinnamon-1.8.8.orig/files/usr/share/cinnamon/applets/sound at cinnamon.org/applet.js 2013-08-14 16:44:19.955273614 +0000
++++ Cinnamon-1.8.8/files/usr/share/cinnamon/applets/sound at cinnamon.org/applet.js 2013-08-14 16:46:34.171029992 +0000
+@@ -600,13 +600,6 @@
+
+ // menu not showed by default
+ this._players = {};
+- // watch players
+- for (var p=0; p<compatible_players.length; p++) {
+- Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE,
+- Lang.bind(this, this._addPlayer),
+- Lang.bind(this, this._removePlayer)
+- );
+- }
+
+ this._control = new Gvc.MixerControl({ name: 'Cinnamon Volume Control' });
+ this._control.connect('state-changed', Lang.bind(this, this._onControlStateChanged));
More information about the arch-commits
mailing list