Message ID | 20240702195555.2498129-1-dario.binacchi@amarulasolutions.com |
---|---|
State | New |
Headers | show |
Series |
|
Related | show |
Hello Dario, Le 02/07/2024 à 21:55, Dario Binacchi a écrit : > Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum > fuzz factor to 0") reduced the fuzz factor. > > Due to this change, libsvg fails to build with output: > > Applying 0001-fix-expat-static-declaration.patch using patch: > patching file src/svg_parser_expat.c > Hunk #2 FAILED at 44. > 1 out of 2 hunks FAILED -- saving rejects to file src/svg_parser_expat.c.rej > > This commit refreshes the package patch on the current package version. > > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> Applied to master, thanks. Best regards, Romain > --- > package/libsvg/0001-fix-expat-static-declaration.patch | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/libsvg/0001-fix-expat-static-declaration.patch b/package/libsvg/0001-fix-expat-static-declaration.patch > index 58ef286729f1..1086785d0f0b 100644 > --- a/package/libsvg/0001-fix-expat-static-declaration.patch > +++ b/package/libsvg/0001-fix-expat-static-declaration.patch > @@ -12,6 +12,8 @@ Patch based on > http://oe-lite.org/redmine/projects/xorg/repository/revisions/c4df7951e846e1be718f37f2455696a1d0861f3d/entry/recipes/cairo/libsvg-0.1.4/gcc4_and_expat.patch > > Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com> > +[Dario: make the patch to be applied with fuzz factor 0] > +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > > diff -bur libsvg-0.1.4~orig/src/svg_parser_expat.c libsvg-0.1.4/src/svg_parser_expat.c > --- libsvg-0.1.4~orig/src/svg_parser_expat.c 2005-02-14 11:26:26.000000000 -0600 > @@ -31,3 +33,4 @@ diff -bur libsvg-0.1.4~orig/src/svg_parser_expat.c libsvg-0.1.4/src/svg_parser_e > +#endif > > static void > + _svg_parser_sax_warning (void *closure, To unsubscribe from this group and stop receiving emails from it, send an email to linux-amarula+unsubscribe@amarulasolutions.com.
diff --git a/package/libsvg/0001-fix-expat-static-declaration.patch b/package/libsvg/0001-fix-expat-static-declaration.patch index 58ef286729f1..1086785d0f0b 100644 --- a/package/libsvg/0001-fix-expat-static-declaration.patch +++ b/package/libsvg/0001-fix-expat-static-declaration.patch @@ -12,6 +12,8 @@ Patch based on http://oe-lite.org/redmine/projects/xorg/repository/revisions/c4df7951e846e1be718f37f2455696a1d0861f3d/entry/recipes/cairo/libsvg-0.1.4/gcc4_and_expat.patch Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com> +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> diff -bur libsvg-0.1.4~orig/src/svg_parser_expat.c libsvg-0.1.4/src/svg_parser_expat.c --- libsvg-0.1.4~orig/src/svg_parser_expat.c 2005-02-14 11:26:26.000000000 -0600 @@ -31,3 +33,4 @@ diff -bur libsvg-0.1.4~orig/src/svg_parser_expat.c libsvg-0.1.4/src/svg_parser_e +#endif static void + _svg_parser_sax_warning (void *closure,
Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, libsvg fails to build with output: Applying 0001-fix-expat-static-declaration.patch using patch: patching file src/svg_parser_expat.c Hunk #2 FAILED at 44. 1 out of 2 hunks FAILED -- saving rejects to file src/svg_parser_expat.c.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- package/libsvg/0001-fix-expat-static-declaration.patch | 3 +++ 1 file changed, 3 insertions(+)