50911222d2
Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.
Due to this change, qt5webkit fails to build with output:
Applying 0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch using patch:
patching file Source/WTF/wtf/glib/GRefPtr.h
Hunk #1 FAILED at 29.
1 out of 1 hunk FAILED -- saving rejects to file Source/WTF/wtf/glib/GRefPtr.h.rej
This commit refreshes the package patch on the current package version.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 6d0cce7dab6cbfad02edd27254b548948612432e)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
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]
|
|
[Dario: make the patch to be applied with fuzz factor 0]
|
|
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
|
|
---
|
|
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 <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 };
|
|
--
|
|
2.25.1
|
|
|