diff mbox series

[1/1] package/x11r7/xdriver_xf86-video-tdfx: fix patch fuzz

Message ID 20240707162149.302187-1-dario.binacchi@amarulasolutions.com
State New
Headers
Series [1/1] package/x11r7/xdriver_xf86-video-tdfx: fix patch fuzz |

Commit Message

Dario Binacchi July 7, 2024, 4:21 p.m. UTC 
Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.

Due to this change, xdriver_xf86-video-tdfx fails to build with output:

    Applying 0001-cross.patch using patch:
    patching file configure.ac
    Hunk #1 FAILED at 67.
    1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej

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

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 .checkpackageignore                                    | 2 +-
 package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

Comments

'Abel Vesa' via Amarula Linux July 12, 2024, 8:02 p.m. UTC | #1 
Hello Dario,

Le 07/07/2024 à 18:21, 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, xdriver_xf86-video-tdfx fails to build with output:
> 
>     Applying 0001-cross.patch using patch:
>     patching file configure.ac
>     Hunk #1 FAILED at 67.
>     1 out of 1 hunk FAILED -- saving rejects to file configure.ac.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


> ---
>  .checkpackageignore                                    | 2 +-
>  package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch | 8 +++++---
>  2 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/.checkpackageignore b/.checkpackageignore
> index 0a1d2627455e..e0c406e56592 100644
> --- a/.checkpackageignore
> +++ b/.checkpackageignore
> @@ -1560,7 +1560,7 @@ package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-pat
>  package/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch lib_patch.Upstream
>  package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch lib_patch.Sob lib_patch.Upstream
>  package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch lib_patch.Upstream
> -package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch lib_patch.Sob lib_patch.Upstream
> +package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch lib_patch.Upstream
>  package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch lib_patch.Upstream
>  package/x11r7/xserver_xorg-server/S40xorg Shellcheck lib_sysv.Variables
>  package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch lib_patch.Upstream
> diff --git a/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch b/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch
> index e53591bb0bc2..f9880afb5478 100644
> --- a/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch
> +++ b/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch
> @@ -1,8 +1,10 @@
> +[Dario: make the patch to be applied with fuzz factor 0]
> +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>  --- xf86-video-tdfx-1.3.0/configure.ac.orig	2007-06-10 21:01:54.000000000 +0200
>  +++ xf86-video-tdfx-1.3.0/configure.ac	2007-06-10 21:02:06.000000000 +0200
> -@@ -67,13 +67,20 @@
> - # Checks for header files.
> - AC_HEADER_STDC
> +@@ -75,13 +75,20 @@
> + 	      [#include "xorg-server.h"])
> + CPPFLAGS="$SAVE_CPPFLAGS"
>   
>  -if test "$DRI" != no; then
>  +if test "x$DRI" != xno; then

To unsubscribe from this group and stop receiving emails from it, send an email to linux-amarula+unsubscribe@amarulasolutions.com.
diff mbox series

Patch

diff --git a/.checkpackageignore b/.checkpackageignore
index 0a1d2627455e..e0c406e56592 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -1560,7 +1560,7 @@  package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-pat
 package/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch lib_patch.Upstream
 package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch lib_patch.Sob lib_patch.Upstream
 package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch lib_patch.Upstream
-package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch lib_patch.Sob lib_patch.Upstream
+package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch lib_patch.Upstream
 package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch lib_patch.Upstream
 package/x11r7/xserver_xorg-server/S40xorg Shellcheck lib_sysv.Variables
 package/x11vnc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch lib_patch.Upstream
diff --git a/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch b/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch
index e53591bb0bc2..f9880afb5478 100644
--- a/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch
+++ b/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch
@@ -1,8 +1,10 @@ 
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 --- xf86-video-tdfx-1.3.0/configure.ac.orig	2007-06-10 21:01:54.000000000 +0200
 +++ xf86-video-tdfx-1.3.0/configure.ac	2007-06-10 21:02:06.000000000 +0200
-@@ -67,13 +67,20 @@
- # Checks for header files.
- AC_HEADER_STDC
+@@ -75,13 +75,20 @@
+ 	      [#include "xorg-server.h"])
+ CPPFLAGS="$SAVE_CPPFLAGS"
  
 -if test "$DRI" != no; then
 +if test "x$DRI" != xno; then