1
0
Fork 0

Sync to gnome-40

This commit is contained in:
Térence Clastres 2021-07-01 14:58:34 +02:00
parent 3ea150f68d
commit 3ae4cd0520
2 changed files with 8 additions and 13 deletions

View file

@ -1,7 +1,7 @@
pkgbase = gnome-shell-performance pkgbase = gnome-shell-performance
pkgdesc = Next generation desktop shell pkgdesc = Next generation desktop shell
pkgver = 40.1 pkgver = 40.2+2+g8e5e7821a
pkgrel = 2 pkgrel = 1
epoch = 1 epoch = 1
url = https://wiki.gnome.org/Projects/GnomeShell url = https://wiki.gnome.org/Projects/GnomeShell
install = gnome-shell-performance.install install = gnome-shell-performance.install
@ -42,10 +42,10 @@ pkgbase = gnome-shell-performance
optdepends = gnome-control-center: System settings optdepends = gnome-control-center: System settings
optdepends = evolution-data-server: Evolution calendar integration optdepends = evolution-data-server: Evolution calendar integration
provides = gnome-shell provides = gnome-shell
provides = gnome-shell=40.1 provides = gnome-shell=40.2+2+g8e5e7821a
provides = gnome-shell=1:40.1 provides = gnome-shell=1:40.2+2+g8e5e7821a
conflicts = gnome-shell 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 source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
sha256sums = SKIP sha256sums = SKIP
sha256sums = SKIP sha256sums = SKIP
@ -73,4 +73,3 @@ pkgname = gnome-shell-performance
depends = gnome-disk-utility depends = gnome-disk-utility
depends = gst-plugin-pipewire depends = gst-plugin-pipewire
depends = libmutter-8.so depends = libmutter-8.so

View file

@ -14,8 +14,8 @@ _merge_requests_to_use=()
pkgname=gnome-shell-performance pkgname=gnome-shell-performance
_pkgname=gnome-shell _pkgname=gnome-shell
pkgver=40.1 pkgver=40.2+2+g8e5e7821a
pkgrel=2 pkgrel=1
epoch=1 epoch=1
pkgdesc="Next generation desktop shell" pkgdesc="Next generation desktop shell"
url="https://wiki.gnome.org/Projects/GnomeShell" url="https://wiki.gnome.org/Projects/GnomeShell"
@ -34,7 +34,7 @@ groups=(gnome)
provides=(gnome-shell gnome-shell=$pkgver gnome-shell=$epoch:$pkgver) provides=(gnome-shell gnome-shell=$pkgver gnome-shell=$epoch:$pkgver)
conflicts=(gnome-shell) conflicts=(gnome-shell)
install=$pkgname.install 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" source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
"git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git") "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
sha256sums=('SKIP' sha256sums=('SKIP'
@ -75,10 +75,6 @@ pick_mr() {
prepare() { prepare() {
cd $_pkgname 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 ### Adding and fetching remotes providing the selected merge-requests
### Only needed when there is no MR opened ### Only needed when there is no MR opened