Skip to content

Commit 0aa7967

Browse files
passgatjacmet
authored andcommitted
package/qt5/qt5webkit: fix patch fuzz
Commit 8f88a64 ("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 <[email protected]> Signed-off-by: Thomas Petazzoni <[email protected]> (cherry picked from commit 6d0cce7) Signed-off-by: Peter Korsgaard <[email protected]>
1 parent 648478e commit 0aa7967

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ g_object_ref_sink is defined as a macro meanwhile and so the build fails.
88
Just remove the declarations, glib.h is included anyway.
99
Signed-off-by: James Hilliard <[email protected]>
1010
[Retrieved from: https://github.com/qtwebkit/qtwebkit/pull/1058]
11+
[Dario: make the patch to be applied with fuzz factor 0]
12+
Signed-off-by: Dario Binacchi <[email protected]>
1113
---
1214
Source/WTF/wtf/glib/GRefPtr.h | 3 ---
1315
1 file changed, 3 deletions(-)
@@ -17,8 +19,8 @@ index 06133d82cb35..d9a1d2f145f5 100644
1719
--- a/Source/WTF/wtf/glib/GRefPtr.h
1820
+++ b/Source/WTF/wtf/glib/GRefPtr.h
1921
@@ -29,9 +29,6 @@
22+
#include <wtf/RefPtr.h>
2023
#include <algorithm>
21-
#include <glib.h>
2224

2325
-extern "C" void g_object_unref(gpointer);
2426
-extern "C" gpointer g_object_ref_sink(gpointer);

0 commit comments

Comments
 (0)