[arch-commits] Commit in cuneiform/repos/community-x86_64 (5 files)
Antonio Rojas
arojas at gemini.archlinux.org
Mon Mar 21 08:06:16 UTC 2022
Date: Monday, March 21, 2022 @ 08:06:16
Author: arojas
Revision: 1166658
archrelease: copy trunk to community-x86_64
Added:
cuneiform/repos/community-x86_64/PKGBUILD
(from rev 1166657, cuneiform/trunk/PKGBUILD)
cuneiform/repos/community-x86_64/build-fix.patch
(from rev 1166657, cuneiform/trunk/build-fix.patch)
cuneiform/repos/community-x86_64/gcc11.patch
(from rev 1166657, cuneiform/trunk/gcc11.patch)
Deleted:
cuneiform/repos/community-x86_64/PKGBUILD
cuneiform/repos/community-x86_64/build-fix.patch
-----------------+
PKGBUILD | 77 ++++++++++---------
build-fix.patch | 208 +++++++++++++++++++++++++++---------------------------
gcc11.patch | 30 +++++++
3 files changed, 174 insertions(+), 141 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-21 08:05:59 UTC (rev 1166657)
+++ PKGBUILD 2022-03-21 08:06:16 UTC (rev 1166658)
@@ -1,37 +0,0 @@
-# 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=21
-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"
-}
Copied: cuneiform/repos/community-x86_64/PKGBUILD (from rev 1166657, cuneiform/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-03-21 08:06:16 UTC (rev 1166658)
@@ -0,0 +1,40 @@
+# 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=22
+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
+ gcc11.patch)
+sha256sums=('577e0d054de72086c33b4e8ae15033657776509b9a7af6eb272888eefcbdbbad'
+ '3d9f4d923ec6ca5555550819096b7d66e364a8aeb74a9d1f0d961784d267642b'
+ '2766d073e3fbf4c08e0ecb3e48cf3517f635e1d72f07f5dbb5fdd1dd88137791')
+
+prepare() {
+ cd $pkgname-linux-$pkgver
+ patch -Np1 -i ../build-fix.patch
+ patch -p1 -i ../gcc11.patch # Fix build with GCC 11 (Gentoo)
+ 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 2022-03-21 08:05:59 UTC (rev 1166657)
+++ build-fix.patch 2022-03-21 08:06:16 UTC (rev 1166658)
@@ -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 1166657, cuneiform/trunk/build-fix.patch)
===================================================================
--- build-fix.patch (rev 0)
+++ build-fix.patch 2022-03-21 08:06:16 UTC (rev 1166658)
@@ -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 "?";
+ }
+ }
Copied: cuneiform/repos/community-x86_64/gcc11.patch (from rev 1166657, cuneiform/trunk/gcc11.patch)
===================================================================
--- gcc11.patch (rev 0)
+++ gcc11.patch 2022-03-21 08:06:16 UTC (rev 1166658)
@@ -0,0 +1,30 @@
+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/hh/internal.h.orig 2021-05-23 10:45:12.714043888 +0300
++++ cuneiform-linux-1.1.0/cuneiform_src/Kern/hh/internal.h 2021-05-23 10:45:47.233178549 +0300
+@@ -84,6 +84,7 @@
+ #endif
+
+ #if !defined(__MATH_H) && !defined(_INC_MATH)
++ #undef _GLIBCXX_USE_STD_SPEC_FUNCS
+ #include <math.h>
+ #endif
+
+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp.orig 2021-05-23 10:51:00.757379453 +0300
++++ cuneiform-linux-1.1.0/cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp 2021-05-23 10:51:22.445461911 +0300
+@@ -212,7 +212,7 @@
+ }
+ */
+ // write the text lines
+- for (;sect>0;sect=sect->next)
++ for (;sect;sect=sect->next)
+ {
+ if (!WriteRtfSection(rtf,sect)) goto WRITE_END; //write section properties
+ // int sectNum=0;
+@@ -897,7 +897,7 @@
+ // if (curChar->fontNum>=rtf->page->fontsUsed || (prevChar&&prevChar->fontNum>=rtf->page->fontsUsed)) return TRUE;
+
+ // extract value for comparison
+- if (prevChar>0) {
++ if (prevChar) {
+ // lstrcpy(PrevTypeFace,TerFont[PrevFont].TypeFace);
+ PrevFamily=rtf->table[rtf->page->GetFontByNum(prevChar->fontNum)];
+ PrevStyle=prevChar->fontAttribs;
More information about the arch-commits
mailing list