From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Sat, 5 Sep 2015 19:25:23 +0000 (+0300)
Subject: Fix FTBFS on arches with unsigned plain char (patched by E. G. Evans) (#Closes: 797610)
X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~92
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=11d71d3d7d1cdf92071a9320b5e57041fdec4ac4;p=mathgl.git

Fix FTBFS on arches with unsigned plain char (patched by E. G. Evans) (#Closes: 797610)
---

diff --git a/.pc/applied-patches b/.pc/applied-patches
index ba9f331..523fc93 100644
--- a/.pc/applied-patches
+++ b/.pc/applied-patches
@@ -1,2 +1,3 @@
 CMakeLists.patch
 udav.patch
+utils.patch
diff --git a/.pc/utils.patch/.timestamp b/.pc/utils.patch/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/.pc/utils.patch/utils/make_bin.cpp b/.pc/utils.patch/utils/make_bin.cpp
new file mode 100644
index 0000000..ac9a44c
--- /dev/null
+++ b/.pc/utils.patch/utils/make_bin.cpp
@@ -0,0 +1,53 @@
+/***************************************************************************
+ * make_bin.cpp is part of Math Graphic Library
+ * Copyright (C) 2007-2014 Alexey Balakin <mathgl.abalakin@gmail.ru>       *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include <unistd.h>
+#include "mgl2/font.h"
+//-----------------------------------------------------------------------------
+int main(int argc, char *argv[])
+{
+	mglFont fnt;
+	std::string path, base, fname;
+	char ch;
+
+	while(1)
+	{
+		ch = getopt(argc, argv, "p:o:h");
+		if(ch=='p')	path = optarg;
+		else if(ch=='o')	fname = optarg;
+		else if(ch=='h' || (ch==-1 && optind>=argc))
+		{
+			printf("make_bin convert mgl font to binary file.\nCurrent version is 2.%g\n",MGL_VER2);
+			printf("Usage:\tmake_bin [parameter(s)] base\n");
+			printf(
+				"\t-p path      set specific path for base font files\n"
+				"\t-o fname     set output filename (use ${base}.vfmb by default)\n"
+				"\t-h           print this message\n" );
+			ch = 'h';	break;
+		}
+		else if(ch==-1 && optind<argc)	{	base = argv[optind];	break;	}
+	}
+	if(ch=='h')	return 0;
+	if(fname.empty())	fname = base + ".vfmb";
+	fnt.Load(base.c_str(),path.c_str());
+	size_t size = fnt.SaveBin(fname.c_str());
+	printf("Output size of %s should be %zu\n", fname.c_str(), size);
+	return 0;
+}
+//-----------------------------------------------------------------------------
diff --git a/debian/patches/series b/debian/patches/series
index ba9f331..523fc93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 CMakeLists.patch
 udav.patch
+utils.patch
diff --git a/debian/patches/utils.patch b/debian/patches/utils.patch
new file mode 100644
index 0000000..261d4f0
--- /dev/null
+++ b/debian/patches/utils.patch
@@ -0,0 +1,12 @@
+Fix FTBFS on architectures with unsigned plain char (patch provided by  E. G. Evans)
+--- a/utils/make_bin.cpp
++++ b/utils/make_bin.cpp
+@@ -24,7 +24,7 @@
+ {
+ 	mglFont fnt;
+ 	std::string path, base, fname;
+-	char ch;
++	int ch;
+ 
+ 	while(1)
+ 	{
diff --git a/utils/make_bin.cpp b/utils/make_bin.cpp
index ac9a44c..9c56408 100644
--- a/utils/make_bin.cpp
+++ b/utils/make_bin.cpp
@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
 {
 	mglFont fnt;
 	std::string path, base, fname;
-	char ch;
+	int ch;
 
 	while(1)
 	{