From 5e588f6c9f744bca061b10df32e2229d89ca0935 Mon Sep 17 00:00:00 2001 From: YangYunYi Date: Fri, 23 Jul 2021 07:02:24 +0000 Subject: [PATCH 1/4] fix build fail with glib 2.68.1 --- fix-build-with-glib2.68.patch | 13 +++++++++++++ qt5-qtwebkit.spec | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 fix-build-with-glib2.68.patch diff --git a/fix-build-with-glib2.68.patch b/fix-build-with-glib2.68.patch new file mode 100644 index 0000000..d428e4f --- /dev/null +++ b/fix-build-with-glib2.68.patch @@ -0,0 +1,13 @@ +diff -aurN qtwebkit-5.212.0-alpha4/Source/WTF/wtf/glib/GRefPtr.h qtwebkit-5.212.0-alpha4-mod/Source/WTF/wtf/glib/GRefPtr.h +--- qtwebkit-5.212.0-alpha4/Source/WTF/wtf/glib/GRefPtr.h 2020-03-04 18:16:37.000000000 +0100 ++++ qtwebkit-5.212.0-alpha4-mod/Source/WTF/wtf/glib/GRefPtr.h 2021-04-05 06:58:44.763328636 +0200 +@@ -29,9 +29,6 @@ + #include + #include + +-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 d94a77c..ff58c62 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 4 +Release: 5 Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -26,6 +26,7 @@ Source0: https://github.com/qtwebkit/qtwebkit/releases/download/%{qt_modu # Patch for new CMake policy CMP0071 to explicitly use old behaviour. Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch Patch3: fix_build_with_bison.patch +Patch4: fix_build_with_glib2.68.patch BuildRequires: bison BuildRequires: cmake @@ -232,6 +233,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Thu July 23 2021 yangyunyi - 5.212.0-5 +- fix build fail with glib 2.68.1 + * Thu Nov 12 2020 wutao - 5.212.0-4 - update to alpha4 and drop python2 module -- Gitee From 1fcbd934f9cd633a36d9734f6507db4a2aac145e Mon Sep 17 00:00:00 2001 From: YangYunYi Date: Fri, 23 Jul 2021 07:12:51 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20fix-build-wit?= =?UTF-8?q?h-glib2.68.patch=20=E4=B8=BA=20fix=5Fbuild=5Fwith=5Fglib2.68.pa?= =?UTF-8?q?tch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fix-build-with-glib2.68.patch => fix_build_with_glib2.68.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename fix-build-with-glib2.68.patch => fix_build_with_glib2.68.patch (100%) diff --git a/fix-build-with-glib2.68.patch b/fix_build_with_glib2.68.patch similarity index 100% rename from fix-build-with-glib2.68.patch rename to fix_build_with_glib2.68.patch -- Gitee From 1a640fec43ffdd8405ccb2490345a04afc8fc236 Mon Sep 17 00:00:00 2001 From: YangYunYi Date: Fri, 23 Jul 2021 07:38:04 +0000 Subject: [PATCH 3/4] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20fix=5Fbuild?= =?UTF-8?q?=5Fwith=5Fglib2.68.patch=20=E4=B8=BA=20fix=5Fbuild=5Fwith=5Fgli?= =?UTF-8?q?b2=5F68.patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fix_build_with_glib2.68.patch => fix_build_with_glib2_68.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename fix_build_with_glib2.68.patch => fix_build_with_glib2_68.patch (100%) diff --git a/fix_build_with_glib2.68.patch b/fix_build_with_glib2_68.patch similarity index 100% rename from fix_build_with_glib2.68.patch rename to fix_build_with_glib2_68.patch -- Gitee From eb6db3b1819c04643200482b15c019747f5ad87b Mon Sep 17 00:00:00 2001 From: YangYunYi Date: Fri, 23 Jul 2021 07:38:34 +0000 Subject: [PATCH 4/4] fix build fail with glib 2.68.1 --- qt5-qtwebkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index ff58c62..9d022e4 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -26,7 +26,7 @@ Source0: https://github.com/qtwebkit/qtwebkit/releases/download/%{qt_modu # Patch for new CMake policy CMP0071 to explicitly use old behaviour. Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch Patch3: fix_build_with_bison.patch -Patch4: fix_build_with_glib2.68.patch +Patch4: fix_build_with_glib2_68.patch BuildRequires: bison BuildRequires: cmake -- Gitee