fix build fail with glib 2.68.1
This commit is contained in:
parent
666c215059
commit
7454c3e2f6
13
fix_build_with_glib2_68.patch
Normal file
13
fix_build_with_glib2_68.patch
Normal file
@ -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 <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 };
|
||||||
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
Name: qt5-%{qt_module}
|
Name: qt5-%{qt_module}
|
||||||
Version: 5.212.0
|
Version: 5.212.0
|
||||||
Release: 4
|
Release: 5
|
||||||
Summary: Qt5 - QtWebKit components
|
Summary: Qt5 - QtWebKit components
|
||||||
|
|
||||||
License: LGPLv2 and BSD
|
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.
|
# Patch for new CMake policy CMP0071 to explicitly use old behaviour.
|
||||||
Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch
|
Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch
|
||||||
Patch3: fix_build_with_bison.patch
|
Patch3: fix_build_with_bison.patch
|
||||||
|
Patch4: fix_build_with_glib2_68.patch
|
||||||
|
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
@ -232,6 +233,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)"
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu July 23 2021 yangyunyi <yangyunyi2@huawei.com> - 5.212.0-5
|
||||||
|
- fix build fail with glib 2.68.1
|
||||||
|
|
||||||
* Thu Nov 12 2020 wutao <wutao61@huawei.com> - 5.212.0-4
|
* Thu Nov 12 2020 wutao <wutao61@huawei.com> - 5.212.0-4
|
||||||
- update to alpha4 and drop python2 module
|
- update to alpha4 and drop python2 module
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user