Explorar o código

package/libsvgtiny: update the patches to be applied with fuzz 0

Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.

Due to this change, libsvgtiny fails to build with output:

    Applying 0004-Build-Include-gperf-generated-code-directly.patch using patch:
    patching file src/Makefile
    Hunk #1 FAILED at 1.
    1 out of 1 hunk FAILED -- saving rejects to file src/Makefile.rej

This commit refreshes the package patch on the current package version.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Dario Binacchi hai 1 ano
pai
achega
2547a3b32d

+ 5 - 3
package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch

@@ -11,6 +11,8 @@ svgtiny.c instead, which is the only place its used.
 [Retrieved from:
 https://source.netsurf-browser.org/libsvgtiny.git/commit/src?id=4390f1c84e8fee51fc22468821e6fc158e783053]
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  src/Makefile           | 13 +++++++------
  src/colors.gperf       |  8 --------
@@ -44,7 +46,7 @@ index a979720..fb8a72f 100644
 +
 +CLEAN_ITEMS := $(DIR)autogenerated_colors.c
  
- include $(NSBUILD)/Makefile.subdir
+ include build/makefiles/Makefile.subdir
 diff --git a/src/colors.gperf b/src/colors.gperf
 index 96d5b9e..a836787 100644
 --- a/src/colors.gperf
@@ -68,7 +70,7 @@ diff --git a/src/svgtiny.c b/src/svgtiny.c
 index 4661a58..bbefb88 100644
 --- a/src/svgtiny.c
 +++ b/src/svgtiny.c
-@@ -20,6 +20,9 @@
+@@ -17,6 +17,9 @@
  #include "svgtiny.h"
  #include "svgtiny_internal.h"
  
@@ -82,7 +84,7 @@ diff --git a/src/svgtiny_internal.h b/src/svgtiny_internal.h
 index 158d230..6bf5d64 100644
 --- a/src/svgtiny_internal.h
 +++ b/src/svgtiny_internal.h
-@@ -102,9 +102,4 @@ void *svgtiny_list_get(struct svgtiny_list *list,
+@@ -87,9 +87,4 @@
  void *svgtiny_list_push(struct svgtiny_list *list);
  void svgtiny_list_free(struct svgtiny_list *list);