Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gtk4.git#56946bcae5f105d7015fbad2305161482f7d64a0

.gitignore

@@ -19,3 +19,4 @@
 /gtk-4.0.2.tar.xz
 /gtk-4.1.0.tar.xz
 /gtk-4.1.1.tar.xz
+/gtk-4.1.2.tar.xz

gtk4.spec

@@ -16,7 +16,7 @@
 %global __provides_exclude_from ^%{_libdir}/gtk-4.0
 
 Name:           gtk4
-Version:        4.1.1
+Version:        4.1.2
 Release:        1%{?dist}
 Summary:        GTK graphical user interface library
 
@@ -27,8 +27,6 @@ Source0:        https://download.gnome.org/sources/gtk/4.1/gtk-%{version}.tar.xz
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-style-xsl
-BuildRequires:  gtk-doc
-BuildRequires:  pandoc
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
@@ -47,6 +45,7 @@ BuildRequires:  pkgconfig(gstreamer-player-1.0)
 BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(pango) >= %{pango_version}
 BuildRequires:  pkgconfig(rest-0.7)
+BuildRequires:  pkgconfig(sysprof-4)
 BuildRequires:  pkgconfig(sysprof-capture-4)
 BuildRequires:  pkgconfig(vulkan)
 BuildRequires:  pkgconfig(wayland-client) >= %{wayland_version}
@@ -62,7 +61,6 @@ BuildRequires:  pkgconfig(xinerama)
 BuildRequires:  pkgconfig(xkbcommon)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xrender)
-BuildRequires:  pkgconfig(xrender)
 BuildRequires:  /usr/bin/xsltproc
 
 # standard icons
@@ -84,20 +82,10 @@ Requires: pango%{?_isa} >= %{pango_version}
 Requires: gdk-pixbuf2-modules%{?_isa}
 
 # make sure we have a reasonable gsettings backend
-%if 0%{?fedora}
 Recommends: dconf%{?_isa}
-%else
-Requires: dconf%{?_isa}
-%endif
 
-# Removed in F29
-Obsoletes: gtk4-immodules < 3.94.0
-Obsoletes: gtk4-immodule-xim < 3.94.0
-
-# Removed in F30
-Obsoletes: gtk4-tests < 3.96.0
-# Removed in F32
-Obsoletes: gtk4-devel-docs < 3.98.3
+# Removed in F34
+Obsoletes: gtk4-devel-docs < 4.1.2
 
 %description
 GTK is a multi-platform toolkit for creating graphical user
@@ -113,17 +101,7 @@ 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. 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.
+for writing applications with version 4 of the GTK widget toolkit.
 
 %prep
 %autosetup -p1 -n gtk-%{version}
@@ -142,13 +120,11 @@ export CFLAGS='-fno-strict-aliasing -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT %
         -Dsysprof=enabled \
         -Dcolord=enabled \
         -Dsassc=disabled \
-        -Dgtk_doc=true \
+        -Dgtk_doc=false \
         -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
@@ -230,10 +206,12 @@ 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
+* Mon Mar 15 2021 Kalev Lember <klember@redhat.com> - 4.1.2-1
+- Update to 4.1.2
+- Disable gtk-doc support as we don't have gi-docgen in Fedora yet
+- Remove old obsoletes
+
 * Wed Feb 24 2021 Kalev Lember <klember@redhat.com> - 4.1.1-1
 - Update to 4.1.1
 - Enable sysprof support

sources

@@ -1 +1 @@
-SHA512 (gtk-4.1.1.tar.xz) = dc2b33598ecfbb1e830d0e63e5658a3947ea5326063f91a75d4f57dd2fb1b345da71bfd6048c967110eaf100d4c0f6b05fac36a52f503fd06e968be40a5d8b1e
+SHA512 (gtk-4.1.2.tar.xz) = cb3f91ff64d3139f41ab2c1dba16578702fab0c5d39e9bf1f09b350e0447f50199a0b80a5a26b3259780ff9f2255d8ab76cca48615980f120c911ff71087d49a