libraries/cuneiform: Fix build on -current.cuneiform

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 105 insertions, 5 deletions

diff --git a/libraries/cuneiform/cuneiform-gcc.patch b/libraries/cuneiform/cuneiform-gcc.patch
new file mode 100644
index 0000000000..4b51da8e84
--- /dev/null
+++ b/libraries/cuneiform/cuneiform-gcc.patch
@@ -0,0 +1,98 @@
+diff -wbBur cuneiform-linux-1.1.0/cuneiform_src/Kern/include/utf8-tables.h cuneiform-linux-1.1.0.q/cuneiform_src/Kern/include/utf8-tables.h
+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/include/utf8-tables.h	2011-04-19 16:49:57.000000000 +0400
++++ cuneiform-linux-1.1.0.q/cuneiform_src/Kern/include/utf8-tables.h	2017-07-05 16:35:34.338871445 +0300
+@@ -68,7 +68,7 @@
+ #endif
+ 
+ 
+-const char win1250_to_utf8[][4] = {
++const unsigned char win1250_to_utf8[][4] = {
+   {0, 0, 0, 0},
+   {1, 0, 0, 0},
+   {2, 0, 0, 0},
+@@ -328,7 +328,7 @@
+ };
+ 
+ 
+-const char win1251_to_utf8[][4] = {
++const unsigned char win1251_to_utf8[][4] = {
+   {0, 0, 0, 0},
+   {1, 0, 0, 0},
+   {2, 0, 0, 0},
+@@ -587,7 +587,7 @@
+   {209, 143, 0, 0},
+ };
+ 
+-const char win1252_to_utf8[][4] = {
++const unsigned char win1252_to_utf8[][4] = {
+   {0, 0, 0, 0},
+   {1, 0, 0, 0},
+   {2, 0, 0, 0},
+@@ -847,7 +847,7 @@
+ };
+ 
+ 
+-const char win1254_to_utf8[][4] = {
++const unsigned char win1254_to_utf8[][4] = {
+   {0, 0, 0, 0},
+   {1, 0, 0, 0},
+   {2, 0, 0, 0},
+@@ -1107,7 +1107,7 @@
+ };
+ 
+ 
+-const char win1257_to_utf8[][4] = {
++const unsigned char win1257_to_utf8[][4] = {
+   {0, 0, 0, 0},
+   {1, 0, 0, 0},
+   {2, 0, 0, 0},
+diff -wbBur cuneiform-linux-1.1.0/cuneiform_src/Kern/rfrmt/sources/main/stdafx.h 
+cuneiform-linux-1.1.0.q/cuneiform_src/Kern/rfrmt/sources/main/stdafx.h
+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/rfrmt/sources/main/stdafx.h	2011-04-19 16:49:57.000000000 +0400
++++ cuneiform-linux-1.1.0.q/cuneiform_src/Kern/rfrmt/sources/main/stdafx.h	2017-07-05 16:37:23.528866265 +0300
+@@ -74,6 +74,9 @@
+ //отключаем warning о слишком длинных stl'ных именах
+ #pragma warning(disable:4786)
+ 
++#undef min
++#undef max
++
+ #include <vector>
+ typedef std::vector<uint16_t> vectorWord;
+ 
+diff -wbBur cuneiform-linux-1.1.0/cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp 
+cuneiform-linux-1.1.0.q/cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp
+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp	2011-04-19 16:49:57.000000000 +0400
++++ cuneiform-linux-1.1.0.q/cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp	2017-07-05 16:33:02.962211959 +0300
+@@ -594,8 +594,8 @@
+ 		return FALSE;
+ 	}
+ 
+-	wNewHeight = (mbMarginsFlag ? abs(mrMargins.rmBottomMarg - mrMargins.rmTopMarg) : mpSourceDIB->GetLinesNumber());
+-	wNewWidth = (mbMarginsFlag ? abs(mrMargins.rmLeftMarg - mrMargins.rmRightMarg) : mpSourceDIB->GetLineWidth());
++	wNewHeight = (mbMarginsFlag ? std::abs((long int)(mrMargins.rmBottomMarg - mrMargins.rmTopMarg)) : mpSourceDIB->GetLinesNumber());
++	wNewWidth = (mbMarginsFlag ? std::abs((long int)(mrMargins.rmLeftMarg - mrMargins.rmRightMarg)) : mpSourceDIB->GetLineWidth());
+ 	mpSourceDIB->GetResolutionDPM( &wXResolution, &wYResolution);
+ 
+ 	if ( !mpDestinationDIB->CreateDIBBegin( wNewWidth, wNewHeight, BitCount) )
+diff -wbBur cuneiform-linux-1.1.0/cuneiform_src/Kern/rout/src/codetables.cpp cuneiform-linux-1.1.0.q/cuneiform_src/Kern/rout/src/codetables.cpp
+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/rout/src/codetables.cpp	2011-04-19 16:49:57.000000000 +0400
++++ cuneiform-linux-1.1.0.q/cuneiform_src/Kern/rout/src/codetables.cpp	2017-07-05 16:36:05.178869982 +0300
+@@ -939,11 +939,11 @@
+ 
+ const char * getUTF8Str(const unsigned char in, const int codepage) {
+   switch(codepage) {
+-  case 1250 : return win1250_to_utf8[in];
+-  case 1251 : return win1251_to_utf8[in];
+-  case 1252 : return win1252_to_utf8[in];
+-  case 1254 : return win1254_to_utf8[in];
+-  case 1257 : return win1257_to_utf8[in];
++  case 1250 : return (const char *)win1250_to_utf8[in];
++  case 1251 : return (const char *)win1251_to_utf8[in];
++  case 1252 : return (const char *)win1252_to_utf8[in];
++  case 1254 : return (const char *)win1254_to_utf8[in];
++  case 1257 : return (const char *)win1257_to_utf8[in];
+   default : return "?";
+   }
+ }
+
diff --git a/libraries/cuneiform/cuneiform.SlackBuild b/libraries/cuneiform/cuneiform.SlackBuild
index 10103d58f8..f2294c52f2 100644
--- a/libraries/cuneiform/cuneiform.SlackBuild
+++ b/libraries/cuneiform/cuneiform.SlackBuild
@@ -11,7 +11,7 @@ TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -22,8 +22,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -53,6 +53,9 @@ find -L . \
 
 sed -i 's/\r//g' cuneiform_src/Addfiles/license.txt
 
+# Thanks to ARCH Linux
+patch -p1 < $CWD/cuneiform-gcc.patch
+
 mkdir build
 cd build
   cmake \
@@ -70,8 +73,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  issues.txt readme.txt original*.rtf cuneiform_src/Addfiles/license.txt \
+cp -a issues.txt readme.txt original*.rtf cuneiform_src/Addfiles/license.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild