new gcc6.patch

4 files changed, 56 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 0c86698..b36b0e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 xbase64 (3.1.2-7) unstable; urgency=low
 
+  * New debian/patches/0125-gcc6.patch for gcc-6 compatibility 
+    (Closes: #811846).
+    Thanks to 
   * debian/rules:
-    - Some changes for gcc-6 compatibility (Closes: #811846).
+    - Some changes for gcc-6 
   * debian/copyright:
     - Add year 2016 to debian/*.
   * debian/watch:
@@ -14,7 +17,7 @@ xbase64 (3.1.2-7) unstable; urgency=low
   * Remove useless debian/libxbase64-doc.lintian-overrides.
   * Add symbols files for all architectures.
 
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Tue, 12 Apr 2016 23:13:55 +0200
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Mon, 22 Aug 2016 20:25:38 +0200
 
 xbase64 (3.1.2-6) unstable; urgency=low
 
diff --git a/debian/patches/0125-gcc6.patch b/debian/patches/0125-gcc6.patch
new file mode 100644
index 0000000..e0d0520
--- /dev/null
+++ b/debian/patches/0125-gcc6.patch
@@ -0,0 +1,49 @@
+Index: trunk/xbase64/xblock.cpp
+===================================================================
+--- trunk.orig/xbase64/xblock.cpp
++++ trunk/xbase64/xblock.cpp
+@@ -82,7 +82,7 @@ xbLock::xbLock(xbDbf * pdbf)
+   TableLockCnt = 0;
+   MemoLockCnt  = 0;
+   IndexLockCnt = 0;
+-  std::cout << "xbLock constructor" << std::cout;
++  std::cout << "xbLock constructor" << std::endl;
+ }
+ /*************************************************************************/
+ xbLock::~xbLock()
+@@ -167,7 +167,7 @@ else if( LockType == XB_LOCK || LockType
+ /*************************************************************************/
+ xbaseLock::xbaseLock( xbDbf * pdbf ) : xbLock( pdbf )
+ {
+-  std::cout << "xbaseLock constructor" << std::cout;
++  std::cout << "xbaseLock constructor" << std::endl;
+ }
+ /*************************************************************************/
+ xbShort xbaseLock::LockTableHeader( xbShort LockType )
+@@ -334,7 +334,7 @@ xbShort xbaseLock::LockInit()
+ /*************************************************************************/
+ dbaseLock::dbaseLock( xbDbf * pdbf ) : xbLock( pdbf )
+ {
+-  std::cout << "dbaseLock constructor" << std::cout;
++  std::cout << "dbaseLock constructor" << std::endl;
+ }
+ /*************************************************************************/
+ xbShort dbaseLock::LockTableHeader( xbShort LockType )
+@@ -458,7 +458,7 @@ xbShort dbaseLock::UnlockAll()
+ /*************************************************************************/
+ clipperLock::clipperLock( xbDbf * pdbf ) : xbLock( pdbf )
+ {
+-  std::cout << "clipperLock constructor" << std::cout;
++  std::cout << "clipperLock constructor" << std::endl;
+ }
+ /*************************************************************************/
+ xbShort clipperLock::LockTableHeader( xbShort LockType )
+@@ -521,7 +521,7 @@ xbShort clipperLock::UnlockAll()
+ /*************************************************************************/
+ foxproLock::foxproLock( xbDbf * pdbf ) : xbLock( pdbf )
+ {
+-  std::cout << "foxproLock constructor" << std::cout;
++  std::cout << "foxproLock constructor" << std::endl;
+ }
+ /*************************************************************************/
+ xbShort foxproLock::LockTableHeader( xbShort LockType )
diff --git a/debian/patches/series b/debian/patches/series
index d7dbbf6..deb9ac5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+0125-gcc6.patch
 0700-ReproducibleBuilds.patch
 0100-typo.patch
 0001-fixconfig.diff
diff --git a/debian/rules b/debian/rules
index c52f106..639643b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ endif
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-export CXXFLAGS+= -std=c++98
+#export CXXFLAGS+= -std=c++98
 
 confflags = --prefix=/usr --mandir=\$${prefix}/share/man --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --enable-static