Date: Thursday, November 2, 2017 @ 20:14:22 Author: heftig Revision: 308876
archrelease: copy trunk to extra-i686, extra-x86_64 Added: gnome-shell/repos/extra-i686/PKGBUILD (from rev 308875, gnome-shell/trunk/PKGBUILD) gnome-shell/repos/extra-i686/nm-libexecdir.patch (from rev 308875, gnome-shell/trunk/nm-libexecdir.patch) gnome-shell/repos/extra-x86_64/PKGBUILD (from rev 308875, gnome-shell/trunk/PKGBUILD) gnome-shell/repos/extra-x86_64/nm-libexecdir.patch (from rev 308875, gnome-shell/trunk/nm-libexecdir.patch) Deleted: gnome-shell/repos/extra-i686/PKGBUILD gnome-shell/repos/extra-i686/nm-libexecdir.patch gnome-shell/repos/extra-x86_64/PKGBUILD gnome-shell/repos/extra-x86_64/nm-libexecdir.patch ----------------------------------+ /PKGBUILD | 126 +++++++++++++++++++++++++++++++++++++ /nm-libexecdir.patch | 24 +++++++ extra-i686/PKGBUILD | 63 ------------------ extra-i686/nm-libexecdir.patch | 12 --- extra-x86_64/PKGBUILD | 63 ------------------ extra-x86_64/nm-libexecdir.patch | 12 --- 6 files changed, 150 insertions(+), 150 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2017-11-02 20:12:38 UTC (rev 308875) +++ extra-i686/PKGBUILD 2017-11-02 20:14:22 UTC (rev 308876) @@ -1,63 +0,0 @@ -# $Id$ -# Contributor: Ionut Biru <ib...@archlinux.org> -# Contributor: Flamelab <panosfi...@gmail.com - -pkgname=gnome-shell -pkgver=3.26.1+10+gfd103ff70 -pkgrel=1 -pkgdesc="The next generation GNOME Shell" -url="https://wiki.gnome.org/Projects/GnomeShell" -arch=(i686 x86_64) -license=(GPL2) -depends=(accountsservice caribou gcr gjs gnome-bluetooth gnome-menus upower - gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas - libcanberra-pulse libcroco libgdm libsecret mutter nm-connection-editor - unzip gstreamer) -makedepends=(gtk-doc gnome-control-center evolution-data-server gobject-introspection git meson) -optdepends=('gnome-control-center: System settings' - 'evolution-data-server: Evolution calendar integration') -groups=(gnome) -_commit=fd103ff7030402503ab60b68b5b35c145c491d63 # gnome-3-26 -source=("git+https://git.gnome.org/browse/gnome-shell#commit=$_commit" - "git+https://git.gnome.org/browse/libgnome-volume-control" - "git+https://git.gnome.org/browse/gnome-shell-sass" - nm-libexecdir.patch) -sha256sums=('SKIP' - 'SKIP' - 'SKIP' - 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') - -pkgver() { - cd $pkgname - git describe --tags | sed 's/-/+/g' -} - -prepare() { - mkdir build - cd $pkgname - - # FS#30747 FS#32730 Problems due to libexecdir different from NM - patch -Np1 -i ../nm-libexecdir.patch - - # Move the plugin to our custom epihpany-only dir - sed -i "s/'mozilla'/'epiphany'/g" meson.build - - git submodule init - git config --local submodule.src/gvc.url "$srcdir/libgnome-volume-control" - git config --local submodule.data/theme/gnome-shell-sass.url "$srcdir/gnome-shell-sass" - git submodule update -} - -build() { - cd build - arch-meson ../$pkgname -Denable-documentation=true - ninja -} - -package() { - cd build - DESTDIR="$pkgdir" ninja install - - # Must exist; FS#37412 - mkdir "$pkgdir/usr/share/gnome-shell/modes" -} Copied: gnome-shell/repos/extra-i686/PKGBUILD (from rev 308875, gnome-shell/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2017-11-02 20:14:22 UTC (rev 308876) @@ -0,0 +1,63 @@ +# $Id$ +# Contributor: Ionut Biru <ib...@archlinux.org> +# Contributor: Flamelab <panosfi...@gmail.com + +pkgname=gnome-shell +pkgver=3.26.2 +pkgrel=1 +pkgdesc="The next generation GNOME Shell" +url="https://wiki.gnome.org/Projects/GnomeShell" +arch=(i686 x86_64) +license=(GPL2) +depends=(accountsservice caribou gcr gjs gnome-bluetooth gnome-menus upower + gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas + libcanberra-pulse libcroco libgdm libsecret mutter nm-connection-editor + unzip gstreamer) +makedepends=(gtk-doc gnome-control-center evolution-data-server gobject-introspection git meson) +optdepends=('gnome-control-center: System settings' + 'evolution-data-server: Evolution calendar integration') +groups=(gnome) +_commit=6dd973be1228d7a68dde1a504f2974e62efcc76b # tags/3.26.2^0 +source=("git+https://git.gnome.org/browse/gnome-shell#commit=$_commit" + "git+https://git.gnome.org/browse/libgnome-volume-control" + "git+https://git.gnome.org/browse/gnome-shell-sass" + nm-libexecdir.patch) +sha256sums=('SKIP' + 'SKIP' + 'SKIP' + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} + +prepare() { + mkdir build + cd $pkgname + + # FS#30747 FS#32730 Problems due to libexecdir different from NM + patch -Np1 -i ../nm-libexecdir.patch + + # Move the plugin to our custom epihpany-only dir + sed -i "s/'mozilla'/'epiphany'/g" meson.build + + git submodule init + git config --local submodule.src/gvc.url "$srcdir/libgnome-volume-control" + git config --local submodule.data/theme/gnome-shell-sass.url "$srcdir/gnome-shell-sass" + git submodule update +} + +build() { + cd build + arch-meson ../$pkgname -Denable-documentation=true + ninja +} + +package() { + cd build + DESTDIR="$pkgdir" ninja install + + # Must exist; FS#37412 + mkdir "$pkgdir/usr/share/gnome-shell/modes" +} Deleted: extra-i686/nm-libexecdir.patch =================================================================== --- extra-i686/nm-libexecdir.patch 2017-11-02 20:12:38 UTC (rev 308875) +++ extra-i686/nm-libexecdir.patch 2017-11-02 20:14:22 UTC (rev 308876) @@ -1,12 +0,0 @@ -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)) Copied: gnome-shell/repos/extra-i686/nm-libexecdir.patch (from rev 308875, gnome-shell/trunk/nm-libexecdir.patch) =================================================================== --- extra-i686/nm-libexecdir.patch (rev 0) +++ extra-i686/nm-libexecdir.patch 2017-11-02 20:14:22 UTC (rev 308876) @@ -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 2017-11-02 20:12:38 UTC (rev 308875) +++ extra-x86_64/PKGBUILD 2017-11-02 20:14:22 UTC (rev 308876) @@ -1,63 +0,0 @@ -# $Id$ -# Contributor: Ionut Biru <ib...@archlinux.org> -# Contributor: Flamelab <panosfi...@gmail.com - -pkgname=gnome-shell -pkgver=3.26.1+10+gfd103ff70 -pkgrel=1 -pkgdesc="The next generation GNOME Shell" -url="https://wiki.gnome.org/Projects/GnomeShell" -arch=(i686 x86_64) -license=(GPL2) -depends=(accountsservice caribou gcr gjs gnome-bluetooth gnome-menus upower - gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas - libcanberra-pulse libcroco libgdm libsecret mutter nm-connection-editor - unzip gstreamer) -makedepends=(gtk-doc gnome-control-center evolution-data-server gobject-introspection git meson) -optdepends=('gnome-control-center: System settings' - 'evolution-data-server: Evolution calendar integration') -groups=(gnome) -_commit=fd103ff7030402503ab60b68b5b35c145c491d63 # gnome-3-26 -source=("git+https://git.gnome.org/browse/gnome-shell#commit=$_commit" - "git+https://git.gnome.org/browse/libgnome-volume-control" - "git+https://git.gnome.org/browse/gnome-shell-sass" - nm-libexecdir.patch) -sha256sums=('SKIP' - 'SKIP' - 'SKIP' - 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') - -pkgver() { - cd $pkgname - git describe --tags | sed 's/-/+/g' -} - -prepare() { - mkdir build - cd $pkgname - - # FS#30747 FS#32730 Problems due to libexecdir different from NM - patch -Np1 -i ../nm-libexecdir.patch - - # Move the plugin to our custom epihpany-only dir - sed -i "s/'mozilla'/'epiphany'/g" meson.build - - git submodule init - git config --local submodule.src/gvc.url "$srcdir/libgnome-volume-control" - git config --local submodule.data/theme/gnome-shell-sass.url "$srcdir/gnome-shell-sass" - git submodule update -} - -build() { - cd build - arch-meson ../$pkgname -Denable-documentation=true - ninja -} - -package() { - cd build - DESTDIR="$pkgdir" ninja install - - # Must exist; FS#37412 - mkdir "$pkgdir/usr/share/gnome-shell/modes" -} Copied: gnome-shell/repos/extra-x86_64/PKGBUILD (from rev 308875, gnome-shell/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2017-11-02 20:14:22 UTC (rev 308876) @@ -0,0 +1,63 @@ +# $Id$ +# Contributor: Ionut Biru <ib...@archlinux.org> +# Contributor: Flamelab <panosfi...@gmail.com + +pkgname=gnome-shell +pkgver=3.26.2 +pkgrel=1 +pkgdesc="The next generation GNOME Shell" +url="https://wiki.gnome.org/Projects/GnomeShell" +arch=(i686 x86_64) +license=(GPL2) +depends=(accountsservice caribou gcr gjs gnome-bluetooth gnome-menus upower + gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas + libcanberra-pulse libcroco libgdm libsecret mutter nm-connection-editor + unzip gstreamer) +makedepends=(gtk-doc gnome-control-center evolution-data-server gobject-introspection git meson) +optdepends=('gnome-control-center: System settings' + 'evolution-data-server: Evolution calendar integration') +groups=(gnome) +_commit=6dd973be1228d7a68dde1a504f2974e62efcc76b # tags/3.26.2^0 +source=("git+https://git.gnome.org/browse/gnome-shell#commit=$_commit" + "git+https://git.gnome.org/browse/libgnome-volume-control" + "git+https://git.gnome.org/browse/gnome-shell-sass" + nm-libexecdir.patch) +sha256sums=('SKIP' + 'SKIP' + 'SKIP' + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} + +prepare() { + mkdir build + cd $pkgname + + # FS#30747 FS#32730 Problems due to libexecdir different from NM + patch -Np1 -i ../nm-libexecdir.patch + + # Move the plugin to our custom epihpany-only dir + sed -i "s/'mozilla'/'epiphany'/g" meson.build + + git submodule init + git config --local submodule.src/gvc.url "$srcdir/libgnome-volume-control" + git config --local submodule.data/theme/gnome-shell-sass.url "$srcdir/gnome-shell-sass" + git submodule update +} + +build() { + cd build + arch-meson ../$pkgname -Denable-documentation=true + ninja +} + +package() { + cd build + DESTDIR="$pkgdir" ninja install + + # Must exist; FS#37412 + mkdir "$pkgdir/usr/share/gnome-shell/modes" +} Deleted: extra-x86_64/nm-libexecdir.patch =================================================================== --- extra-x86_64/nm-libexecdir.patch 2017-11-02 20:12:38 UTC (rev 308875) +++ extra-x86_64/nm-libexecdir.patch 2017-11-02 20:14:22 UTC (rev 308876) @@ -1,12 +0,0 @@ -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)) Copied: gnome-shell/repos/extra-x86_64/nm-libexecdir.patch (from rev 308875, gnome-shell/trunk/nm-libexecdir.patch) =================================================================== --- extra-x86_64/nm-libexecdir.patch (rev 0) +++ extra-x86_64/nm-libexecdir.patch 2017-11-02 20:14:22 UTC (rev 308876) @@ -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))