On 02/27/2017 01:01 PM, John Paul Adrian Glaubitz wrote:
> The attached debdiff fixes the issue for me. Tested on an armhf porterbox.

On second thought, it's probably better to use "signed char" instead of "int".

Updated the patch accordingly.

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaub...@debian.org
`. `'   Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913
diff -Nru edtsurf-0.2009/debian/changelog edtsurf-0.2009/debian/changelog
--- edtsurf-0.2009/debian/changelog	2014-01-30 16:04:03.000000000 +0100
+++ edtsurf-0.2009/debian/changelog	2017-02-27 12:55:58.000000000 +0100
@@ -1,3 +1,11 @@
+edtsurf (0.2009-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/fix-use-of-unsigned-char.patch:
+    - Add patch to fix use of unsigned char (Closes: #856233)
+
+ -- John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de>  Mon, 27 Feb 2017 12:55:58 +0100
+
 edtsurf (0.2009-3) unstable; urgency=medium
 
   * Fix Vcs URL subdirectory
diff -Nru edtsurf-0.2009/debian/patches/fix-use-of-unsigned-char.patch edtsurf-0.2009/debian/patches/fix-use-of-unsigned-char.patch
--- edtsurf-0.2009/debian/patches/fix-use-of-unsigned-char.patch	1970-01-01 01:00:00.000000000 +0100
+++ edtsurf-0.2009/debian/patches/fix-use-of-unsigned-char.patch	2017-02-27 12:55:58.000000000 +0100
@@ -0,0 +1,39 @@
+Author: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de>
+Last-Update: Mon, 27 Feb 2017 12:55:30 +0100
+Description: Fix use of unsigned char declarations
+
+Index: edtsurf-0.2009/CommonPara.h
+===================================================================
+--- edtsurf-0.2009.orig/CommonPara.h
++++ edtsurf-0.2009/CommonPara.h
+@@ -44,7 +44,7 @@ static unsigned char mycolor[19][4]={128
+ 128,255,128,220,   128,128,255,220,   255,0,128,220,   
+ 128,128, 0,220,    128,255,0,220,     128,0,128,220,
+ 	};
+-static char nb[26][3]={1,0,0, -1,0,0, 0,1,0, 0,-1,0, 0,0,1, 0,0,-1, 
++static signed char nb[26][3]={1,0,0, -1,0,0, 0,1,0, 0,-1,0, 0,0,1, 0,0,-1, 
+ 1,1,0, 1,-1,0, -1,1,0, -1,-1,0, 1,0,1, 1,0,-1, -1,0,1, -1,0,-1, 0,1,1, 0,1,-1, 0,-1,1, 0,-1,-1,
+ 1,1,1, 1,1,-1, 1,-1,1, -1,1,1, 1,-1,-1, -1,-1,1, -1,1,-1, -1,-1,-1};
+ static double asarea2[]= {
+Index: edtsurf-0.2009/ProteinSurface.h
+===================================================================
+--- edtsurf-0.2009.orig/ProteinSurface.h
++++ edtsurf-0.2009/ProteinSurface.h
+@@ -22,7 +22,7 @@ static const char vcmcoffset[8][3] =
+ 	{0, 0, 0},{1, 0, 0},{0, 1, 0},{1, 1, 0},
+ 	{0,0, 1},{1, 0, 1},{0, 1, 1},{1, 1, 1}
+ };
+-static const char vcmctable[256][10]=
++static const signed char vcmctable[256][10]=
+ {
+ 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,//0 0 0 0 0 0 0 0 0   0 oka
+ 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,//1 0 0 0 0 0 0 0 1   1 okb
+@@ -312,7 +312,7 @@ static const int aiCubeEdgeFlags[256]=
+     0xe90, 0xf99, 0xc93, 0xd9a, 0xa96, 0xb9f, 0x895, 0x99c, 0x69c, 0x795, 0x49f, 0x596, 0x29a, 0x393, 0x099, 0x190, 
+     0xf00, 0xe09, 0xd03, 0xc0a, 0xb06, 0xa0f, 0x905, 0x80c, 0x70c, 0x605, 0x50f, 0x406, 0x30a, 0x203, 0x109, 0x000
+ };
+-static const char a2iTriangleConnectionTable[256][16] =  
++static const signed char a2iTriangleConnectionTable[256][16] =  
+ {
+         {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+         {0, 8, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
diff -Nru edtsurf-0.2009/debian/patches/series edtsurf-0.2009/debian/patches/series
--- edtsurf-0.2009/debian/patches/series	2014-01-30 15:46:11.000000000 +0100
+++ edtsurf-0.2009/debian/patches/series	2017-02-27 12:55:50.000000000 +0100
@@ -1 +1,2 @@
 CFLAGS_missing_in_Makefile.patch
+fix-use-of-unsigned-char.patch

Reply via email to