various packages: revert patch changes with line ending errors

These four packages all have weird line ending issues - `git` can apply
and output them, but `patch` fails.

src/freeimage-1-fixes.patch

@@ -4,8 +4,8 @@ Contains ad hoc patches for cross building.
 
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
-Date: Sat, 18 Nov 2017 22:27:54 +1100
-Subject: [PATCH 1/4] include string.h for memset
+Date: Sat, 27 Oct 2012 22:57:27 +0200
+Subject: [PATCH] include string.h for memset
 
 taken from https://sourceforge.net/tracker/?func=detail&aid=3581223&group_id=11504&atid=311504
 
@@ -27,8 +27,8 @@ index 1111111..2222222 100644
 
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
-Date: Sat, 18 Nov 2017 22:28:39 +1100
-Subject: [PATCH 2/4] mingw-w64 fixes
+Date: Sat, 11 May 2013 15:15:39 +1000
+Subject: [PATCH] mingw-w64 fixes
 
 
 diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
@@ -56,8 +56,8 @@ index 1111111..2222222 100644
 
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: fiesh <weiss@wsoptics.de>
-Date: Sat, 18 Nov 2017 22:29:10 +1100
-Subject: [PATCH 3/4] fix freeimage build
+Date: Tue, 22 Dec 2015 13:45:56 +0100
+Subject: [PATCH] fix freeimage build
 
 Add the FREEIMAGE_LIB define in order to keep the build process from
 defining dllspec specifications. Remove -fPIC to fix a warning.
@@ -78,9 +78,8 @@ index 1111111..2222222 100644
 
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Boris Pek <tehnick-8@mail.ru>
-Date: Sat, 18 Nov 2017 22:29:57 +1100
-Subject: [PATCH 4/4] fix build with GCC >= 6.x
-
+Date: Wed, 04 May 2016 18:43:16 +0300
+Subject: [PATCH] fix build with GCC >= 6.x
 
 diff --git a/Makefile.mingw b/Makefile.mingw
 index 1111111..2222222 100644
@@ -95,3 +94,4 @@ index 1111111..2222222 100644
  CXXFLAGS += $(INCLUDE)
  RCFLAGS ?= -DNDEBUG
  LDFLAGS ?= -s -shared -static -Wl,-soname,$(SOLIBNAME) $(WIN32_LDFLAGS)
+

src/ocaml-xml-light-1-fixes.patch

@@ -2,24 +2,22 @@ This file is part of MXE. See LICENSE.md for licensing information.
 
 Contains ad hoc patches for cross building.
 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tony Theodore <tonyt@logyst.com>
-Date: Sat, 18 Nov 2017 22:47:03 +1100
-Subject: [PATCH 1/1] allows use of ocaml tools for cross-compilation and use
- prefixed ocamldoc
+From 8f7239bcdd0f1c3879d548ddfb34c8befa70c9fb Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Fri, 11 May 2012 00:50:32 +0200
+Subject: [PATCH 1/2] allows use of ocaml tools for cross-compilation
 
 
 diff --git a/Makefile b/Makefile
-index 1111111..2222222 100644
+index c978890..5c15ace 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1,8 +1,12 @@
+@@ -1,8 +1,11 @@
  # Makefile generated by OCamake 
  # http://tech.motion-twin.com
  .SUFFIXES : .ml .mli .cmo .cmx .cmi .mll .mly
 +OCAMLC=@target@-ocamlc
 +OCAMLOPT=@target@-ocamlopt
-+OCAMLDOC=@target@-ocamldoc
  
 -INSTALLDIR=`ocamlc -where`
 +
@@ -27,12 +25,8 @@ index 1111111..2222222 100644
  CFLAGS=
  LFLAGS= -a
  LIBS=
-@@ -16,19 +20,19 @@ install: all opt
- 
- doc:
- 	mkdir doc
--	ocamldoc -sort -html -d doc xml.mli dtd.mli xmlParser.mli
-+	$(OCAMLDOC) -sort -html -d doc xml.mli dtd.mli xmlParser.mli
+@@ -19,16 +22,16 @@ doc:
+ 	ocamldoc -sort -html -d doc xml.mli dtd.mli xmlParser.mli
  
  test.exe: xml-light.cma
 -	ocamlc xml-light.cma test.ml -o test.exe
@@ -53,7 +47,7 @@ index 1111111..2222222 100644
  
  dtd.cmo: xml.cmi xml_lexer.cmi dtd.cmi
  
-@@ -68,13 +72,13 @@ wclean:
+@@ -68,13 +71,13 @@ wclean:
  
  # SUFFIXES
  .ml.cmo:
@@ -70,3 +64,37 @@ index 1111111..2222222 100644
  
  .mll.ml:
  	ocamllex $<
+-- 
+1.7.9.5
+
+
+From 4ec44e9cba7be6abfe9c121b753f8d6bd5b3ee8b Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Sun, 30 Sep 2012 21:38:52 +0200
+Subject: [PATCH 2/2] use prefixed ocamldoc
+
+
+diff --git a/Makefile b/Makefile
+index 5c15ace..0e60588 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,6 +3,7 @@
+ .SUFFIXES : .ml .mli .cmo .cmx .cmi .mll .mly
+ OCAMLC=@target@-ocamlc
+ OCAMLOPT=@target@-ocamlopt
++OCAMLDOC=@target@-ocamldoc
+ 
+ 
+ INSTALLDIR=@installdir@
+@@ -19,7 +20,7 @@ install: all opt
+ 
+ doc:
+ 	mkdir doc
+-	ocamldoc -sort -html -d doc xml.mli dtd.mli xmlParser.mli
++	$(OCAMLDOC) -sort -html -d doc xml.mli dtd.mli xmlParser.mli
+ 
+ test.exe: xml-light.cma
+ 	$(OCAMLC) xml-light.cma test.ml -o test.exe
+-- 
+1.7.9.5
+

src/qwtplot3d-1-fixes.patch

@@ -2,14 +2,14 @@ This file is part of MXE. See LICENSE.md for licensing information.
 
 Contains ad hoc patches for cross building.
 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tony Theodore <tonyt@logyst.com>
-Date: Sat, 18 Nov 2017 22:56:46 +1100
+From 0ee512abc5ac926ebe37ea50ecac9c314efd8f53 Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Thu, 20 Oct 2011 21:05:36 +0200
 Subject: [PATCH 1/4] add missing #include <cstdio>
 
 
 diff --git a/src/qwt3d_function.cpp b/src/qwt3d_function.cpp
-index 1111111..2222222 100644
+index 28d874e..72f93a9 100644
 --- a/src/qwt3d_function.cpp
 +++ b/src/qwt3d_function.cpp
 @@ -1,3 +1,4 @@
@@ -17,17 +17,20 @@ index 1111111..2222222 100644
  #include "qwt3d_surfaceplot.h"
  #include "qwt3d_function.h"
  
+-- 
+1.7.7
 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tony Theodore <tonyt@logyst.com>
-Date: Sat, 18 Nov 2017 22:57:14 +1100
+
+From 252126201db746fd5772e0ac201d7975aa705236 Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Thu, 20 Oct 2011 21:06:42 +0200
 Subject: [PATCH 2/4] add missing #include <GL/glu.h>
 
 We use symbols defined in this header.
 Should not rely on Qt to include this file indirectly.
 
 diff --git a/include/qwt3d_openglhelper.h b/include/qwt3d_openglhelper.h
-index 1111111..2222222 100644
+index e5499c2..48052ae 100644
 --- a/include/qwt3d_openglhelper.h
 +++ b/include/qwt3d_openglhelper.h
 @@ -1,3 +1,4 @@
@@ -35,15 +38,18 @@ index 1111111..2222222 100644
  #ifndef __openglhelper_2003_06_06_15_49__
  #define __openglhelper_2003_06_06_15_49__
  
+-- 
+1.7.7
+
 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tony Theodore <tonyt@logyst.com>
-Date: Sat, 18 Nov 2017 22:57:46 +1100
+From ac2860d954caeac6ce7701a0ee196e1533bc047e Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Thu, 20 Oct 2011 21:22:24 +0200
 Subject: [PATCH 3/4] configure project for MXE
 
 
 diff --git a/qwtplot3d.pro b/qwtplot3d.pro
-index 1111111..2222222 100644
+index d4fa0c1..94f92ee 100644
 --- a/qwtplot3d.pro
 +++ b/qwtplot3d.pro
 @@ -3,7 +3,7 @@
@@ -72,15 +78,18 @@ index 1111111..2222222 100644
  
  linux-g++:TMAKE_CXXFLAGS += -fno-exceptions
  unix:VERSION = 0.2.6
+-- 
+1.7.7
 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tony Theodore <tonyt@logyst.com>
-Date: Sat, 18 Nov 2017 22:58:05 +1100
+
+From 6a316d1844a2634ebc4374e1e9d01502204d8c7e Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Thu, 20 Oct 2011 21:47:18 +0200
 Subject: [PATCH 4/4] fix building examples for MXE
 
 
 diff --git a/examples/common.pro b/examples/common.pro
-index 1111111..2222222 100644
+index 2b7fb83..a89066d 100644
 --- a/examples/common.pro
 +++ b/examples/common.pro
 @@ -11,12 +11,12 @@ unix:LIBS += -lqwtplot3d -L../../lib
@@ -100,3 +109,6 @@ index 1111111..2222222 100644
    }
  
  }
+-- 
+1.7.7
+

src/winpcap-1-fixes.patch

@@ -2,16 +2,9 @@ This file is part of MXE. See LICENSE.md for licensing information.
 
 Contains ad hoc patches for cross building.
 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tony Theodore <tonyt@logyst.com>
-Date: Sat, 18 Nov 2017 21:48:44 +1100
-Subject: [PATCH 1/1] fixes
-
-
-diff --git a/packetNtx/Dll/Packet32-Int.h b/packetNtx/Dll/Packet32-Int.h
-index 1111111..2222222 100644
---- a/packetNtx/Dll/Packet32-Int.h
-+++ b/packetNtx/Dll/Packet32-Int.h
+diff -ur winpcap/packetNtx/Dll/Packet32-Int.h winpcap.new/packetNtx/Dll/Packet32-Int.h
+--- winpcap/packetNtx/Dll/Packet32-Int.h	2010-10-14 08:16:46.000000000 +1100
++++ winpcap.new/packetNtx/Dll/Packet32-Int.h	2014-10-03 00:37:40.000000000 +1000
 @@ -43,7 +43,7 @@
  #endif //HAVE_NPFIM_API
  
@@ -21,11 +14,10 @@ index 1111111..2222222 100644
  #include <ntddndis.h>
  #else /*__MINGW64__*/
  #include <ddk/ntddndis.h>
-diff --git a/wpcap/PRJ/GNUmakefile b/wpcap/PRJ/GNUmakefile
-index 1111111..2222222 100644
---- a/wpcap/PRJ/GNUmakefile
-+++ b/wpcap/PRJ/GNUmakefile
-@@ -32,12 +32,12 @@ CFLAGS = -I ../libpcap -I ../libpcap/bpf -I ../libpcap/lbl \
+diff -ur winpcap/wpcap/PRJ/GNUmakefile winpcap.new/wpcap/PRJ/GNUmakefile
+--- winpcap/wpcap/PRJ/GNUmakefile	2010-10-18 13:00:36.000000000 +1100
++++ winpcap.new/wpcap/PRJ/GNUmakefile	2014-10-03 00:35:44.000000000 +1000
+@@ -32,12 +32,12 @@
  	-DSIZEOF_CHAR=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG_LONG=8 -DWPCAP -D'_U_=' \
  	-DHAVE_SNPRINTF -DHAVE_VSNPRINTF \
  	-DSIZEOF_LONG_LONG=8 \
@@ -40,17 +32,16 @@ index 1111111..2222222 100644
  LDFLAGS = -Wl,--out-implib,../lib/libwpcap.a
  LIBS = -L ../../${PACKET_DIR}/Dll/Project -lpacket -lws2_32
  OBJS = ../libpcap/bpf/net/bpf_filter.o \
-@@ -93,3 +93,6 @@ clean:
+@@ -93,3 +93,6 @@
  	${FLEX} ${LFLAGS} -t $< >$*.c
  .c.o:
  	${CC} ${CFLAGS} -o $*.o -c $<
 +libwpcap.a: ${OBJS}
 +	${AR} rc $@ ${OBJS}
 +	${RANLIB} $@
-diff --git a/wpcap/libpcap/Win32/Src/gai_strerror.c b/wpcap/libpcap/Win32/Src/gai_strerror.c
-index 1111111..2222222 100644
---- a/wpcap/libpcap/Win32/Src/gai_strerror.c
-+++ b/wpcap/libpcap/Win32/Src/gai_strerror.c
+diff -ur winpcap/wpcap/libpcap/Win32/Src/gai_strerror.c winpcap.new/wpcap/libpcap/Win32/Src/gai_strerror.c
+--- winpcap/wpcap/libpcap/Win32/Src/gai_strerror.c	2009-10-07 00:19:58.000000000 +1100
++++ winpcap.new/wpcap/libpcap/Win32/Src/gai_strerror.c	2014-10-03 00:35:44.000000000 +1000
 @@ -1,83 +1 @@
 -/*
 - * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -137,11 +128,10 @@ index 1111111..2222222 100644
 -#endif /* gai_strerror */
 \ No newline at end of file
 +/* already handled by <ws2tcpip.h> */
-diff --git a/wpcap/libpcap/inet.c b/wpcap/libpcap/inet.c
-index 1111111..2222222 100644
---- a/wpcap/libpcap/inet.c
-+++ b/wpcap/libpcap/inet.c
-@@ -804,7 +804,7 @@ pcap_lookupdev(errbuf)
+diff -ur winpcap/wpcap/libpcap/inet.c winpcap.new/wpcap/libpcap/inet.c
+--- winpcap/wpcap/libpcap/inet.c	2009-10-07 00:20:04.000000000 +1100
++++ winpcap.new/wpcap/libpcap/inet.c	2014-10-03 00:35:44.000000000 +1000
+@@ -804,7 +804,7 @@
  		while(NAdapts--)
  		{
  			strcpy((char*)tUstr, tAstr);
@@ -150,11 +140,10 @@ index 1111111..2222222 100644
  			tAstr += strlen(tAstr) + 1;
  		}
  
-diff --git a/wpcap/libpcap/pcap-win32.c b/wpcap/libpcap/pcap-win32.c
-index 1111111..2222222 100644
---- a/wpcap/libpcap/pcap-win32.c
-+++ b/wpcap/libpcap/pcap-win32.c
-@@ -38,7 +38,7 @@ static const char rcsid[] _U_ =
+diff -ur winpcap/wpcap/libpcap/pcap-win32.c winpcap.new/wpcap/libpcap/pcap-win32.c
+--- winpcap/wpcap/libpcap/pcap-win32.c	2013-02-28 17:22:00.000000000 +1100
++++ winpcap.new/wpcap/libpcap/pcap-win32.c	2014-10-03 00:37:02.000000000 +1000
+@@ -38,7 +38,7 @@
  
  #include <pcap-int.h>
  #include <Packet32.h>