[arch-commits] Commit in gnome-shell/trunk (PKGBUILD nm-libexecdir.patch)
Jan Steffens
heftig at archlinux.org
Wed Nov 22 15:10:11 UTC 2017
Date: Wednesday, November 22, 2017 @ 15:10:10
Author: heftig
Revision: 310611
3.26.2+5+g3b4be770a-2
Modified:
gnome-shell/trunk/PKGBUILD
Deleted:
gnome-shell/trunk/nm-libexecdir.patch
---------------------+
PKGBUILD | 13 ++++---------
nm-libexecdir.patch | 12 ------------
2 files changed, 4 insertions(+), 21 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-11-22 15:09:41 UTC (rev 310610)
+++ PKGBUILD 2017-11-22 15:10:10 UTC (rev 310611)
@@ -4,7 +4,7 @@
pkgname=gnome-shell
pkgver=3.26.2+5+g3b4be770a
-pkgrel=1
+pkgrel=2
pkgdesc="The next generation GNOME Shell"
url="https://wiki.gnome.org/Projects/GnomeShell"
arch=(x86_64)
@@ -20,12 +20,10 @@
_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)
+ "git+https://git.gnome.org/browse/gnome-shell-sass")
sha256sums=('SKIP'
'SKIP'
- 'SKIP'
- 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
+ 'SKIP')
pkgver() {
cd $pkgname
@@ -36,10 +34,7 @@
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
+ # Move the plugin to our custom epiphany-only dir
sed -i "s/'mozilla'/'epiphany'/g" meson.build
git submodule init
Deleted: nm-libexecdir.patch
===================================================================
--- nm-libexecdir.patch 2017-11-22 15:09:41 UTC (rev 310610)
+++ nm-libexecdir.patch 2017-11-22 15:10:10 UTC (rev 310611)
@@ -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))
More information about the arch-commits
mailing list