summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTérence Clastres2019-10-17 23:53:13 +0200
committerTérence Clastres2019-10-18 00:09:08 +0200
commitbdb06566cc3c6730763eced3aaabe649b4c05388 (patch)
treedbd4e7f4126aed9cab9ce7df3da0b5e1db7da1d6
parentdd64501cdb2b26608c2bc397de308d096bb262ec (diff)
downloadaur-bdb06566cc3c6730763eced3aaabe649b4c05388.tar.gz
Sync with 3.34 branch, remove backported !761
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
2 files changed, 5 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d6aa7233a788..8f06b4fff5ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gnome-shell-performance
pkgdesc = Next generation desktop shell
- pkgver = 3.34.1
+ pkgver = 3.34.1+5+g072a9a484
pkgrel = 1
epoch = 1
url = https://wiki.gnome.org/Projects/GnomeShell
@@ -38,9 +38,9 @@ pkgbase = gnome-shell-performance
optdepends = gnome-control-center: System settings
optdepends = evolution-data-server: Evolution calendar integration
provides = gnome-shell
- provides = gnome-shell=3.34.1
+ provides = gnome-shell=3.34.1+5+g072a9a484
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
sha256sums = SKIP
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 7533939d39f7..afeb65fea18e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=gnome-shell-performance
_pkgname=gnome-shell
-pkgver=3.34.1
+pkgver=3.34.1+5+g072a9a484
pkgrel=1
epoch=1
pkgdesc="Next generation desktop shell"
@@ -23,7 +23,7 @@ groups=(gnome)
provides=(gnome-shell gnome-shell=$pkgver)
conflicts=(gnome-shell)
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"
"git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
sha256sums=('SKIP'
@@ -93,13 +93,6 @@ prepare() {
# 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'
- # 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 config --local submodule.subprojects/gvc.url "$srcdir/libgnome-volume-control"
git submodule update