df0b0fe691
Switch to latest release in new active upstream: https://github.com/qtwebkit/qtwebkit Migrate python2 build to python3. Drop patches that are upstream/no longer needed. Adapt/add patches to fix build issues. Rework build system to use cmake instead of qmake(which does not currently support cross compilation). Signed-off-by: James Hilliard <james.hilliard1@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
32 lines
974 B
Diff
32 lines
974 B
Diff
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.
|
|
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
|
[Retrieved from: https://github.com/qtwebkit/qtwebkit/pull/1058]
|
|
---
|
|
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 06133d82cb35..d9a1d2f145f5 100644
|
|
--- a/Source/WTF/wtf/glib/GRefPtr.h
|
|
+++ b/Source/WTF/wtf/glib/GRefPtr.h
|
|
@@ -29,9 +29,6 @@
|
|
#include <algorithm>
|
|
#include <glib.h>
|
|
|
|
-extern "C" void g_object_unref(gpointer);
|
|
-extern "C" gpointer g_object_ref_sink(gpointer);
|
|
-
|
|
namespace WTF {
|
|
|
|
enum GRefPtrAdoptType { GRefPtrAdopt };
|
|
--
|
|
2.25.1
|
|
|