diff --git a/0001-build-Fix-vulkan-reference-in-pc-file.patch b/0001-build-Fix-vulkan-reference-in-pc-file.patch new file mode 100644 index 0000000..817b71e --- /dev/null +++ b/0001-build-Fix-vulkan-reference-in-pc-file.patch @@ -0,0 +1,28 @@ +From 7d5826ccf7a8d5ad39f370a3f214e4811ca1075b Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +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 + diff --git a/gtk4.spec b/gtk4.spec index cdda821..89f4b24 100644 --- a/gtk4.spec +++ b/gtk4.spec @@ -17,17 +17,20 @@ Name: gtk4 Version: 4.0.0 -Release: 1%{?dist} +Release: 3%{?dist} Summary: GTK graphical user interface library License: LGPLv2+ URL: https://www.gtk.org Source0: https://download.gnome.org/sources/gtk/4.0/gtk-%{version}.tar.xz Patch0: %{name}-gcc11.patch +Patch1: 0001-build-Fix-vulkan-reference-in-pc-file.patch BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: docbook-style-xsl +BuildRequires: gtk-doc +BuildRequires: pandoc BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gettext @@ -112,7 +115,17 @@ Requires: gtk4%{?_isa} = %{version}-%{release} %description devel This package contains the libraries and header files that are needed -for writing applications with version 4 of the GTK widget toolkit. +for writing applications with version 4 of the GTK widget toolkit. If +you plan to develop applications with GTK, consider installing the +gtk4-devel-docs package. + +%package devel-docs +Summary: Developer documentation for GTK +Requires: gtk4 = %{version}-%{release} + +%description devel-docs +This package contains developer documentation for version 4 of the GTK +widget toolkit. %prep %autosetup -p1 -n gtk-%{version} @@ -129,11 +142,13 @@ export CFLAGS='-fno-strict-aliasing %optflags' -Dmedia-gstreamer=enabled \ -Dxinerama=enabled \ -Dcolord=enabled \ - -Dgtk_doc=false \ + -Dgtk_doc=true \ -Dman-pages=true \ -Dinstall-tests=false %meson_build +# Workaround for https://github.com/mesonbuild/meson/issues/8117 +%meson_build gtk4-doc:custom %install %meson_install @@ -215,7 +230,16 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_mandir}/man1/gtk4-query-settings.1* %{_mandir}/man1/gtk4-widget-factory.1* +%files devel-docs +%{_datadir}/gtk-doc + %changelog +* Sat Jan 09 2021 Kalev Lember - 4.0.0-3 +- Fix vulkan reference in pc file + +* Tue Dec 22 14:13:09 +04 2020 Marc-André Lureau - 4.0.0-2 +- Add back gtk4-devel-docs + * Wed Dec 16 2020 Kalev Lember - 4.0.0-1 - Update to 4.0.0 - Tighten soname globs