summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTérence Clastres2020-06-16 15:37:43 +0200
committerTérence Clastres2020-06-16 15:37:43 +0200
commit354f23173840b20f6f625209be5bb1b31d62df2c (patch)
treec80368732987f3085fa866602d09fa3400e155db
parent1d53cac11003e7b340e568a6234ce1b7377d2386 (diff)
downloadaur-354f23173840b20f6f625209be5bb1b31d62df2c.tar.gz
Sync to gnome-3-36
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD8
2 files changed, 9 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5bad761d8abd..fd1133006954 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gnome-shell-performance
pkgdesc = Next generation desktop shell
- pkgver = 3.36.2+46+gb148a8bc6
- pkgrel = 2
+ pkgver = 3.36.3+8+gbda8ba5ed
+ pkgrel = 1
epoch = 1
url = https://wiki.gnome.org/Projects/GnomeShell
install = gnome-shell-performance.install
@@ -40,10 +40,10 @@ pkgbase = gnome-shell-performance
optdepends = evolution-data-server: Evolution calendar integration
optdepends = gjs-git: Needed if using MR !1164
provides = gnome-shell
- provides = gnome-shell=3.36.2+46+gb148a8bc6
- provides = gnome-shell=1:3.36.2+46+gb148a8bc6
+ provides = gnome-shell=3.36.3+8+gbda8ba5ed
+ provides = gnome-shell=1:3.36.3+8+gbda8ba5ed
conflicts = gnome-shell
- source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=b148a8bc6093d18ba28dee33512f0545abd041d3
+ source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=bda8ba5ed1768ef9bbd5fdf9a9933ef77ed1f94f
source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
source = 1126.diff
sha256sums = SKIP
@@ -71,4 +71,3 @@ pkgname = gnome-shell-performance
depends = gnome-autoar
depends = gnome-disk-utility
depends = libmutter-6.so
-
diff --git a/PKGBUILD b/PKGBUILD
index 39a7291a228f..44c090fca850 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,8 +14,8 @@ _merge_requests_to_use=() # safe pick
pkgname=gnome-shell-performance
_pkgname=gnome-shell
-pkgver=3.36.2+46+gb148a8bc6
-pkgrel=2
+pkgver=3.36.3+8+gbda8ba5ed
+pkgrel=1
epoch=1
pkgdesc="Next generation desktop shell"
url="https://wiki.gnome.org/Projects/GnomeShell"
@@ -33,7 +33,7 @@ groups=(gnome)
provides=(gnome-shell gnome-shell=$pkgver gnome-shell=$epoch:$pkgver)
conflicts=(gnome-shell)
install=$pkgname.install
-_commit=b148a8bc6093d18ba28dee33512f0545abd041d3 # tags/3.36.2^46
+_commit=bda8ba5ed1768ef9bbd5fdf9a9933ef77ed1f94f # tags/3.36.3^8
source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
"git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
"1126.diff")
@@ -155,7 +155,7 @@ prepare() {
build() {
arch-meson $_pkgname build -D gtk_doc=true
- ninja -C build
+ meson compile -C build
}
package() {