[arch-commits] Commit in gnome-shell/repos (3 files)

Jan de Groot jgc at archlinux.org
Wed Nov 22 12:29:17 UTC 2017


    Date: Wednesday, November 22, 2017 @ 12:29:16
  Author: jgc
Revision: 310575

archrelease: copy trunk to staging-x86_64

Added:
  gnome-shell/repos/staging-x86_64/
  gnome-shell/repos/staging-x86_64/PKGBUILD
    (from rev 310574, gnome-shell/trunk/PKGBUILD)
  gnome-shell/repos/staging-x86_64/nm-libexecdir.patch
    (from rev 310574, gnome-shell/trunk/nm-libexecdir.patch)

---------------------+
 PKGBUILD            |   63 ++++++++++++++++++++++++++++++++++++++++++++++++++
 nm-libexecdir.patch |   12 +++++++++
 2 files changed, 75 insertions(+)

Copied: gnome-shell/repos/staging-x86_64/PKGBUILD (from rev 310574, gnome-shell/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2017-11-22 12:29:16 UTC (rev 310575)
@@ -0,0 +1,63 @@
+# $Id$
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Flamelab <panosfilip at gmail.com
+
+pkgname=gnome-shell
+pkgver=3.26.2+5+g3b4be770a
+pkgrel=1
+pkgdesc="The next generation GNOME Shell"
+url="https://wiki.gnome.org/Projects/GnomeShell"
+arch=(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=3b4be770a0590bcee9c739f3d9264320e23d555b  # 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/staging-x86_64/nm-libexecdir.patch (from rev 310574, gnome-shell/trunk/nm-libexecdir.patch)
===================================================================
--- staging-x86_64/nm-libexecdir.patch	                        (rev 0)
+++ staging-x86_64/nm-libexecdir.patch	2017-11-22 12:29:16 UTC (rev 310575)
@@ -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