package/qt5/qt5webkit: fix patch fuzz
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>
This commit is contained in:
parent
7e0a94b70f
commit
50911222d2
@ -8,6 +8,8 @@ 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(-)
|
||||
@ -17,8 +19,8 @@ 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>
|
||||
#include <glib.h>
|
||||
|
||||
-extern "C" void g_object_unref(gpointer);
|
||||
-extern "C" gpointer g_object_ref_sink(gpointer);
|
||||
|
Loading…
Reference in New Issue
Block a user