metacity: downgrade to 3.34.1

3.37 is an unstable series, bring in line with our current gnome
This commit is contained in:
q66 2020-09-04 04:56:54 +02:00
parent 99b84b6cb5
commit 514e9e5435
3 changed files with 34 additions and 16 deletions

View file

@ -0,0 +1,29 @@
From 99361f28c8763ea4569b5ae9876028d53ac9a234 Mon Sep 17 00:00:00 2001
From: Alberts Muktupāvels <alberts.muktupavels@gmail.com>
Date: Sun, 24 May 2020 13:58:51 +0300
Subject: [PATCH] compositor-vulkan: fix build
VK_PHYSICAL_DEVICE_TYPE_RANGE_SIZE enum was removed in 1.2.140.
https://gitlab.gnome.org/GNOME/metacity/-/issues/10
---
src/compositor/meta-compositor-vulkan.c | 2 ++
1 file changed, 2 insertions(+)
diff --git src/compositor/meta-compositor-vulkan.c src/compositor/meta-compositor-vulkan.c
index b87b5194..53b7b3ff 100644
--- src/compositor/meta-compositor-vulkan.c
+++ src/compositor/meta-compositor-vulkan.c
@@ -810,7 +810,9 @@ device_type_to_string (VkPhysicalDeviceType type)
return "cpu";
break;
+#if VK_HEADER_VERSION < 140
case VK_PHYSICAL_DEVICE_TYPE_RANGE_SIZE:
+#endif
case VK_PHYSICAL_DEVICE_TYPE_MAX_ENUM:
default:
break;
--
GitLab

View file

@ -1,12 +0,0 @@
--- src/compositor/meta-compositor-vulkan.c 2020-03-06 18:04:14.000000000 +0100
+++ src/compositor/meta-compositor-vulkan.c 2020-09-03 20:33:53.599821164 +0200
@@ -810,7 +810,9 @@
return "cpu";
break;
+#if defined(VK_PHYSICAL_DEVICE_TYPE_RANGE_SIZE)
case VK_PHYSICAL_DEVICE_TYPE_RANGE_SIZE:
+#endif
case VK_PHYSICAL_DEVICE_TYPE_MAX_ENUM:
default:
break;

View file

@ -1,17 +1,18 @@
# Template file for 'metacity'
pkgname=metacity
version=3.37.1
reverts="3.37.1_1"
version=3.34.1
revision=1
build_style=gnu-configure
hostmakedepends="gettext gettext-devel glib-devel itstool pkg-config yelp-tools zenity"
makedepends="gsettings-desktop-schemas-devel gtk+3-devel libcanberra-devel
libglib-devel libgtop-devel libSM-devel libXcomposite-devel libXdamage-devel
libXfixes-devel libXinerama-devel libXrender-devel libXres-devel libX11-devel
pango-devel startup-notification-devel Vulkan-Headers vulkan-loader"
libXfixes-devel libXinerama-devel libXrender-devel libX11-devel pango-devel
startup-notification-devel Vulkan-Headers vulkan-loader"
depends="zenity"
short_desc="Window Manager for the GNOME environment"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/metacity"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=80d6f3d95a4328fb26d0a6471f575b742b36b8f2721f8f3c1807197fa900a126
checksum=31c7d1045c390afb3bf405735b0b26c459197cbf43af37c469eb8918ce3a453d