summaryrefslogtreecommitdiff
path: root/extra/gnome-shell
diff options
context:
space:
mode:
Diffstat (limited to 'extra/gnome-shell')
-rw-r--r--extra/gnome-shell/PKGBUILD29
-rw-r--r--extra/gnome-shell/bluetoothstatus-always-update-devices.patch132
-rw-r--r--extra/gnome-shell/shell-recorder-missing-XFree.patch22
3 files changed, 164 insertions, 19 deletions
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 34974115f..0c005f56e 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 123600 2011-05-11 18:16:09Z ibiru $
+# $Id: PKGBUILD 125332 2011-05-25 22:41:23Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Flamelab <panosfilip@gmail.com
pkgname=gnome-shell
-pkgver=3.0.1
-pkgrel=5
+pkgver=3.0.2
+pkgrel=1
pkgdesc="The next generation GNOME Shell"
arch=('i686' 'x86_64')
url="http://live.gnome.org/GnomeShell"
@@ -19,28 +19,19 @@ install=gnome-shell.install
groups=(gnome)
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
arch.patch
- network_fixes_up_to_5090a4ccce.patch
- shell-xfixes-cursor_missing_free.patch
- st-private_fix_memory_leak.patch
- st-private_correct_fix_memory_leak.patch
- 0001-Don-t-crash-when-removing-nameless-user.patch)
-sha256sums=('01f7ae942ba9687a5e67d62423843ed404d77b35f74acc212a5f391beed8e079'
+ bluetoothstatus-always-update-devices.patch
+ shell-recorder-missing-XFree.patch)
+sha256sums=('a44963877da895d9b9f1ea98617067c5e88a5c4b414c6ccf0fcbfacdeac7db95'
'a35d5e5f9f781728070aecae3bfe329f49dadcd50ca2984e0fbdd2219825a0db'
- '01bf41483d5d8935ed2dd6294ee04024f2d9bcb2ef13276b07331e485965c822'
- 'c8b92768c869d0d77595da3466cc0dba3b6f067ea5fac048f32a918bbe98bbf6'
- '8b80a0cec39c38a47521183a3030a782ab84bb6ea5e9cc58213589245288e718'
- 'c676067fff399a87625187381db5331d82c44f6c14f51d409392851dbbeb5074'
- '291d1fa51344325e3dabc0c1287750cde98605c30f079ffad9b3523a3aba860d')
+ 'f592752875085fceebdb27e65802e09c07edd7be57eec0da3edfcad5052be2ae'
+ '070edd5e720c063be41c158f39b7ef62a0d4a7f547ca0d23216104d5428ff971')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/arch.patch"
- patch -Np1 -i "${srcdir}/network_fixes_up_to_5090a4ccce.patch"
- patch -Np1 -i "${srcdir}/shell-xfixes-cursor_missing_free.patch"
- patch -Np1 -i "${srcdir}/st-private_fix_memory_leak.patch"
- patch -Np1 -i "${srcdir}/st-private_correct_fix_memory_leak.patch"
- patch -Np1 -i "${srcdir}/0001-Don-t-crash-when-removing-nameless-user.patch"
+ patch -Np1 -i "${srcdir}/bluetoothstatus-always-update-devices.patch"
+ patch -Np1 -i "${srcdir}/shell-recorder-missing-XFree.patch"
./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/gnome-shell \
diff --git a/extra/gnome-shell/bluetoothstatus-always-update-devices.patch b/extra/gnome-shell/bluetoothstatus-always-update-devices.patch
new file mode 100644
index 000000000..0272169f5
--- /dev/null
+++ b/extra/gnome-shell/bluetoothstatus-always-update-devices.patch
@@ -0,0 +1,132 @@
+From 76fce94b66be7bdebbedcc3bce62898da51da15a Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Wed, 13 Apr 2011 17:08:45 +0000
+Subject: BluetoothStatus: always update devices
+
+Previously, we skipped rebuilding device items in case the device
+had already been seen, but this caused the connected switch not to
+be updated. Now it has been refactored to update in case the device
+changes, and to create only when the device is completely new.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=647565
+---
+diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
+index 070016a..cee2f90 100644
+--- a/js/ui/status/bluetooth.js
++++ b/js/ui/status/bluetooth.js
+@@ -127,13 +127,6 @@ Indicator.prototype = {
+ }
+ },
+
+- _deviceCompare: function(d1, d2) {
+- return d1.device_path == d2.device_path &&
+- d1.bdaddr == d2.bdaddr &&
+- d1.can_connect == d2.can_connect &&
+- d1.capabilities == d2.capabilities;
+- },
+-
+ _updateDevices: function() {
+ let devices = this._applet.get_devices();
+
+@@ -142,12 +135,8 @@ Indicator.prototype = {
+ let item = this._deviceItems[i];
+ let destroy = true;
+ for (let j = 0; j < devices.length; j++) {
+- // we need to deep compare because BluetoothSimpleDevice is a boxed type
+- // (but we take advantage of that, because _skip will disappear the next
+- // time get_devices() is called)
+- if (this._deviceCompare(item._device, devices[j])) {
+- item.label.text = devices[j].alias;
+- devices[j]._skip = true;
++ if (item._device.device_path == devices[j].device_path) {
++ this._updateDeviceItem(item, devices[j]);
+ destroy = false;
+ break;
+ }
+@@ -162,7 +151,7 @@ Indicator.prototype = {
+ this._hasDevices = newlist.length > 0;
+ for (let i = 0; i < devices.length; i++) {
+ let d = devices[i];
+- if (d._skip)
++ if (d._item)
+ continue;
+ let item = this._createDeviceItem(d);
+ if (item) {
+@@ -177,17 +166,55 @@ Indicator.prototype = {
+ this._deviceSep.actor.hide();
+ },
+
++ _updateDeviceItem: function(item, device) {
++ if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) {
++ item.destroy();
++ return;
++ }
++
++ let prevDevice = item._device;
++ let prevCapabilities = prevDevice.capabilities;
++ let prevCanConnect = prevDevice.can_connect;
++
++ // adopt the new device object
++ item._device = device;
++ device._item = item;
++
++ // update properties
++ item.label.text = device.alias;
++
++ if (prevCapabilities != device.capabilities ||
++ prevCanConnect != device.can_connect) {
++ // need to rebuild the submenu
++ item.menu.removeAll();
++ this._buildDeviceSubMenu(item, device);
++ }
++
++ // update connected property
++ if (device.can_connect)
++ item._connectedMenuitem.setToggleState(device.connected);
++ },
++
+ _createDeviceItem: function(device) {
+ if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE)
+ return null;
+ let item = new PopupMenu.PopupSubMenuMenuItem(device.alias);
++
++ // adopt the device object, and add a back link
+ item._device = device;
++ device._item = item;
+
++ this._buildDeviceSubMenu(item, device);
++
++ return item;
++ },
++
++ _buildDeviceSubMenu: function(item, device) {
+ if (device.can_connect) {
+ item._connected = device.connected;
+- let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
++ item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
+
+- menuitem.connect('toggled', Lang.bind(this, function() {
++ item._connectedMenuitem.connect('toggled', Lang.bind(this, function() {
+ if (item._connected > ConnectionState.CONNECTED) {
+ // operation already in progress, revert
+ menuitem.setToggleState(menuitem.state);
+@@ -217,7 +244,7 @@ Indicator.prototype = {
+ }
+ }));
+
+- item.menu.addMenuItem(menuitem);
++ item.menu.addMenuItem(item._connectedMenuitem);
+ }
+
+ if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) {
+@@ -263,8 +290,6 @@ Indicator.prototype = {
+ default:
+ break;
+ }
+-
+- return item;
+ },
+
+ _updateFullMenu: function() {
+--
+cgit v0.9
diff --git a/extra/gnome-shell/shell-recorder-missing-XFree.patch b/extra/gnome-shell/shell-recorder-missing-XFree.patch
new file mode 100644
index 000000000..a7329166f
--- /dev/null
+++ b/extra/gnome-shell/shell-recorder-missing-XFree.patch
@@ -0,0 +1,22 @@
+From 88df18345069c295e68d319606a11b7727b2bd4b Mon Sep 17 00:00:00 2001
+From: Maxim Ermilov <zaspire@rambler.ru>
+Date: Tue, 24 May 2011 22:46:47 +0000
+Subject: shell-recorder: missing XFree
+
+https://bugzilla.gnome.org/show_bug.cgi?id=650934
+---
+diff --git a/src/shell-recorder.c b/src/shell-recorder.c
+index 6555187..d297923 100644
+--- a/src/shell-recorder.c
++++ b/src/shell-recorder.c
+@@ -412,6 +412,8 @@ recorder_fetch_cursor_image (ShellRecorder *recorder)
+ *(guint32 *)(data + i * stride + 4 * j) = cursor_image->pixels[i * cursor_image->width + j];
+
+ cairo_surface_mark_dirty (recorder->cursor_image);
++
++ XFree (cursor_image);
+ }
+
+ /* Overlay the cursor image on the frame. We draw the cursor image
+--
+cgit v0.9
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-25 23:07:15 +0000