[arch-commits] Commit in cuneiform/repos/community-x86_64 (4 files)

Antonio Rojas arojas at archlinux.org
Sat May 30 19:03:56 UTC 2020


    Date: Saturday, May 30, 2020 @ 19:03:56
  Author: arojas
Revision: 637492

archrelease: copy trunk to community-x86_64

Added:
  cuneiform/repos/community-x86_64/PKGBUILD
    (from rev 637491, cuneiform/trunk/PKGBUILD)
  cuneiform/repos/community-x86_64/build-fix.patch
    (from rev 637491, cuneiform/trunk/build-fix.patch)
Deleted:
  cuneiform/repos/community-x86_64/PKGBUILD
  cuneiform/repos/community-x86_64/build-fix.patch

-----------------+
 PKGBUILD        |   75 +++++++++----------
 build-fix.patch |  208 +++++++++++++++++++++++++++---------------------------
 2 files changed, 141 insertions(+), 142 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-30 19:03:23 UTC (rev 637491)
+++ PKGBUILD	2020-05-30 19:03:56 UTC (rev 637492)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Maxim Vuets <maxim.vuets at gmail.com>
-
-pkgname=cuneiform
-pkgver=1.1.0
-pkgrel=19
-pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages"
-arch=('x86_64')
-url="https://launchpad.net/cuneiform-linux"
-license=('BSD')
-depends=('libmagick')
-makedepends=('cmake')
-source=(https://launchpad.net/cuneiform-linux/${pkgver%.*}/${pkgver%.*}/+download/$pkgname-linux-$pkgver.tar.bz2
-	build-fix.patch)
-sha256sums=('577e0d054de72086c33b4e8ae15033657776509b9a7af6eb272888eefcbdbbad'
-            '3d9f4d923ec6ca5555550819096b7d66e364a8aeb74a9d1f0d961784d267642b')
-
-prepare() {
-  cd $pkgname-linux-$pkgver
-  patch -Np1 -i ../build-fix.patch
-  sed -i 's/lib64/lib/' install_files.cmake
-}
-
-build() {
-  cd $pkgname-linux-$pkgver
-  [[ -d build ]] || mkdir build
-  cd build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd $pkgname-linux-$pkgver/build
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../cuneiform_src/Kern/license.txt "$pkgdir/usr/share/licenses/cuneiform/license.txt"
-}

Copied: cuneiform/repos/community-x86_64/PKGBUILD (from rev 637491, cuneiform/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-30 19:03:56 UTC (rev 637492)
@@ -0,0 +1,37 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Maxim Vuets <maxim.vuets at gmail.com>
+
+pkgname=cuneiform
+pkgver=1.1.0
+pkgrel=20
+pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages"
+arch=('x86_64')
+url="https://launchpad.net/cuneiform-linux"
+license=('BSD')
+depends=('libmagick')
+makedepends=('cmake')
+source=(https://launchpad.net/cuneiform-linux/${pkgver%.*}/${pkgver%.*}/+download/$pkgname-linux-$pkgver.tar.bz2
+	build-fix.patch)
+sha256sums=('577e0d054de72086c33b4e8ae15033657776509b9a7af6eb272888eefcbdbbad'
+            '3d9f4d923ec6ca5555550819096b7d66e364a8aeb74a9d1f0d961784d267642b')
+
+prepare() {
+  cd $pkgname-linux-$pkgver
+  patch -Np1 -i ../build-fix.patch
+  sed -i 's/lib64/lib/' install_files.cmake
+# Don't override LDFLAGS
+  sed -e '/CMAKE_SHARED_LINKER_FLAGS/d' -i cuneiform_src/CMakeLists.txt
+}
+
+build() {
+  CFLAGS+=' -fcommon'
+  cmake -B build -S $pkgname-linux-$pkgver .. \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+  install -Dm644 $pkgname-linux-$pkgver/cuneiform_src/Kern/license.txt "$pkgdir/usr/share/licenses/cuneiform/license.txt"
+}

Deleted: build-fix.patch
===================================================================
--- build-fix.patch	2020-05-30 19:03:23 UTC (rev 637491)
+++ build-fix.patch	2020-05-30 19:03:56 UTC (rev 637492)
@@ -1,104 +0,0 @@
---- 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 <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 "?";
-   }
- }

Copied: cuneiform/repos/community-x86_64/build-fix.patch (from rev 637491, cuneiform/trunk/build-fix.patch)
===================================================================
--- build-fix.patch	                        (rev 0)
+++ build-fix.patch	2020-05-30 19:03:56 UTC (rev 637492)
@@ -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 <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 "?";
+   }
+ }


More information about the arch-commits mailing list