From fd9ca058acfdd763af5363a110550bb56107b710 Mon Sep 17 00:00:00 2001 From: Francesco Marinucci Date: Wed, 24 Oct 2018 10:36:00 +0200 Subject: [PATCH] [skip-ci] cuneiform: rebuild against new imagemagick, #27 --- cuneiform/PKGBUILD | 17 +++++-- cuneiform/build-fix.patch | 104 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 5 deletions(-) create mode 100644 cuneiform/build-fix.patch diff --git a/cuneiform/PKGBUILD b/cuneiform/PKGBUILD index c606a681e..2f44ef41f 100644 --- a/cuneiform/PKGBUILD +++ b/cuneiform/PKGBUILD @@ -1,7 +1,7 @@ pkgname=cuneiform pkgver=1.1.0 _dpkgver=1.1 -pkgrel=5 +pkgrel=6 pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages." arch=('x86_64') url="https://launchpad.net/cuneiform-linux" @@ -9,12 +9,19 @@ screenshot=("http://i1-win.softpedia-static.com/screenshots/CuneiForm_3.png") license=('BSD') depends=('imagemagick' 'fftw') makedepends=('cmake') -source=(http://launchpad.net/cuneiform-linux/${_dpkgver}/${_dpkgver}/+download/cuneiform-linux-${pkgver}.tar.bz2) -md5sums=('09fd160cdfc512f26442a7e91246598d') +source=(http://launchpad.net/cuneiform-linux/${_dpkgver}/${_dpkgver}/+download/cuneiform-linux-${pkgver}.tar.bz2 + build-fix.patch) +md5sums=('09fd160cdfc512f26442a7e91246598d' + '844062a2954e82b6543da449c5495a07') + +prepare() { + cd $pkgname-linux-$pkgver + patch -Np1 -i ../build-fix.patch + sed -i 's/lib64/lib/' install_files.cmake +} build() { cd "${pkgname}-linux-${pkgver}" - sed -i 's#lib64#lib#' install_files.cmake mkdir -p builddir && cd builddir LMAGICK=`ls -1 /usr/lib/libMagick++*.so.?` @@ -22,7 +29,7 @@ build() { cmake -DCMAKE_BUILD_TYPE=release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DImageMagick_Magick++_LIBRARY=$LMAGICK \ - -DImageMagick_Magick++_INCLUDE_DIR=/usr/include/ImageMagick-6 \ + -DImageMagick_Magick++_INCLUDE_DIR=/usr/include/ImageMagick-7 \ .. make } diff --git a/cuneiform/build-fix.patch b/cuneiform/build-fix.patch new file mode 100644 index 000000000..da50bb567 --- /dev/null +++ b/cuneiform/build-fix.patch @@ -0,0 +1,104 @@ +--- cuneiform-1.1.0/cuneiform_src/Kern/hhh/tigerh/h/strings.h 2017-11-30 11:25:24.409125695 +0700 ++++ cuneiform-1.1.0-char/cuneiform_src/Kern/hhh/tigerh/h/strings.h 2017-11-30 12:09:26.033501963 +0700 +@@ -80,6 +80,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE + + # include "ltconfig.h" + # include "c_types.h" ++# include "cttypes.h" + + struct _String; + typedef struct _String STRING; +--- 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 + typedef std::vector 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 "?"; + } + }