updated patches

4 files changed, 70 insertions, 26 deletions

diff --git a/debian/patches/0003-use-PKG_PROG_PKG_CONFIG-cross-compilation.patch b/debian/patches/0003-use-PKG_PROG_PKG_CONFIG-cross-compilation.patch
new file mode 100644
index 0000000..3c27f1f
--- /dev/null
+++ b/debian/patches/0003-use-PKG_PROG_PKG_CONFIG-cross-compilation.patch
@@ -0,0 +1,21 @@
+From: Teus Benschop <teusjannette@gmail.com>
+Date: Thu, 1 Nov 2018 10:30:58 +0100
+Subject: use PKG_PROG_PKG_CONFIG cross compilation
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6ed56f2..32dfe59 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -207,7 +207,7 @@ AM_CONDITIONAL(HAVE_CPPUNIT, test "$CPPUNIT_LIBS")
+ # Find pkg-config
+ # ---------------------------------------------------------------------
+ use_pkgconfig=yes
+-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++PKG_PROG_PKG_CONFIG(PKG_CONFIG, pkg-config, no)
+ if test x$PKG_CONFIG = xno ; then
+   AC_MSG_WARN([*** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/])
+   AC_MSG_WARN([not using pkg-config])
diff --git a/debian/patches/13_curl.diff b/debian/patches/13_curl.diff
index 8cd9df8..8590f0d 100644
--- a/debian/patches/13_curl.diff
+++ b/debian/patches/13_curl.diff
@@ -1,13 +1,27 @@
+From: CrossWire Packaging Team <pkg-crosswire-devel@alioth-lists.debian.net>
+Date: Thu, 1 Nov 2018 10:27:07 +0100
+Subject: _curl
+
 revno: 2452
 svn revno: 2506 (on /trunk)
 committer: scribe
 timestamp: Sat 2010-03-20 11:49:54 +0000
 message:
   applied Karl's patch to fix libcurl problem with status reporter data.
+svn revno: 2506 (on /trunk)
+committer: scribe
+timestamp: Sat 2010-03-20 11:49:54 +0000
+message:
+  applied Karl's patch to fix libcurl problem with status reporter data.
+---
+ src/mgr/curlftpt.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
 
+diff --git a/src/mgr/curlftpt.cpp b/src/mgr/curlftpt.cpp
+index b287405..1bc9eaa 100644
 --- a/src/mgr/curlftpt.cpp
 +++ b/src/mgr/curlftpt.cpp
-@@ -186,6 +186,9 @@
+@@ -186,6 +186,9 @@ char CURLFTPTransport::getURL(const char *destPath, const char *sourceURL, SWBuf
  		// it seems CURL tries to use this option data later for some reason, so we unset here
  		curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL);
  
diff --git a/debian/patches/abicompare.patch b/debian/patches/abicompare.patch
index e9465ec..019bdfc 100644
--- a/debian/patches/abicompare.patch
+++ b/debian/patches/abicompare.patch
@@ -1,10 +1,19 @@
-Description: allow abi-compliance-checker to compile headers
-Author: Daniel Glassey <wdg@debian.org>
+From: Daniel Glassey <wdg@debian.org>
+Date: Thu, 1 Nov 2018 10:27:07 +0100
+Subject: allow abi-compliance-checker to compile headers
 
-Index: sword-1.7.3+dfsg/include/canon_abbrevs.h
-===================================================================
---- sword-1.7.3+dfsg.orig/include/canon_abbrevs.h	2013-08-22 08:03:11.000000000 +0100
-+++ sword-1.7.3+dfsg/include/canon_abbrevs.h	2015-09-03 07:00:52.709829136 +0100
+---
+ include/canon_abbrevs.h | 2 ++
+ include/femain.h        | 5 ++++-
+ include/hebrewmcim.h    | 4 ++--
+ include/sapphire.h      | 5 +++++
+ include/zcom.h          | 1 +
+ 5 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/include/canon_abbrevs.h b/include/canon_abbrevs.h
+index a5fc320..60dea94 100644
+--- a/include/canon_abbrevs.h
++++ b/include/canon_abbrevs.h
 @@ -24,6 +24,8 @@
  #ifndef CANON_ABBREVS_H
  #define CANON_ABBREVS_H
@@ -14,10 +23,10 @@ Index: sword-1.7.3+dfsg/include/canon_abbrevs.h
  SWORD_NAMESPACE_START
  
  
-Index: sword-1.7.3+dfsg/include/femain.h
-===================================================================
---- sword-1.7.3+dfsg.orig/include/femain.h	2015-09-03 07:52:46.497269566 +0100
-+++ sword-1.7.3+dfsg/include/femain.h	2015-09-03 07:57:23.730644294 +0100
+diff --git a/include/femain.h b/include/femain.h
+index 3eec2c6..01c0042 100644
+--- a/include/femain.h
++++ b/include/femain.h
 @@ -23,12 +23,15 @@
  #ifndef FEMAIN_H
  #define FEMAIN_H
@@ -35,11 +44,11 @@ Index: sword-1.7.3+dfsg/include/femain.h
  };
  
  #endif
-Index: sword-1.7.3+dfsg/include/hebrewmcim.h
-===================================================================
---- sword-1.7.3+dfsg.orig/include/hebrewmcim.h	2013-06-29 07:40:28.000000000 +0100
-+++ sword-1.7.3+dfsg/include/hebrewmcim.h	2015-09-03 07:49:51.896403768 +0100
-@@ -42,8 +42,8 @@
+diff --git a/include/hebrewmcim.h b/include/hebrewmcim.h
+index ffcb9a1..43b97b3 100644
+--- a/include/hebrewmcim.h
++++ b/include/hebrewmcim.h
+@@ -42,8 +42,8 @@ class SWDLLEXPORT HebrewMCIM : public SWInputMethod {
  
      void init();
      int subst[255];
@@ -50,10 +59,10 @@ Index: sword-1.7.3+dfsg/include/hebrewmcim.h
  
  public:
      HebrewMCIM();
-Index: sword-1.7.3+dfsg/include/sapphire.h
-===================================================================
---- sword-1.7.3+dfsg.orig/include/sapphire.h	2013-06-29 07:40:28.000000000 +0100
-+++ sword-1.7.3+dfsg/include/sapphire.h	2015-09-03 07:50:55.180717576 +0100
+diff --git a/include/sapphire.h b/include/sapphire.h
+index 96f3bf5..20aa53d 100644
+--- a/include/sapphire.h
++++ b/include/sapphire.h
 @@ -37,6 +37,9 @@
   * results of assignments need to be reduced to 8 bits with
   * & 0xFF or % 0x100, whichever is faster.
@@ -64,16 +73,16 @@ Index: sword-1.7.3+dfsg/include/sapphire.h
    
  #ifndef NULL
  #define NULL 0
-@@ -80,3 +83,5 @@
+@@ -80,3 +83,5 @@ unsigned *keypos); public:sapphire (unsigned char
  
  
  SWORD_NAMESPACE_END
 +
 +#endif //SAPPHIRE_H
-Index: sword-1.7.3+dfsg/include/zcom.h
-===================================================================
---- sword-1.7.3+dfsg.orig/include/zcom.h	2013-06-29 07:40:28.000000000 +0100
-+++ sword-1.7.3+dfsg/include/zcom.h	2015-09-03 07:31:44.063009491 +0100
+diff --git a/include/zcom.h b/include/zcom.h
+index 560b650..9a990d8 100644
+--- a/include/zcom.h
++++ b/include/zcom.h
 @@ -25,6 +25,7 @@
  #define ZCOM_H
  
diff --git a/debian/patches/series b/debian/patches/series
index e201180..52887a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 13_curl.diff
 abicompare.patch
-
+0003-use-PKG_PROG_PKG_CONFIG-cross-compilation.patch