Fix vulkan reference in pc file

This commit is contained in:
Kalev Lember 2021-01-09 19:42:00 +01:00
parent 4c11cc4556
commit fc76fadd2b
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From 7d5826ccf7a8d5ad39f370a3f214e4811ca1075b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 27 Dec 2020 06:42:29 +0100
Subject: [PATCH] build: Fix vulkan reference in pc file
A mistake in string concatenation caused the vulcan dependency to be omitted.
Fixes: https://gitlab.gnome.org/GNOME/gtk/-/issues/3517
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index bb58717f6a..60e7729a8e 100644
--- a/meson.build
+++ b/meson.build
@@ -723,7 +723,7 @@ if cairogobj_pkg_found
endif
if vulkan_pkg_found
- gdk_packages += 'vulkan'
+ gdk_packages += ' vulkan'
endif
pkgconf.set('GDK_PACKAGES', gdk_packages)
--
2.29.2

View File

@ -17,13 +17,14 @@
Name: gtk4 Name: gtk4
Version: 4.0.0 Version: 4.0.0
Release: 2%{?dist} Release: 3%{?dist}
Summary: GTK graphical user interface library Summary: GTK graphical user interface library
License: LGPLv2+ License: LGPLv2+
URL: https://www.gtk.org URL: https://www.gtk.org
Source0: https://download.gnome.org/sources/gtk/4.0/gtk-%{version}.tar.xz Source0: https://download.gnome.org/sources/gtk/4.0/gtk-%{version}.tar.xz
Patch0: %{name}-gcc11.patch Patch0: %{name}-gcc11.patch
Patch1: 0001-build-Fix-vulkan-reference-in-pc-file.patch
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -233,6 +234,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_datadir}/gtk-doc %{_datadir}/gtk-doc
%changelog %changelog
* Sat Jan 09 2021 Kalev Lember <klember@redhat.com> - 4.0.0-3
- Fix vulkan reference in pc file
* Tue Dec 22 14:13:09 +04 2020 Marc-André Lureau <marcandre.lureau@redhat.com> - 4.0.0-2 * Tue Dec 22 14:13:09 +04 2020 Marc-André Lureau <marcandre.lureau@redhat.com> - 4.0.0-2
- Add back gtk4-devel-docs - Add back gtk4-devel-docs