Merge branch 'master' into f31

Signed-off-by: Michal Minář <miminar@redhat.com>

pango-add-harfbuzz-include.patch

@@ -0,0 +1,31 @@
+From 20e552a69e3cf3f1c3e77c9cab05e3ce191c5e3b Mon Sep 17 00:00:00 2001
+From: Roel Standaert <roel@emweb.be>
+Date: Wed, 14 Aug 2019 12:19:11 +0200
+Subject: [PATCH] Issue #7193: Pango 1.44 fix: add harfbuzz include dir
+
+---
+ cmake/WtFindPangoFt2.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cmake/WtFindPangoFt2.txt b/cmake/WtFindPangoFt2.txt
+index 5dae4cbf7..d64eeeecc 100644
+--- a/cmake/WtFindPangoFt2.txt
++++ b/cmake/WtFindPangoFt2.txt
+@@ -14,6 +14,9 @@ FIND_PATH(FT2BUILD_INCLUDE_DIR ft2build.h
+ FIND_PATH(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h
+           HINTS ${PC_PANGO_FT2_INCLUDE_DIRS})
+ 
++FIND_PATH(HARFBUZZ_INCLUDE_DIR hb.h
++          HINTS ${PC_PANGO_FT2_INCLUDE_DIRS})
++
+ FIND_PATH(GLIB2_INCLUDE_DIR glib.h
+           HINTS ${PC_PANGO_FT2_INCLUDE_DIRS})
+ 
+@@ -40,6 +43,7 @@ SET(PANGO_FT2_INCLUDE_DIRS
+     ${FT2_INCLUDE_DIR}
+     ${FT2BUILD_INCLUDE_DIR}
+     ${FONTCONFIG_INCLUDE_DIR}
++    ${HARFBUZZ_INCLUDE_DIR}
+     ${GLIB2_INCLUDE_DIR}
+     ${GLIB2_CONFIG_INCLUDE_DIR})
+ 

wt.spec

@@ -288,12 +288,6 @@ popd
 * Tue Mar 17 2020 Michal Minář <miminar@redhat.com> - 4.2.2-1
 - New upstream version 4.2.2
 
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Dec 14 2019 Jeff Law <law@redhat.com> - 4.1.0-2
-- Add missing #include for gcc-10
-
 * Mon Aug 19 2019 Michal Minář <miminar@redhat.com> - 4.1.0-1
 - New upstream version.