Refresh patches

2 files changed, 24 insertions, 14 deletions

diff --git a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
index 475bf7734..bb0c33899 100644
--- a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
+++ b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
@@ -8,9 +8,11 @@ Signed-off-by: Cyril Brulebois <kibi@debian.org>
 [jcristau: forward-ported from 1.7 to 1.8]
 Signed-off-by: Julien Cristau <jcristau@debian.org>
 ---
---- a/configure.ac
-+++ b/configure.ac
-@@ -1356,7 +1356,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t
+Index: xorg-server/configure.ac
+===================================================================
+--- xorg-server.orig/configure.ac
++++ xorg-server/configure.ac
+@@ -1315,7 +1315,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t
  
  # SHA1 hashing
  AC_ARG_WITH([sha1],
@@ -19,7 +21,7 @@ Signed-off-by: Julien Cristau <jcristau@debian.org>
                              [choose SHA1 implementation])])
  AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes])
  if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then
-@@ -1439,6 +1439,16 @@ if test "x$with_sha1" = xlibcrypto; then
+@@ -1398,6 +1398,16 @@ if test "x$with_sha1" = xlibcrypto; then
  		SHA1_CFLAGS="$OPENSSL_CFLAGS"
  	fi
  fi
@@ -36,8 +38,10 @@ Signed-off-by: Julien Cristau <jcristau@debian.org>
  AC_MSG_CHECKING([for SHA1 implementation])
  if test "x$with_sha1" = x; then
  	AC_MSG_ERROR([No suitable SHA1 implementation found])
---- a/include/dix-config.h.in
-+++ b/include/dix-config.h.in
+Index: xorg-server/include/dix-config.h.in
+===================================================================
+--- xorg-server.orig/include/dix-config.h.in
++++ xorg-server/include/dix-config.h.in
 @@ -175,6 +175,9 @@
  /* Define to use libsha1 for SHA1 */
  #undef HAVE_SHA1_IN_LIBSHA1
@@ -48,8 +52,10 @@ Signed-off-by: Julien Cristau <jcristau@debian.org>
  /* Define to 1 if you have the `shmctl64' function. */
  #undef HAVE_SHMCTL64
  
---- a/os/xsha1.c
-+++ b/os/xsha1.c
+Index: xorg-server/os/xsha1.c
+===================================================================
+--- xorg-server.orig/os/xsha1.c
++++ xorg-server/os/xsha1.c
 @@ -127,6 +127,31 @@ int x_sha1_final(void *ctx, unsigned cha
      return 1;
  }
diff --git a/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff b/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff
index 9aac31f4d..1bd6b7060 100644
--- a/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff
+++ b/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff
@@ -8,9 +8,11 @@ Subject: [PATCH] xfree86: fix build with xv disabled
  hw/xfree86/modes/xf86Crtc.h |    2 ++
  2 files changed, 4 insertions(+), 0 deletions(-)
 
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -3094,6 +3094,7 @@ xf86_crtc_box_area(BoxPtr box)
+Index: xorg-server/hw/xfree86/modes/xf86Crtc.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c
++++ xorg-server/hw/xfree86/modes/xf86Crtc.c
+@@ -3089,6 +3089,7 @@ xf86_crtc_box_area(BoxPtr box)
      return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1);
  }
  
@@ -18,7 +20,7 @@ Subject: [PATCH] xfree86: fix build with xv disabled
  /*
   * Return the crtc covering 'box'. If two crtcs cover a portion of
   * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc
-@@ -3182,6 +3183,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr
+@@ -3177,6 +3178,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr
  
      return ret;
  }
@@ -26,8 +28,10 @@ Subject: [PATCH] xfree86: fix build with xv disabled
  
  xf86_crtc_notify_proc_ptr
  xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
---- a/hw/xfree86/modes/xf86Crtc.h
-+++ b/hw/xfree86/modes/xf86Crtc.h
+Index: xorg-server/hw/xfree86/modes/xf86Crtc.h
+===================================================================
+--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.h
++++ xorg-server/hw/xfree86/modes/xf86Crtc.h
 @@ -934,6 +934,7 @@ xf86_hide_cursors (ScrnInfoPtr scrn);
  extern _X_EXPORT void
  xf86_cursors_fini (ScreenPtr screen);