fix build with glib2 >= 2.68

from https://github.com/qtwebkit/qtwebkit/pull/1058

diff --git a/glib2.68.patch b/glib2.68.patch
new file mode 100644 (file)
index 0000000..53edd03
--- /dev/null
+++ b/glib2.68.patch
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35d..d9a1d2f145f50 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <wtf/RefPtr.h>
+ #include <algorithm>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };

diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index f4862637d7feef3b649e8da6f0416a908dcea487..a3a1ad68e2791e7c7c1d4bc210e77d87c249d257 100644 (file)
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -42,6 +42,7 @@ Source0:      https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-%{versi
 # Source0-md5: 5b61a72497f06e51db09d57edc3c35fb
 Patch0:                %{name}-css.patch
 Patch1:                %{name}-docs.patch
+Patch2:                glib2.68.patch
 # from FC
 Patch102:      qtwebkit-5.212.0_cmake_cmp0071.patch
 Patch108:      x32.patch
@@ -191,6 +192,7 @@ Dokumentacja do bibliotek Qt5 WebKit w formacie QCH.
 %setup -q -n qtwebkit-%{version}-%{snap}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch102 -p1
 %patch108 -p1