Date: Sunday, March 10, 2013 @ 17:33:19 Author: heftig Revision: 179858
archrelease: copy trunk to extra-i686, extra-x86_64 Added: gnome-shell/repos/extra-i686/PKGBUILD (from rev 179857, gnome-shell/trunk/PKGBUILD) gnome-shell/repos/extra-i686/gnome-shell.install (from rev 179857, gnome-shell/trunk/gnome-shell.install) gnome-shell/repos/extra-i686/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch (from rev 179857, gnome-shell/trunk/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch) gnome-shell/repos/extra-i686/nm-libexecdir.patch (from rev 179857, gnome-shell/trunk/nm-libexecdir.patch) gnome-shell/repos/extra-x86_64/PKGBUILD (from rev 179857, gnome-shell/trunk/PKGBUILD) gnome-shell/repos/extra-x86_64/gnome-shell.install (from rev 179857, gnome-shell/trunk/gnome-shell.install) gnome-shell/repos/extra-x86_64/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch (from rev 179857, gnome-shell/trunk/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch) gnome-shell/repos/extra-x86_64/nm-libexecdir.patch (from rev 179857, gnome-shell/trunk/nm-libexecdir.patch) Deleted: gnome-shell/repos/extra-i686/PKGBUILD gnome-shell/repos/extra-i686/gnome-shell.install gnome-shell/repos/extra-i686/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch gnome-shell/repos/extra-x86_64/PKGBUILD gnome-shell/repos/extra-x86_64/gnome-shell.install gnome-shell/repos/extra-x86_64/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch -----------------------------------------------------------------------+ extra-i686/PKGBUILD | 86 +++++----- extra-i686/gnome-shell.install | 38 ++-- extra-i686/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch | 58 +++--- extra-i686/nm-libexecdir.patch | 12 + extra-x86_64/PKGBUILD | 86 +++++----- extra-x86_64/gnome-shell.install | 38 ++-- extra-x86_64/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch | 58 +++--- extra-x86_64/nm-libexecdir.patch | 12 + 8 files changed, 210 insertions(+), 178 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-03-10 16:31:55 UTC (rev 179857) +++ extra-i686/PKGBUILD 2013-03-10 16:33:19 UTC (rev 179858) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Ionut Biru <ib...@archlinux.org> -# Contributor: Flamelab <panosfi...@gmail.com - -pkgname=gnome-shell -pkgver=3.6.3.1 -pkgrel=2 -pkgdesc="The next generation GNOME Shell" -arch=(i686 x86_64) -url="http://live.gnome.org/GnomeShell" -license=(GPL2) -depends=(caribou evolution-data-server gjs gnome-bluetooth gnome-menus libcroco mutter - telepathy-logger telepathy-mission-control unzip gdm gnome-screensaver) -makedepends=(intltool gnome-doc-utils docbook-xsl) -optdepends=('gnome-control-center: System settings' - 'gnome-themes-standard: Default theme') -options=('!libtool' '!emptydirs') -install=gnome-shell.install -groups=(gnome) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz - main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch) -sha256sums=('4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603' - '968245e7db1c6921627cf0fbce4e4504cffbdb24898f834769a23a254ed6e125') - -build() { - cd $pkgname-$pkgver - - # FS#32410 - patch -Np1 -i ../main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch - - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gnome-shell \ - --localstatedir=/var --disable-static \ - --disable-schemas-compile - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: gnome-shell/repos/extra-i686/PKGBUILD (from rev 179857, gnome-shell/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-03-10 16:33:19 UTC (rev 179858) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Ionut Biru <ib...@archlinux.org> +# Contributor: Flamelab <panosfi...@gmail.com + +pkgname=gnome-shell +pkgver=3.6.3.1 +pkgrel=3 +pkgdesc="The next generation GNOME Shell" +arch=(i686 x86_64) +url="http://live.gnome.org/GnomeShell" +license=(GPL2) +depends=(caribou evolution-data-server gjs gnome-bluetooth gnome-menus libcroco mutter + telepathy-logger telepathy-mission-control unzip gdm gnome-screensaver) +makedepends=(intltool gnome-doc-utils docbook-xsl) +optdepends=('gnome-control-center: System settings' + 'gnome-themes-standard: Default theme') +options=('!libtool' '!emptydirs') +install=gnome-shell.install +groups=(gnome) +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz + main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch nm-libexecdir.patch) +sha256sums=('4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603' + '968245e7db1c6921627cf0fbce4e4504cffbdb24898f834769a23a254ed6e125' + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') + +build() { + cd $pkgname-$pkgver + + # FS#32410 + patch -Np1 -i ../main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch + + # FS#30747 FS#32730 Problems due to libexecdir different from NM + patch -Np1 -i ../nm-libexecdir.patch + + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gnome-shell \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: extra-i686/gnome-shell.install =================================================================== --- extra-i686/gnome-shell.install 2013-03-10 16:31:55 UTC (rev 179857) +++ extra-i686/gnome-shell.install 2013-03-10 16:33:19 UTC (rev 179858) @@ -1,19 +0,0 @@ -pkgname=gnome-shell - -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas -} - -pre_upgrade() { - if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then - gconfpkg --uninstall $pkgname - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: gnome-shell/repos/extra-i686/gnome-shell.install (from rev 179857, gnome-shell/trunk/gnome-shell.install) =================================================================== --- extra-i686/gnome-shell.install (rev 0) +++ extra-i686/gnome-shell.install 2013-03-10 16:33:19 UTC (rev 179858) @@ -0,0 +1,19 @@ +pkgname=gnome-shell + +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then + gconfpkg --uninstall $pkgname + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-i686/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch =================================================================== --- extra-i686/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch 2013-03-10 16:31:55 UTC (rev 179857) +++ extra-i686/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch 2013-03-10 16:33:19 UTC (rev 179858) @@ -1,29 +0,0 @@ -From 742587dce258adf436f360eed183a7ca0c58fa18 Mon Sep 17 00:00:00 2001 -From: "Jasper St. Pierre" <jstpie...@mecheye.net> -Date: Wed, 2 Jan 2013 09:05:32 -0500 -Subject: [PATCH] main: Don't mess up the modal stack when the focus actor is - destroyed - -This seems to be an incorrect conversion when we moved from an array -to an object of keys in 3a6b4f3. - -https://bugzilla.gnome.org/show_bug.cgi?id=690965 ---- - js/ui/main.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/ui/main.js b/js/ui/main.js -index 12daee2..1334d58 100644 ---- a/js/ui/main.js -+++ b/js/ui/main.js -@@ -553,7 +553,7 @@ function pushModal(actor, params) { - curFocusDestroyId = curFocus.connect('destroy', function() { - let index = _findModal(actor); - if (index >= 0) -- modalActorFocusStack[index].actor = null; -+ modalActorFocusStack[index].focus = null; - }); - } - modalActorFocusStack.push({ actor: actor, --- -1.8.0.2 \ No newline at end of file Copied: gnome-shell/repos/extra-i686/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch (from rev 179857, gnome-shell/trunk/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch) =================================================================== --- extra-i686/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch (rev 0) +++ extra-i686/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch 2013-03-10 16:33:19 UTC (rev 179858) @@ -0,0 +1,29 @@ +From 742587dce258adf436f360eed183a7ca0c58fa18 Mon Sep 17 00:00:00 2001 +From: "Jasper St. Pierre" <jstpie...@mecheye.net> +Date: Wed, 2 Jan 2013 09:05:32 -0500 +Subject: [PATCH] main: Don't mess up the modal stack when the focus actor is + destroyed + +This seems to be an incorrect conversion when we moved from an array +to an object of keys in 3a6b4f3. + +https://bugzilla.gnome.org/show_bug.cgi?id=690965 +--- + js/ui/main.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/ui/main.js b/js/ui/main.js +index 12daee2..1334d58 100644 +--- a/js/ui/main.js ++++ b/js/ui/main.js +@@ -553,7 +553,7 @@ function pushModal(actor, params) { + curFocusDestroyId = curFocus.connect('destroy', function() { + let index = _findModal(actor); + if (index >= 0) +- modalActorFocusStack[index].actor = null; ++ modalActorFocusStack[index].focus = null; + }); + } + modalActorFocusStack.push({ actor: actor, +-- +1.8.0.2 \ No newline at end of file Copied: gnome-shell/repos/extra-i686/nm-libexecdir.patch (from rev 179857, gnome-shell/trunk/nm-libexecdir.patch) =================================================================== --- extra-i686/nm-libexecdir.patch (rev 0) +++ extra-i686/nm-libexecdir.patch 2013-03-10 16:33:19 UTC (rev 179858) @@ -0,0 +1,12 @@ +diff -u -Nr gnome-shell-3.6.3.1/js/ui/components/networkAgent.js gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js +--- gnome-shell-3.6.3.1/js/ui/components/networkAgent.js 2013-02-20 20:31:03.000000000 +0100 ++++ gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js 2013-03-10 17:13:46.120907065 +0100 +@@ -686,7 +686,7 @@ + } catch(e) { } // ignore errors if key does not exist + let path = binary; + if (!GLib.path_is_absolute(path)) { +- path = GLib.build_filenamev([Config.LIBEXECDIR, path]); ++ path = GLib.build_filenamev(["/usr/lib/networkmanager", path]); + } + + if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE)) Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-03-10 16:31:55 UTC (rev 179857) +++ extra-x86_64/PKGBUILD 2013-03-10 16:33:19 UTC (rev 179858) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Ionut Biru <ib...@archlinux.org> -# Contributor: Flamelab <panosfi...@gmail.com - -pkgname=gnome-shell -pkgver=3.6.3.1 -pkgrel=2 -pkgdesc="The next generation GNOME Shell" -arch=(i686 x86_64) -url="http://live.gnome.org/GnomeShell" -license=(GPL2) -depends=(caribou evolution-data-server gjs gnome-bluetooth gnome-menus libcroco mutter - telepathy-logger telepathy-mission-control unzip gdm gnome-screensaver) -makedepends=(intltool gnome-doc-utils docbook-xsl) -optdepends=('gnome-control-center: System settings' - 'gnome-themes-standard: Default theme') -options=('!libtool' '!emptydirs') -install=gnome-shell.install -groups=(gnome) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz - main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch) -sha256sums=('4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603' - '968245e7db1c6921627cf0fbce4e4504cffbdb24898f834769a23a254ed6e125') - -build() { - cd $pkgname-$pkgver - - # FS#32410 - patch -Np1 -i ../main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch - - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gnome-shell \ - --localstatedir=/var --disable-static \ - --disable-schemas-compile - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: gnome-shell/repos/extra-x86_64/PKGBUILD (from rev 179857, gnome-shell/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-03-10 16:33:19 UTC (rev 179858) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Ionut Biru <ib...@archlinux.org> +# Contributor: Flamelab <panosfi...@gmail.com + +pkgname=gnome-shell +pkgver=3.6.3.1 +pkgrel=3 +pkgdesc="The next generation GNOME Shell" +arch=(i686 x86_64) +url="http://live.gnome.org/GnomeShell" +license=(GPL2) +depends=(caribou evolution-data-server gjs gnome-bluetooth gnome-menus libcroco mutter + telepathy-logger telepathy-mission-control unzip gdm gnome-screensaver) +makedepends=(intltool gnome-doc-utils docbook-xsl) +optdepends=('gnome-control-center: System settings' + 'gnome-themes-standard: Default theme') +options=('!libtool' '!emptydirs') +install=gnome-shell.install +groups=(gnome) +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz + main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch nm-libexecdir.patch) +sha256sums=('4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603' + '968245e7db1c6921627cf0fbce4e4504cffbdb24898f834769a23a254ed6e125' + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') + +build() { + cd $pkgname-$pkgver + + # FS#32410 + patch -Np1 -i ../main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch + + # FS#30747 FS#32730 Problems due to libexecdir different from NM + patch -Np1 -i ../nm-libexecdir.patch + + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gnome-shell \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: extra-x86_64/gnome-shell.install =================================================================== --- extra-x86_64/gnome-shell.install 2013-03-10 16:31:55 UTC (rev 179857) +++ extra-x86_64/gnome-shell.install 2013-03-10 16:33:19 UTC (rev 179858) @@ -1,19 +0,0 @@ -pkgname=gnome-shell - -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas -} - -pre_upgrade() { - if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then - gconfpkg --uninstall $pkgname - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: gnome-shell/repos/extra-x86_64/gnome-shell.install (from rev 179857, gnome-shell/trunk/gnome-shell.install) =================================================================== --- extra-x86_64/gnome-shell.install (rev 0) +++ extra-x86_64/gnome-shell.install 2013-03-10 16:33:19 UTC (rev 179858) @@ -0,0 +1,19 @@ +pkgname=gnome-shell + +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then + gconfpkg --uninstall $pkgname + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-x86_64/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch =================================================================== --- extra-x86_64/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch 2013-03-10 16:31:55 UTC (rev 179857) +++ extra-x86_64/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch 2013-03-10 16:33:19 UTC (rev 179858) @@ -1,29 +0,0 @@ -From 742587dce258adf436f360eed183a7ca0c58fa18 Mon Sep 17 00:00:00 2001 -From: "Jasper St. Pierre" <jstpie...@mecheye.net> -Date: Wed, 2 Jan 2013 09:05:32 -0500 -Subject: [PATCH] main: Don't mess up the modal stack when the focus actor is - destroyed - -This seems to be an incorrect conversion when we moved from an array -to an object of keys in 3a6b4f3. - -https://bugzilla.gnome.org/show_bug.cgi?id=690965 ---- - js/ui/main.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/ui/main.js b/js/ui/main.js -index 12daee2..1334d58 100644 ---- a/js/ui/main.js -+++ b/js/ui/main.js -@@ -553,7 +553,7 @@ function pushModal(actor, params) { - curFocusDestroyId = curFocus.connect('destroy', function() { - let index = _findModal(actor); - if (index >= 0) -- modalActorFocusStack[index].actor = null; -+ modalActorFocusStack[index].focus = null; - }); - } - modalActorFocusStack.push({ actor: actor, --- -1.8.0.2 \ No newline at end of file Copied: gnome-shell/repos/extra-x86_64/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch (from rev 179857, gnome-shell/trunk/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch) =================================================================== --- extra-x86_64/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch (rev 0) +++ extra-x86_64/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch 2013-03-10 16:33:19 UTC (rev 179858) @@ -0,0 +1,29 @@ +From 742587dce258adf436f360eed183a7ca0c58fa18 Mon Sep 17 00:00:00 2001 +From: "Jasper St. Pierre" <jstpie...@mecheye.net> +Date: Wed, 2 Jan 2013 09:05:32 -0500 +Subject: [PATCH] main: Don't mess up the modal stack when the focus actor is + destroyed + +This seems to be an incorrect conversion when we moved from an array +to an object of keys in 3a6b4f3. + +https://bugzilla.gnome.org/show_bug.cgi?id=690965 +--- + js/ui/main.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/ui/main.js b/js/ui/main.js +index 12daee2..1334d58 100644 +--- a/js/ui/main.js ++++ b/js/ui/main.js +@@ -553,7 +553,7 @@ function pushModal(actor, params) { + curFocusDestroyId = curFocus.connect('destroy', function() { + let index = _findModal(actor); + if (index >= 0) +- modalActorFocusStack[index].actor = null; ++ modalActorFocusStack[index].focus = null; + }); + } + modalActorFocusStack.push({ actor: actor, +-- +1.8.0.2 \ No newline at end of file Copied: gnome-shell/repos/extra-x86_64/nm-libexecdir.patch (from rev 179857, gnome-shell/trunk/nm-libexecdir.patch) =================================================================== --- extra-x86_64/nm-libexecdir.patch (rev 0) +++ extra-x86_64/nm-libexecdir.patch 2013-03-10 16:33:19 UTC (rev 179858) @@ -0,0 +1,12 @@ +diff -u -Nr gnome-shell-3.6.3.1/js/ui/components/networkAgent.js gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js +--- gnome-shell-3.6.3.1/js/ui/components/networkAgent.js 2013-02-20 20:31:03.000000000 +0100 ++++ gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js 2013-03-10 17:13:46.120907065 +0100 +@@ -686,7 +686,7 @@ + } catch(e) { } // ignore errors if key does not exist + let path = binary; + if (!GLib.path_is_absolute(path)) { +- path = GLib.build_filenamev([Config.LIBEXECDIR, path]); ++ path = GLib.build_filenamev(["/usr/lib/networkmanager", path]); + } + + if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))