summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTérence Clastres2021-07-01 14:58:34 +0200
committerTérence Clastres2021-07-01 14:58:34 +0200
commit3ae4cd05201db5727ea206f12b1410b85aa7f52c (patch)
treeb3f59a40d1e82b341897ee09c6a23ec57e633a82
parent3ea150f68d6843b6a4e2958540699b2108a3eb31 (diff)
downloadaur-3ae4cd05201db5727ea206f12b1410b85aa7f52c.tar.gz
Sync to gnome-40
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD10
2 files changed, 8 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 08586a4fbfbe..72c013dc2949 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gnome-shell-performance
pkgdesc = Next generation desktop shell
- pkgver = 40.1
- pkgrel = 2
+ pkgver = 40.2+2+g8e5e7821a
+ pkgrel = 1
epoch = 1
url = https://wiki.gnome.org/Projects/GnomeShell
install = gnome-shell-performance.install
@@ -42,10 +42,10 @@ pkgbase = gnome-shell-performance
optdepends = gnome-control-center: System settings
optdepends = evolution-data-server: Evolution calendar integration
provides = gnome-shell
- provides = gnome-shell=40.1
- provides = gnome-shell=1:40.1
+ provides = gnome-shell=40.2+2+g8e5e7821a
+ provides = gnome-shell=1:40.2+2+g8e5e7821a
conflicts = gnome-shell
- source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=8e644ec39b5ac5b3fd22ceff3a7c0f8d897aa1da
+ source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=8e5e7821a6da1e4c73f19880889f2c7e7dd557ba
source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
sha256sums = SKIP
sha256sums = SKIP
@@ -73,4 +73,3 @@ pkgname = gnome-shell-performance
depends = gnome-disk-utility
depends = gst-plugin-pipewire
depends = libmutter-8.so
-
diff --git a/PKGBUILD b/PKGBUILD
index 515b2d043b16..0da8e82103f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,8 +14,8 @@ _merge_requests_to_use=()
pkgname=gnome-shell-performance
_pkgname=gnome-shell
-pkgver=40.1
-pkgrel=2
+pkgver=40.2+2+g8e5e7821a
+pkgrel=1
epoch=1
pkgdesc="Next generation desktop shell"
url="https://wiki.gnome.org/Projects/GnomeShell"
@@ -34,7 +34,7 @@ groups=(gnome)
provides=(gnome-shell gnome-shell=$pkgver gnome-shell=$epoch:$pkgver)
conflicts=(gnome-shell)
install=$pkgname.install
-_commit=8e644ec39b5ac5b3fd22ceff3a7c0f8d897aa1da # tags/40.1^0
+_commit=8e5e7821a6da1e4c73f19880889f2c7e7dd557ba # tags/40.2^2
source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
"git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
sha256sums=('SKIP'
@@ -75,10 +75,6 @@ pick_mr() {
prepare() {
cd $_pkgname
- # https://bugs.archlinux.org/task/70851
- # https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1850
- git cherry-pick -n d9239e2cee27cad582544e769ad794ca571f35fb
-
### Adding and fetching remotes providing the selected merge-requests
### Only needed when there is no MR opened