[arch-commits] Commit in cinnamon/trunk (PKGBUILD gnome-3.8.patch)
Alexandre Filgueira
faidoc at nymeria.archlinux.org
Thu May 23 14:47:07 UTC 2013
Date: Thursday, May 23, 2013 @ 16:47:07
Author: faidoc
Revision: 91550
upgpkg: cinnamon 1.8.5-1
Modified:
cinnamon/trunk/PKGBUILD
cinnamon/trunk/gnome-3.8.patch
-----------------+
PKGBUILD | 9 ++++---
gnome-3.8.patch | 63 ++++++++++++++++++++++++++++--------------------------
2 files changed, 38 insertions(+), 34 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-23 14:44:31 UTC (rev 91549)
+++ PKGBUILD 2013-05-23 14:47:07 UTC (rev 91550)
@@ -5,8 +5,8 @@
# Contributor: CReimer
pkgname=cinnamon
-pkgver=1.8.2
-pkgrel=2
+pkgver=1.8.5
+pkgrel=1
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,15 @@
"switch-applications.patch"
"fallback-helpers.patch"
"idle-dim.patch")
-sha256sums=('83179f98f9e6c88928146d43a9d3f581c64706c0a60dac5e58d845a30a275a91'
+sha256sums=('0777540af35b456e795e4fb56f856bf256ff7f873187b7c586a0ed12d2859f57'
'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30'
'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426'
- '9a091c0b651a5af1700c8eca90b9e81bb9a50a8a9bfa6a7352d0c0daa2f3f271'
+ '01508c4f41664d5e29f700dc77c9f5c5441f128ab759f0ae8325c5fdda70b00e'
'921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262'
'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e'
'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100')
+
build() {
cd ${srcdir}/linuxmint-Cinnamon*
Modified: gnome-3.8.patch
===================================================================
--- gnome-3.8.patch 2013-05-23 14:44:31 UTC (rev 91549)
+++ gnome-3.8.patch 2013-05-23 14:47:07 UTC (rev 91550)
@@ -1404,7 +1404,9 @@
this._trackInfosTop.set_child(this.infos_top);
this._trackInfosBottom.set_child(this.infos_bottom);
-@@ -414,90 +256,39 @@ Player.prototype = {
+--- a/files/usr/share/cinnamon/applets/sound at cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/sound at cinnamon.org/applet.js
+@@ -414,45 +414,20 @@
this._trackControls.set_child(this.controls);
this.addActor(this._trackControls);
@@ -1463,14 +1465,8 @@
+ }
/* this players don't support seek */
-- if (support_seek.indexOf(this._name) == -1) {
-+ if (support_seek.indexOf(this._name) == -1)
- this._time.hide();
-- this.showPosition = false;
-- this._positionSlider.hide();
-- }
- this._getStatus();
- this._trackId = {};
+ if (support_seek.indexOf(this._name) == -1) {
+@@ -465,39 +440,23 @@
this._getMetadata();
this._currentTime = 0;
this._getPosition();
@@ -1486,14 +1482,17 @@
- this._setMetadata(iface, value["Metadata"]);
- //qmmp
- if(sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') {
-- if (value["playbackStatus"])
++ this._setMetadata(value["Metadata"]);
++ // qmmp
++ if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') {
+ if (value["playbackStatus"])
- this._setStatus(iface, value["playbackStatus"]);
-- if (value["metadata"])
++ this._setStatus(value["playbackStatus"]);
+ if (value["metadata"])
- this._setMetadata(sender, value["metadata"]);
- }
-+ this._setMetadata(value["Metadata"]);
- }));
-
+- }));
+-
- this._mediaServerPlayer.connect('Seeked', Lang.bind(this, function(sender, value) {
- if (value > 0) {
- this._setPosition(value);
@@ -1504,17 +1503,20 @@
- // when the track is seeked so we set the position at the
- // value we set on the slider
- this._setPosition(this._wantedSeekValue);
-- }
++ this._setMetadata(value["metadata"]);
+ }
- // Seek value send by the player
- else
- this._setPosition(value);
--
++ }));
+
- this._wantedSeekValue = 0;
+ this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) {
+ this._setPosition(sender, value);
}));
Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition));
+
@@ -512,45 +303,26 @@ Player.prototype = {
this._playerInfo.setText(this._getName() + " - " + _(status));
},
@@ -3923,20 +3925,7 @@
/* dummy vars for translation */
let x = _("Playing");
x = _("Paused");
-@@ -285,6 +285,13 @@ Player.prototype = {
- this._setStatus(value["PlaybackStatus"]);
- if (value["Metadata"])
- this._setMetadata(value["Metadata"]);
-+ // qmmp
-+ if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') {
-+ if (value["playbackStatus"])
-+ this._setStatus(value["playbackStatus"]);
-+ if (value["metadata"])
-+ this._setMetadata(value["metadata"]);
-+ }
- }));
-
- this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) {
+
@@ -377,7 +384,8 @@ Player.prototype = {
cover.read_async(null, null, Lang.bind(this, this._onReadCover));
}
@@ -4181,3 +4170,17 @@
static void
--
1.8.1.6
+
+--- a/files/usr/share/cinnamon/applets/sound at cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/sound at cinnamon.org/applet.js
+@@ -801,7 +801,7 @@
+ this._players = {};
+ // watch players
+ for (var p=0; p<compatible_players.length; p++) {
+- DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], false,
++ Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE,
+ Lang.bind(this, this._addPlayer),
+ Lang.bind(this, this._removePlayer)
+ );
+--
+1.8.1.6
\ No newline at end of file
More information about the arch-commits
mailing list