[Pkg-crosswire-commits] [sword] 02/02: add abicompare.patch to get libsword to work with abi-compliance-checker

[Daniel Glassey]

This is an automated email from the git hooks/post-receive script.

wdg pushed a commit to branch master
in repository sword.

commit 207f21424595b64260df2c9376380bdf4e3770f1
Author: Daniel Glassey <wdg at debian.org>
Date:   Mon Sep 7 11:28:04 2015 +0100

    add abicompare.patch to get libsword to work with abi-compliance-checker
---
 debian/changelog                |  4 +-
 debian/patches/abicompare.patch | 81 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 092dd85..7fa2648 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-sword (1.7.3+dfsg-3) experimental; urgency=low
+sword (1.7.3+dfsg-3) unstable; urgency=low
 
   * c++ transition
       rename library to libsword11v5
       blocked by ICU c++ transition
+  * add patch abicompare.patch to allow libsword to work with 
+      abi-compliance-checker for future transitions
 
  -- Daniel Glassey <wdg at debian.org>  Wed, 02 Sep 2015 14:15:09 +0100
 
diff --git a/debian/patches/abicompare.patch b/debian/patches/abicompare.patch
new file mode 100644
index 0000000..cdf3109
--- /dev/null
+++ b/debian/patches/abicompare.patch
@@ -0,0 +1,81 @@
+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
+@@ -24,6 +24,8 @@
+ #ifndef CANON_ABBREVS_H
+ #define CANON_ABBREVS_H
+ 
++#include <versificationmgr.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
+@@ -23,12 +23,15 @@
+ #ifndef FEMAIN_H
+ #define FEMAIN_H
+ 
++#include <list>
++#include <swdisp.h>
++
+ class FEMain
+ {
+ public:
+   FEMain ();
+   virtual ~FEMain ();
+-  list < SWDisplay * >displays;	// so we can delete each display we create
++  std::list < sword::SWDisplay * >displays;	// so we can delete each display we create
+ };
+ 
+ #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 @@
+ 
+     void init();
+     int subst[255];
+-    map<int, int> subst2[12];
+-    map<int, int*> multiChars;
++    std::map<int, int> subst2[12];
++    std::map<int, int*> multiChars;
+ 
+ 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
+@@ -37,6 +37,9 @@
+  * results of assignments need to be reduced to 8 bits with
+  * & 0xFF or % 0x100, whichever is faster.
+  */  
++
++#ifndef SAPPHIRE_H
++#define SAPPHIRE_H
+   
+ #ifndef NULL
+ #define NULL 0
+@@ -80,3 +83,5 @@
+ 
+ 
+ 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
+@@ -25,6 +25,7 @@
+ #define ZCOM_H
+ 
+ #include <swcom.h>
++#include <zverse.h>
+ 
+ #include <defs.h>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f081236..4ead391 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 multiarch-clucene.patch
 no-included-zconf.h.diff
 dso-missing-shared.patch
+abicompare.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-crosswire/sword.git