teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnome-shell: update to 3.10.0.1.

This commit is contained in:
Juan RP 2013-09-26 22:31:44 +02:00
parent 5b6bbd3fe8
commit 3a9e0d4593
3 changed files with 19 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/shlibs
View File

@ -738,11 +738,10 @@ libtelepathy-glib.so.0 telepathy-glib-0.15.5_1
libgedit-private.so.0 gedit-2.91.7_1
libaccountsservice.so.0 accountsservice-0.6.4_1
libgee.so.2 libgee-0.6.1_1
libfolks.so.25 folks-0.6.3.2_1
libfolks-telepathy.so.25 folks-0.6.3.2_1
libfolks-libsocialweb.so.25 folks-0.6.3.2_1
libfolks-eds.so.25 folks-0.6.3.2_1
libfolks-tracker.so.25 folks-0.7.4.1_1
libfolks.so.25 folks-0.9.5_1
libfolks-telepathy.so.25 folks-0.9.5_1
libfolks-eds.so.25 folks-0.9.5_1
libfolks-tracker.so.25 folks-0.9.5_1
libnice.so.10 libnice-0.1.0_1
libgupnp-igd-1.0.so.4 gupnp-igd-0.2.0_1
libtelepathy-logger.so.2 telepathy-logger-0.2.12_1
@ -1098,6 +1097,7 @@ libgnomekbd.so.8 libgnomekbd-3.6.0_1
libgnomekbdui.so.8 libgnomekbd-3.6.0_1
libibus-1.0.so.5 ibus-1.4.99.20120917_1
libgnome-bluetooth.so.11 gnome-bluetooth-3.6.0_1
libgnome-bluetooth-applet.so.0 gnome-bluetooth-3.10.0_1
libxapian.so.22 libxapian-1.2.12_1
libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1
libcolord-gtk.so.1 colord-gtk-0.1.23_1

126
srcpkgs/gnome-shell/patches/0001-Revert-background-fix-asynchronous-management-of-bac.patch
View File

@ -1,126 +0,0 @@
From 616e53679be1a412d5ce1add65f12c2129752fd4 Mon Sep 17 00:00:00 2001
From: Adel Gadllah <adel.gadllah@gmail.com>
Date: Thu, 15 Aug 2013 21:51:46 +0200
Subject: [PATCH] Revert "background: fix asynchronous management of background
loading operations"
This reverts commit 1020d8a0f8523a04d8336b1348388b8b242e414f.
---
js/ui/background.js | 69 +++++++++++++++++++----------------------------------
1 file changed, 25 insertions(+), 44 deletions(-)
diff --git a/js/ui/background.js b/js/ui/background.js
index 13343c6..1d9ab7c 100644
--- js/ui/background.js
+++ js/ui/background.js
@@ -142,40 +142,33 @@ const BackgroundCache = new Lang.Class({
cancellable: null,
onFinished: null });
- let fileLoad = { filename: params.filename,
- style: params.style,
- shouldCopy: false,
- monitorIndex: params.monitorIndex,
- effects: params.effects,
- onFinished: params.onFinished,
- cancellable: new Gio.Cancellable(), };
- this._pendingFileLoads.push(fileLoad);
-
- if (params.cancellable) {
- params.cancellable.connect(Lang.bind(this, function(c) {
- fileLoad.cancellable.cancel();
- }));
+ for (let i = 0; i < this._pendingFileLoads.length; i++) {
+ if (this._pendingFileLoads[i].filename == params.filename &&
+ this._pendingFileLoads[i].style == params.style) {
+ this._pendingFileLoads[i].callers.push({ shouldCopy: true,
+ monitorIndex: params.monitorIndex,
+ effects: params.effects,
+ onFinished: params.onFinished });
+ return;
+ }
}
+ this._pendingFileLoads.push({ filename: params.filename,
+ style: params.style,
+ callers: [{ shouldCopy: false,
+ monitorIndex: params.monitorIndex,
+ effects: params.effects,
+ onFinished: params.onFinished }] });
+
let content = new Meta.Background({ meta_screen: global.screen,
monitor: params.monitorIndex,
effects: params.effects });
content.load_file_async(params.filename,
params.style,
- fileLoad.cancellable,
+ params.cancellable,
Lang.bind(this,
function(object, result) {
- if (fileLoad.cancellable.is_cancelled()) {
- if (params.cancellable && params.cancellable.is_cancelled()) {
- if (params.onFinished)
- params.onFinished(null);
- this._removePendingFileLoad(fileLoad);
- return;
- }
- return;
- }
-
try {
content.load_file_finish(result);
@@ -185,25 +178,22 @@ const BackgroundCache = new Lang.Class({
content = null;
}
- let needsCopy = false;
for (let i = 0; i < this._pendingFileLoads.length; i++) {
let pendingLoad = this._pendingFileLoads[i];
if (pendingLoad.filename != params.filename ||
pendingLoad.style != params.style)
continue;
- if (pendingLoad.cancellable.is_cancelled())
- continue;
+ for (let j = 0; j < pendingLoad.callers.length; j++) {
+ if (pendingLoad.callers[j].onFinished) {
+ if (content && pendingLoad.callers[j].shouldCopy) {
+ content = object.copy(pendingLoad.callers[j].monitorIndex,
+ pendingLoad.callers[j].effects);
- pendingLoad.cancellable.cancel();
- if (pendingLoad.onFinished) {
- if (content && needsCopy) {
- content = object.copy(pendingLoad.monitorIndex,
- pendingLoad.effects);
- }
+ }
- needsCopy = true;
- pendingLoad.onFinished(content);
+ pendingLoad.callers[j].onFinished(content);
+ }
}
this._pendingFileLoads.splice(i, 1);
@@ -211,15 +201,6 @@ const BackgroundCache = new Lang.Class({
}));
},
- _removePendingFileLoad: function(fileLoad) {
- for (let i = 0; i < this._pendingFileLoads.length; i++) {
- if (this._pendingFileLoads[i].cancellable == fileLoad.cancellable) {
- this._pendingFileLoads.splice(i, 1);
- break;
- }
- }
- },
-
getImageContent: function(params) {
params = Params.parse(params, { monitorIndex: 0,
style: null,
--
1.8.3.1

26
srcpkgs/gnome-shell/template
View File

@ -1,30 +1,32 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
version=3.8.4
revision=2
version=3.10.0.1
revision=1
build_style=gnu-configure
configure_args="--disable-schemas-compile --with-systemd"
hostmakedepends="pkg-config intltool gnome-doc-utils gobject-introspection"
makedepends="json-glib-devel>=0.14.0 startup-notification-devel network-manager-applet-devel
folks-devel gnome-menus-devel>=3.8 gnome-desktop-devel>=3.8
clutter-devel>=1.14 gnome-bluetooth-devel>=3.8 mutter-devel>=${version}
gjs-devel telepathy-logger-devel libcanberra-devel polkit-devel libcroco-devel
pulseaudio-devel libgudev-devel gst-plugins-base1-devel systemd-devel
caribou-devel>=0.4.10_2 gir-freedesktop gnome-control-center>=3.8"
makedepends="
evolution-data-server>=3.10 gnome-desktop-devel>=3.10
json-glib-devel>=0.16.2 startup-notification-devel network-manager-applet-devel
clutter-devel>=1.16 gnome-bluetooth-devel>=3.10 mutter-devel>=${version}
gjs-devel>=1.38 telepathy-logger-devel libcanberra-devel polkit-devel libcroco-devel
pulseaudio-devel libgudev-devel gst-plugins-base1-devel>=1:1.2 systemd-devel
caribou-devel>=0.4.12 gir-freedesktop gnome-control-center-devel>=3.10
folks-devel>=0.9.5 gnome-menus-devel>=3.8"
short_desc="GNOME core user interface"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://live.gnome.org/GnomeShell"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz"
checksum=547e571c67b1436a32715b016ee63c666afcafed9c5a2f76dc4ad3bcaebffa47
distfiles="${GNOME_SITE}/$pkgname/3.10/$pkgname-$version.tar.xz"
checksum=eb98ca6274e82e446834221b2dfd9af0e12e5ebce651319435524fd6cd5f4ec9
post_install() {
rm -rf ${DESTDIR}/usr/share/gtk-doc
}
gnome-shell_package() {
depends="caribou>=0.4.10 pulseaudio mesa-demos desktop-file-utils
gir-freedesktop gnome-control-center>=3.8 mutter>=${version}"
depends="caribou>=0.4.12 pulseaudio mesa-demos desktop-file-utils
gir-freedesktop gnome-control-center>=3.10 mutter>=${version}"
pkg_install() {
vmove all
}