Date: Thursday, September 22, 2016 @ 22:32:51 Author: jgc Revision: 276862
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64 Added: gnome-shell/repos/gnome-unstable-i686/ gnome-shell/repos/gnome-unstable-i686/PKGBUILD (from rev 276861, gnome-shell/trunk/PKGBUILD) gnome-shell/repos/gnome-unstable-i686/nm-libexecdir.patch (from rev 276861, gnome-shell/trunk/nm-libexecdir.patch) gnome-shell/repos/gnome-unstable-x86_64/ gnome-shell/repos/gnome-unstable-x86_64/PKGBUILD (from rev 276861, gnome-shell/trunk/PKGBUILD) gnome-shell/repos/gnome-unstable-x86_64/nm-libexecdir.patch (from rev 276861, gnome-shell/trunk/nm-libexecdir.patch) -------------------------------------------+ gnome-unstable-i686/PKGBUILD | 59 ++++++++++++++++++++++++++++ gnome-unstable-i686/nm-libexecdir.patch | 12 +++++ gnome-unstable-x86_64/PKGBUILD | 59 ++++++++++++++++++++++++++++ gnome-unstable-x86_64/nm-libexecdir.patch | 12 +++++ 4 files changed, 142 insertions(+) Copied: gnome-shell/repos/gnome-unstable-i686/PKGBUILD (from rev 276861, gnome-shell/trunk/PKGBUILD) =================================================================== --- gnome-unstable-i686/PKGBUILD (rev 0) +++ gnome-unstable-i686/PKGBUILD 2016-09-22 22:32:51 UTC (rev 276862) @@ -0,0 +1,59 @@ +# $Id$ +# Maintainer: Ionut Biru <ib...@archlinux.org> +# Contributor: Flamelab <panosfi...@gmail.com + +pkgname=gnome-shell +pkgver=3.22.0+3+g3cd8dd0 +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 + telepathy-logger telepathy-mission-control unzip gstreamer) +makedepends=(intltool gtk-doc gnome-control-center evolution-data-server python gobject-introspection git gnome-common) +optdepends=('gnome-control-center: System settings' + 'evolution-data-server: Evolution calendar integration') +groups=(gnome) +_commit=3cd8dd0f3295f2b66deceb1b98d446606b96ce05 +source=("git://git.gnome.org/gnome-shell#commit=$_commit" + nm-libexecdir.patch) +sha256sums=('SKIP' + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd $pkgname + + # FS#30747 FS#32730 Problems due to libexecdir different from NM + patch -Np1 -i ../nm-libexecdir.patch + + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd $pkgname + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gnome-shell \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile --enable-gtk-doc + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install + + # Must exist; FS#37412 + mkdir -p "$pkgdir/usr/share/gnome-shell/modes" +} Copied: gnome-shell/repos/gnome-unstable-i686/nm-libexecdir.patch (from rev 276861, gnome-shell/trunk/nm-libexecdir.patch) =================================================================== --- gnome-unstable-i686/nm-libexecdir.patch (rev 0) +++ gnome-unstable-i686/nm-libexecdir.patch 2016-09-22 22:32:51 UTC (rev 276862) @@ -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)) Copied: gnome-shell/repos/gnome-unstable-x86_64/PKGBUILD (from rev 276861, gnome-shell/trunk/PKGBUILD) =================================================================== --- gnome-unstable-x86_64/PKGBUILD (rev 0) +++ gnome-unstable-x86_64/PKGBUILD 2016-09-22 22:32:51 UTC (rev 276862) @@ -0,0 +1,59 @@ +# $Id$ +# Maintainer: Ionut Biru <ib...@archlinux.org> +# Contributor: Flamelab <panosfi...@gmail.com + +pkgname=gnome-shell +pkgver=3.22.0+3+g3cd8dd0 +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 + telepathy-logger telepathy-mission-control unzip gstreamer) +makedepends=(intltool gtk-doc gnome-control-center evolution-data-server python gobject-introspection git gnome-common) +optdepends=('gnome-control-center: System settings' + 'evolution-data-server: Evolution calendar integration') +groups=(gnome) +_commit=3cd8dd0f3295f2b66deceb1b98d446606b96ce05 +source=("git://git.gnome.org/gnome-shell#commit=$_commit" + nm-libexecdir.patch) +sha256sums=('SKIP' + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd $pkgname + + # FS#30747 FS#32730 Problems due to libexecdir different from NM + patch -Np1 -i ../nm-libexecdir.patch + + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd $pkgname + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gnome-shell \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile --enable-gtk-doc + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install + + # Must exist; FS#37412 + mkdir -p "$pkgdir/usr/share/gnome-shell/modes" +} Copied: gnome-shell/repos/gnome-unstable-x86_64/nm-libexecdir.patch (from rev 276861, gnome-shell/trunk/nm-libexecdir.patch) =================================================================== --- gnome-unstable-x86_64/nm-libexecdir.patch (rev 0) +++ gnome-unstable-x86_64/nm-libexecdir.patch 2016-09-22 22:32:51 UTC (rev 276862) @@ -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))