[Chinese-commits] [gmchess] 04/07: Refresh patches; add 0004 to fix FTBFS on gcc-7

[Boyuan Yang]

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

hosiet-guest pushed a commit to branch master
in repository gmchess.

commit 34bfcece423b0439c155cb8c4387aadffc3d2dd6
Author: Boyuan Yang <073plan at gmail.com>
Date:   Mon Aug 21 14:19:26 2017 +0800

    Refresh patches; add 0004 to fix FTBFS on gcc-7
    
    Try to solve bug #853423.
---
 debian/patches/0002-fix-potfiles-skip.patch        | 15 ++++++++++++---
 debian/patches/0003-fix-kfreebsd.patch             | 17 +++++++++++++++--
 ...x-FenMirror-func-wrong-pointer-comparison.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/debian/patches/0002-fix-potfiles-skip.patch b/debian/patches/0002-fix-potfiles-skip.patch
index 9d4d438..82f69be 100644
--- a/debian/patches/0002-fix-potfiles-skip.patch
+++ b/debian/patches/0002-fix-potfiles-skip.patch
@@ -1,7 +1,16 @@
-Index: gmchess-0.29.3/po/POTFILES.skip
+From: Debian Chinese Team <chinese-developers at lists.alioth.debian.org>
+Date: Sat, 4 Mar 2017 23:39:45 +0800
+Subject: fix-potfiles-skip
+
 ===================================================================
---- gmchess-0.29.3.orig/po/POTFILES.skip	2009-09-07 12:08:47.000000000 +0000
-+++ gmchess-0.29.3/po/POTFILES.skip	2011-08-18 17:55:11.398264018 +0000
+---
+ po/POTFILES.skip | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+index a587414..d77a461 100644
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
 @@ -1,2 +1,4 @@
  data/gmchess.desktop.in
  src/BookView.cc
diff --git a/debian/patches/0003-fix-kfreebsd.patch b/debian/patches/0003-fix-kfreebsd.patch
index 6f2a1f5..7abe620 100644
--- a/debian/patches/0003-fix-kfreebsd.patch
+++ b/debian/patches/0003-fix-kfreebsd.patch
@@ -1,6 +1,17 @@
+From: Debian Chinese Team <chinese-developers at lists.alioth.debian.org>
+Date: Sat, 4 Mar 2017 23:39:45 +0800
+Subject: fix-kfreebsd
+
+---
+ src/Sound.cc          | 8 +++++---
+ src/engine/eleeye.cpp | 8 ++++----
+ 2 files changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/src/Sound.cc b/src/Sound.cc
+index 517d126..bb2043b 100644
 --- a/src/Sound.cc
 +++ b/src/Sound.cc
-@@ -77,10 +77,12 @@
+@@ -77,10 +77,12 @@ CSound::play (SOUND_EVENTS event)
  void CSound::play_file(const char* filename)
  {
  	gchar* argv[3];
@@ -16,9 +27,11 @@
  #endif
  	argv[1] = (gchar*)filename;
  	argv[2] = NULL;
+diff --git a/src/engine/eleeye.cpp b/src/engine/eleeye.cpp
+index dbbb206..1a9fb0d 100644
 --- a/src/engine/eleeye.cpp
 +++ b/src/engine/eleeye.cpp
-@@ -32,13 +32,13 @@
+@@ -32,13 +32,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  #ifdef _WIN32
    #include <windows.h>
    const char *const cszLibEvalFile = "EVALUATE.DLL";
diff --git a/debian/patches/0004-fix-FenMirror-func-wrong-pointer-comparison.patch b/debian/patches/0004-fix-FenMirror-func-wrong-pointer-comparison.patch
new file mode 100644
index 0000000..ba0ea80
--- /dev/null
+++ b/debian/patches/0004-fix-FenMirror-func-wrong-pointer-comparison.patch
@@ -0,0 +1,22 @@
+From: Boyuan Yang <073plan at gmail.com>
+Date: Mon, 21 Aug 2017 14:16:31 +0800
+Subject: fix FenMirror func wrong pointer comparison
+
+This causes FTBFS on gcc-7.
+---
+ src/engine/cchess.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/engine/cchess.cpp b/src/engine/cchess.cpp
+index ca12e4e..79bd8c7 100644
+--- a/src/engine/cchess.cpp
++++ b/src/engine/cchess.cpp
+@@ -690,7 +690,7 @@ void FenMirror(char *szFenDst, const char *szFenSrc) {
+     }
+     lpSrc ++;
+   };
+-  while(lpSrc != '\0' && lpDst < lpDstLimit) {
++  while(lpSrc && lpDst < lpDstLimit) {
+     *lpDst = *lpSrc;
+     lpSrc ++;
+     lpDst ++;
diff --git a/debian/patches/series b/debian/patches/series
index 420556f..7300f82 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0002-fix-potfiles-skip.patch
 0003-fix-kfreebsd.patch
+0004-fix-FenMirror-func-wrong-pointer-comparison.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/gmchess.git