Sync with 3.34 branch, remove backported !761
This commit is contained in:
parent
dd64501cdb
commit
bdb06566cc
2 changed files with 5 additions and 12 deletions
6
.SRCINFO
6
.SRCINFO
|
@ -1,6 +1,6 @@
|
||||||
pkgbase = gnome-shell-performance
|
pkgbase = gnome-shell-performance
|
||||||
pkgdesc = Next generation desktop shell
|
pkgdesc = Next generation desktop shell
|
||||||
pkgver = 3.34.1
|
pkgver = 3.34.1+5+g072a9a484
|
||||||
pkgrel = 1
|
pkgrel = 1
|
||||||
epoch = 1
|
epoch = 1
|
||||||
url = https://wiki.gnome.org/Projects/GnomeShell
|
url = https://wiki.gnome.org/Projects/GnomeShell
|
||||||
|
@ -38,9 +38,9 @@ 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=3.34.1
|
provides = gnome-shell=3.34.1+5+g072a9a484
|
||||||
conflicts = gnome-shell
|
conflicts = gnome-shell
|
||||||
source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=986600ab31383724e2eeb4fe2475b3d7fcfb54fc
|
source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=072a9a4842673355535098edd4748d689b913bf1
|
||||||
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
|
||||||
|
|
11
PKGBUILD
11
PKGBUILD
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
pkgname=gnome-shell-performance
|
pkgname=gnome-shell-performance
|
||||||
_pkgname=gnome-shell
|
_pkgname=gnome-shell
|
||||||
pkgver=3.34.1
|
pkgver=3.34.1+5+g072a9a484
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
epoch=1
|
epoch=1
|
||||||
pkgdesc="Next generation desktop shell"
|
pkgdesc="Next generation desktop shell"
|
||||||
|
@ -23,7 +23,7 @@ groups=(gnome)
|
||||||
provides=(gnome-shell gnome-shell=$pkgver)
|
provides=(gnome-shell gnome-shell=$pkgver)
|
||||||
conflicts=(gnome-shell)
|
conflicts=(gnome-shell)
|
||||||
install=$pkgname.install
|
install=$pkgname.install
|
||||||
_commit=986600ab31383724e2eeb4fe2475b3d7fcfb54fc # tags/3.34.1^0
|
_commit=072a9a4842673355535098edd4748d689b913bf1 # tags/3.34.1^5
|
||||||
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'
|
||||||
|
@ -93,13 +93,6 @@ prepare() {
|
||||||
# Comment: Crash fix for st_theme_get_custom_stylesheets
|
# Comment: Crash fix for st_theme_get_custom_stylesheets
|
||||||
git_cp_by_msg '!536' 'st-theme: Use CRStyleSheet app_data instead of hash map' 'st-theme: Use glib auto free/ptr features'
|
git_cp_by_msg '!536' 'st-theme: Use CRStyleSheet app_data instead of hash map' 'st-theme: Use glib auto free/ptr features'
|
||||||
|
|
||||||
# Title: environment: Only disable unredirection of ongoing transitions
|
|
||||||
# URL: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/761
|
|
||||||
# Type: 3
|
|
||||||
# Status: 4
|
|
||||||
# Comment: Fix unredirection broken on a fullscreen game after triggering animations
|
|
||||||
git cherry-pick -n 38ad1d7c
|
|
||||||
|
|
||||||
git submodule init
|
git submodule init
|
||||||
git config --local submodule.subprojects/gvc.url "$srcdir/libgnome-volume-control"
|
git config --local submodule.subprojects/gvc.url "$srcdir/libgnome-volume-control"
|
||||||
git submodule update
|
git submodule update
|
||||||
|
|
Loading…
Add table
Reference in a new issue