summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNorbert Pfeiler2018-07-25 17:59:44 +0200
committerNorbert Pfeiler2018-07-25 17:59:44 +0200
commit9552ae5429a25bf589bc6d11b633493290876376 (patch)
tree55f0f6d26d55da20b6aba2ce04aee965e76cd642
parentb17eb92f899fd762c53e70aa207fe77da5a555df (diff)
downloadaur-9552ae5429a25bf589bc6d11b633493290876376.tar.gz
3.28.3
apparently there is no strict version dep to gnome-desktop _now_
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD10
2 files changed, 12 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 631eb00c1d43..855bed4a5b2a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon May 14 14:23:54 UTC 2018
+# Wed Jul 25 15:59:11 UTC 2018
pkgbase = mutter-catalyst
pkgdesc = A window manager for GNOME with patches for catalyst compatibility
- pkgver = 3.28.2
+ pkgver = 3.28.3
pkgrel = 1
url = https://git.gnome.org/browse/mutter
arch = x86_64
@@ -18,18 +18,17 @@ pkgbase = mutter-catalyst
depends = startup-notification
depends = zenity
depends = libsm
- depends = gnome-desktop>=1:3.28.2
+ depends = gnome-desktop
depends = upower
depends = libxkbcommon-x11
depends = gnome-settings-daemon
depends = libgudev
depends = libinput
depends = pipewire
- provides = mutter=3.28.2
+ provides = mutter=3.28.3
conflicts = mutter
- conflicts = gnome-shell>3.28.2+999
- options = !emptydirs
- source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=41303bc01be873e684f11a3407aa556af2922426
+ conflicts = gnome-shell>3.28.3+999
+ source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=34f5bdeea3be10e200c52bac56763a267eb4d415
source = startup-notification.patch
source = catalyst-workaround-v2.patch
source = catalyst mutter cogl.patch
diff --git a/PKGBUILD b/PKGBUILD
index c0335e4d9554..bbade74492ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
_realname=mutter
pkgname=$_realname-catalyst
-pkgver=3.28.2
+pkgver=3.28.3
pkgrel=1
pkgdesc="A window manager for GNOME with patches for catalyst compatibility"
url="https://git.gnome.org/browse/mutter"
@@ -18,7 +18,7 @@ depends=('dconf'
'startup-notification'
'zenity'
'libsm'
- "gnome-desktop>=1:${pkgver:0:6}" # don’t build with outdated libraries
+ "gnome-desktop" # >=1:${pkgver:0:6}" # don’t build with outdated libraries
'upower'
'libxkbcommon-x11'
'gnome-settings-daemon'
@@ -33,8 +33,7 @@ makedepends=('intltool'
conflicts=('mutter' "gnome-shell>${pkgver:0:6}+999")
provides=("mutter=${pkgver}")
groups=('gnome')
-options=('!emptydirs')
-_commit=41303bc01be873e684f11a3407aa556af2922426 # tags/3.28.2^0
+_commit=34f5bdeea3be10e200c52bac56763a267eb4d415 # tags/3.28.3^0
source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
"startup-notification.patch"
"catalyst-workaround-v2.patch"
@@ -52,6 +51,9 @@ pkgver() {
prepare() {
cd "$_realname"
+ # Port to pipewire 0.2
+ git cherry-pick -n 0407a8b33d8c3503fba63ad260984bb08bd6e0dc
+
# https://bugs.archlinux.org/task/51940
# As of 2018-05-08: Still needed, according to fmuellner
patch -Np1 -i ../startup-notification.patch