From 514e9e54350308ef9b8c0fb2ca97b4e311ddf565 Mon Sep 17 00:00:00 2001 From: q66 Date: Fri, 4 Sep 2020 04:56:54 +0200 Subject: [PATCH] metacity: downgrade to 3.34.1 3.37 is an unstable series, bring in line with our current gnome --- .../patches/compositor-vulkan-fix-build.patch | 29 +++++++++++++++++++ srcpkgs/metacity/patches/vulkan-macro.patch | 12 -------- srcpkgs/metacity/template | 9 +++--- 3 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 srcpkgs/metacity/patches/compositor-vulkan-fix-build.patch delete mode 100644 srcpkgs/metacity/patches/vulkan-macro.patch diff --git a/srcpkgs/metacity/patches/compositor-vulkan-fix-build.patch b/srcpkgs/metacity/patches/compositor-vulkan-fix-build.patch new file mode 100644 index 0000000000..960582ded7 --- /dev/null +++ b/srcpkgs/metacity/patches/compositor-vulkan-fix-build.patch @@ -0,0 +1,29 @@ +From 99361f28c8763ea4569b5ae9876028d53ac9a234 Mon Sep 17 00:00:00 2001 +From: Alberts Muktupāvels +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 + diff --git a/srcpkgs/metacity/patches/vulkan-macro.patch b/srcpkgs/metacity/patches/vulkan-macro.patch deleted file mode 100644 index d98b4946a9..0000000000 --- a/srcpkgs/metacity/patches/vulkan-macro.patch +++ /dev/null @@ -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; diff --git a/srcpkgs/metacity/template b/srcpkgs/metacity/template index 0ef8968c40..5aa231492e 100644 --- a/srcpkgs/metacity/template +++ b/srcpkgs/metacity/template @@ -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 " 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