[arch-commits] Commit in gnome-shell/repos/extra-x86_64 (5 files)
Jan Steffens
heftig at archlinux.org
Wed Mar 11 09:47:26 UTC 2020
Date: Wednesday, March 11, 2020 @ 09:47:26
Author: heftig
Revision: 377368
archrelease: copy trunk to extra-x86_64
Added:
gnome-shell/repos/extra-x86_64/1080.patch
(from rev 377362, gnome-shell/trunk/1080.patch)
gnome-shell/repos/extra-x86_64/PKGBUILD
(from rev 377362, gnome-shell/trunk/PKGBUILD)
gnome-shell/repos/extra-x86_64/gnome-shell.install
(from rev 377362, gnome-shell/trunk/gnome-shell.install)
Deleted:
gnome-shell/repos/extra-x86_64/PKGBUILD
gnome-shell/repos/extra-x86_64/gnome-shell.install
---------------------+
1080.patch | 27 +++++++++++++
PKGBUILD | 103 ++++++++++++++++++++++++++------------------------
gnome-shell.install | 14 +++---
3 files changed, 88 insertions(+), 56 deletions(-)
Copied: gnome-shell/repos/extra-x86_64/1080.patch (from rev 377362, gnome-shell/trunk/1080.patch)
===================================================================
--- 1080.patch (rev 0)
+++ 1080.patch 2020-03-11 09:47:26 UTC (rev 377368)
@@ -0,0 +1,27 @@
+From 08c0d5059d6549833a19a4465fbe04146b47112e Mon Sep 17 00:00:00 2001
+From: Alynx Zhou <alynx.zhou at gmail.com>
+Date: Mon, 9 Mar 2020 10:09:47 +0800
+Subject: [PATCH] ibusManager: fix ibus launch error because of wrong method
+ name
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1080
+---
+ js/misc/ibusManager.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js
+index aa1f510602..e27e9f06dd 100644
+--- a/js/misc/ibusManager.js
++++ b/js/misc/ibusManager.js
+@@ -66,7 +66,7 @@ var IBusManager = class {
+ let display = GLib.getenv('GNOME_SETUP_DISPLAY');
+ if (display)
+ launcher.setenv('DISPLAY', display, true);
+- launcher.launch(cmdLine);
++ launcher.spawnv(cmdLine);
+ } catch (e) {
+ log(`Failed to launch ibus-daemon: ${e.message}`);
+ }
+--
+2.24.1
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-11 09:47:26 UTC (rev 377367)
+++ PKGBUILD 2020-03-11 09:47:26 UTC (rev 377368)
@@ -1,49 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Flamelab <panosfilip at gmail.com
-
-pkgname=gnome-shell
-pkgver=3.36.0
-pkgrel=2
-epoch=1
-pkgdesc="Next generation desktop shell"
-url="https://wiki.gnome.org/Projects/GnomeShell"
-arch=(x86_64)
-license=(GPL2)
-depends=(accountsservice gcr gjs gnome-bluetooth upower gnome-session gnome-settings-daemon
- gnome-themes-extra gsettings-desktop-schemas libcanberra-pulse libgdm libsecret
- mutter nm-connection-editor unzip gstreamer ibus gnome-autoar)
-makedepends=(gtk-doc gnome-control-center evolution-data-server gobject-introspection git meson
- sassc asciidoc)
-optdepends=('gnome-control-center: System settings'
- 'evolution-data-server: Evolution calendar integration')
-groups=(gnome)
-install=gnome-shell.install
-_commit=4baa091bc54856b191394c70bcedcd3fb4d1a2b5 # tags/3.36.0^0
-source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
- "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
-sha256sums=('SKIP'
- 'SKIP')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd $pkgname
-
- git submodule init
- git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
- git submodule update
-}
-
-build() {
- arch-meson $pkgname build -D gtk_doc=true
- ninja -C build
-}
-
-package() {
- depends+=(libmutter-6.so)
- DESTDIR="$pkgdir" meson install -C build
-}
Copied: gnome-shell/repos/extra-x86_64/PKGBUILD (from rev 377362, gnome-shell/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-11 09:47:26 UTC (rev 377368)
@@ -0,0 +1,54 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Flamelab <panosfilip at gmail.com
+
+pkgname=gnome-shell
+pkgver=3.36.0
+pkgrel=3
+epoch=1
+pkgdesc="Next generation desktop shell"
+url="https://wiki.gnome.org/Projects/GnomeShell"
+arch=(x86_64)
+license=(GPL2)
+depends=(accountsservice gcr gjs gnome-bluetooth upower gnome-session gnome-settings-daemon
+ gnome-themes-extra gsettings-desktop-schemas libcanberra-pulse libgdm libsecret
+ mutter nm-connection-editor unzip gstreamer libibus gnome-autoar)
+makedepends=(gtk-doc gnome-control-center evolution-data-server gobject-introspection git meson
+ sassc asciidoc)
+optdepends=('gnome-control-center: System settings'
+ 'evolution-data-server: Evolution calendar integration')
+groups=(gnome)
+install=gnome-shell.install
+_commit=4baa091bc54856b191394c70bcedcd3fb4d1a2b5 # tags/3.36.0^0
+source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
+ "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
+ 1080.patch)
+sha256sums=('SKIP'
+ 'SKIP'
+ '2e514ec86160c37c22a01803703a5bf656983634bda02b52e8f6e6542099e070')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+
+ # https://bugs.archlinux.org/task/65771
+ git apply -3 ../1080.patch
+
+ git submodule init
+ git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
+ git submodule update
+}
+
+build() {
+ arch-meson $pkgname build -D gtk_doc=true
+ ninja -C build
+}
+
+package() {
+ depends+=(libmutter-6.so)
+ DESTDIR="$pkgdir" meson install -C build
+}
Deleted: gnome-shell.install
===================================================================
--- gnome-shell.install 2020-03-11 09:47:26 UTC (rev 377367)
+++ gnome-shell.install 2020-03-11 09:47:26 UTC (rev 377368)
@@ -1,7 +0,0 @@
-post_install() {
- setcap cap_sys_nice+ep usr/bin/gnome-shell
-}
-
-post_upgrade() {
- post_install
-}
Copied: gnome-shell/repos/extra-x86_64/gnome-shell.install (from rev 377362, gnome-shell/trunk/gnome-shell.install)
===================================================================
--- gnome-shell.install (rev 0)
+++ gnome-shell.install 2020-03-11 09:47:26 UTC (rev 377368)
@@ -0,0 +1,7 @@
+post_install() {
+ setcap cap_sys_nice+ep usr/bin/gnome-shell
+}
+
+post_upgrade() {
+ post_install
+}
More information about the arch-commits
mailing list