From d87a0c542420987cf5616ec9e8c3c69da9eb2442 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Thu, 16 Sep 2021 11:24:40 +0200
Subject: [PATCH] Fixed FTBFS with glib2

---
 qtwebkit.spec                  | 10 +++++++++-
 webkit-qtwebkit-23-glib2.patch | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 webkit-qtwebkit-23-glib2.patch

diff --git a/qtwebkit.spec b/qtwebkit.spec
index 134161b..06d924c 100644
--- a/qtwebkit.spec
+++ b/qtwebkit.spec
@@ -10,7 +10,7 @@ Name: qtwebkit
 Summary: Qt WebKit bindings
 
 Version: 2.3.4
-Release: 34%{?dist}
+Release: 35%{?dist}
 
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 URL: http://trac.webkit.org/wiki/QtWebKit
@@ -46,6 +46,8 @@ Patch100: webkit-qtwebkit-23-gcc5.patch
 Patch101: webkit-qtwebkit-23-private_browsing.patch
 # fix FTBFS with bison-3.7
 Patch102: qtwebkit-bison-3.7.patch
+# fix FTBFS wtih glib ≥ 2.68
+Patch103: webkit-qtwebkit-23-glib2.patch
 
 BuildRequires: make
 BuildRequires: bison
@@ -137,6 +139,9 @@ Provides:  qt4-webkit-devel%{?_isa} = 2:%{version}-%{release}
 %if 0%{?fedora} > 33 || 0%{?rhel} > 8
 %patch102 -p1 -b .bison37
 %endif
+%if 0%{?fedora} > 34 || 0%{?rhel} > 8
+%patch103 -p1 -b .glib2
+%endif
 
 install -m755 -D %{SOURCE1} bin/qmake
 
@@ -202,6 +207,9 @@ popd
 
 
 %changelog
+* Thu Sep 16 2021 Than Ngo <than@redhat.com> - 2.3.4-35
+- Fixed FTBFS with glib2
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-34
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/webkit-qtwebkit-23-glib2.patch b/webkit-qtwebkit-23-glib2.patch
new file mode 100644
index 0000000..7191345
--- /dev/null
+++ b/webkit-qtwebkit-23-glib2.patch
@@ -0,0 +1,14 @@
+diff -up webkit-qtwebkit-23/Source/WTF/wtf/gobject/GRefPtr.h.me webkit-qtwebkit-23/Source/WTF/wtf/gobject/GRefPtr.h
+--- webkit-qtwebkit-23/Source/WTF/wtf/gobject/GRefPtr.h.me	2021-09-16 10:00:33.214875944 +0200
++++ webkit-qtwebkit-23/Source/WTF/wtf/gobject/GRefPtr.h	2021-09-16 10:00:51.055293899 +0200
+@@ -28,9 +28,7 @@
+ #include <wtf/AlwaysInline.h>
+ #include <wtf/RefPtr.h>
+ #include <algorithm>
+-
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
++#include <glib.h>
+ 
+ namespace WTF {
+