diff --git a/fix_build_with_glib2_68.patch b/fix_build_with_glib2_68.patch new file mode 100644 index 0000000000000000000000000000000000000000..d428e4f8dc4dfff3f760f64d4cf12217fb65ed09 --- /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 d94a77c29a0af495ca49c96c1d03e7432e15fb54..9d022e4e1210e4ab55522bc7c3bbc68ff3a9a5e5 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