[arch-commits] Commit in gnome-shell/repos (8 files)
Jan Steffens
heftig at archlinux.org
Tue Oct 11 12:04:40 UTC 2016
Date: Tuesday, October 11, 2016 @ 12:04:40
Author: heftig
Revision: 278214
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
gnome-shell/repos/testing-i686/PKGBUILD
(from rev 278213, gnome-shell/trunk/PKGBUILD)
gnome-shell/repos/testing-i686/nm-libexecdir.patch
(from rev 278213, gnome-shell/trunk/nm-libexecdir.patch)
gnome-shell/repos/testing-x86_64/PKGBUILD
(from rev 278213, gnome-shell/trunk/PKGBUILD)
gnome-shell/repos/testing-x86_64/nm-libexecdir.patch
(from rev 278213, gnome-shell/trunk/nm-libexecdir.patch)
Deleted:
gnome-shell/repos/testing-i686/PKGBUILD
gnome-shell/repos/testing-i686/nm-libexecdir.patch
gnome-shell/repos/testing-x86_64/PKGBUILD
gnome-shell/repos/testing-x86_64/nm-libexecdir.patch
------------------------------------+
/PKGBUILD | 140 +++++++++++++++++++++++++++++++++++
/nm-libexecdir.patch | 24 ++++++
testing-i686/PKGBUILD | 59 --------------
testing-i686/nm-libexecdir.patch | 12 ---
testing-x86_64/PKGBUILD | 59 --------------
testing-x86_64/nm-libexecdir.patch | 12 ---
6 files changed, 164 insertions(+), 142 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2016-10-11 12:04:09 UTC (rev 278213)
+++ testing-i686/PKGBUILD 2016-10-11 12:04:40 UTC (rev 278214)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Flamelab <panosfilip at gmail.com
-
-pkgname=gnome-shell
-pkgver=3.22.0+4+g717c0ea
-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=717c0ea19f91bd149c43e92d2a2c80dbc5ba0b1a # master
-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/testing-i686/PKGBUILD (from rev 278213, gnome-shell/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-10-11 12:04:40 UTC (rev 278214)
@@ -0,0 +1,70 @@
+# $Id$
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Flamelab <panosfilip at gmail.com
+
+pkgname=gnome-shell
+pkgver=3.22.1+2+g5a08886
+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=5a08886ed6523c9449f19d69d7c0af979c9185f5 # gnome-3-22
+source=("git://git.gnome.org/gnome-shell#commit=$_commit"
+ "git://git.gnome.org/libgnome-volume-control"
+ "git://git.gnome.org/gnome-shell-sass"
+ nm-libexecdir.patch)
+sha256sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
+
+pkgver() {
+ cd $pkgname
+
+ 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
+
+ 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 "$pkgdir/usr/share/gnome-shell/modes"
+}
Deleted: testing-i686/nm-libexecdir.patch
===================================================================
--- testing-i686/nm-libexecdir.patch 2016-10-11 12:04:09 UTC (rev 278213)
+++ testing-i686/nm-libexecdir.patch 2016-10-11 12:04:40 UTC (rev 278214)
@@ -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/testing-i686/nm-libexecdir.patch (from rev 278213, gnome-shell/trunk/nm-libexecdir.patch)
===================================================================
--- testing-i686/nm-libexecdir.patch (rev 0)
+++ testing-i686/nm-libexecdir.patch 2016-10-11 12:04:40 UTC (rev 278214)
@@ -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: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2016-10-11 12:04:09 UTC (rev 278213)
+++ testing-x86_64/PKGBUILD 2016-10-11 12:04:40 UTC (rev 278214)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Flamelab <panosfilip at gmail.com
-
-pkgname=gnome-shell
-pkgver=3.22.0+4+g717c0ea
-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=717c0ea19f91bd149c43e92d2a2c80dbc5ba0b1a # master
-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/testing-x86_64/PKGBUILD (from rev 278213, gnome-shell/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-10-11 12:04:40 UTC (rev 278214)
@@ -0,0 +1,70 @@
+# $Id$
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Flamelab <panosfilip at gmail.com
+
+pkgname=gnome-shell
+pkgver=3.22.1+2+g5a08886
+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=5a08886ed6523c9449f19d69d7c0af979c9185f5 # gnome-3-22
+source=("git://git.gnome.org/gnome-shell#commit=$_commit"
+ "git://git.gnome.org/libgnome-volume-control"
+ "git://git.gnome.org/gnome-shell-sass"
+ nm-libexecdir.patch)
+sha256sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
+
+pkgver() {
+ cd $pkgname
+
+ 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
+
+ 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 "$pkgdir/usr/share/gnome-shell/modes"
+}
Deleted: testing-x86_64/nm-libexecdir.patch
===================================================================
--- testing-x86_64/nm-libexecdir.patch 2016-10-11 12:04:09 UTC (rev 278213)
+++ testing-x86_64/nm-libexecdir.patch 2016-10-11 12:04:40 UTC (rev 278214)
@@ -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/testing-x86_64/nm-libexecdir.patch (from rev 278213, gnome-shell/trunk/nm-libexecdir.patch)
===================================================================
--- testing-x86_64/nm-libexecdir.patch (rev 0)
+++ testing-x86_64/nm-libexecdir.patch 2016-10-11 12:04:40 UTC (rev 278214)
@@ -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))
More information about the arch-commits
mailing list