Compare commits

...

36 Commits
f31 ... rawhide

Author SHA1 Message Date
Vitaly Zaitsev
cf4bc8fb8b
Backported GCC 13 build fix. Fixed FTBFS on Fedora 38+. 2023-03-20 21:20:08 +01:00
FeRD (Frank Dana)
4718c5afe5 fix pkg-config libdir value 2023-02-03 12:56:56 -05:00
Fedora Release Engineering
763d5ebb2d Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 04:52:54 +00:00
Yaakov Selkowitz
23a2d78a2b Conditionalize mingw build 2023-01-10 23:10:47 -05:00
Sandro Mani
a7c7f0112f Rebuild (mingw-icu) 2023-01-03 08:57:20 +01:00
Pete Walter
e917b156dd Rebuild for ICU 72 2022-12-31 03:24:08 +00:00
Sandro Mani
51ab91d575 Update to 5.3.0 2022-12-23 16:03:30 +01:00
Sandro Mani
7cabe1c16d Rebuild (leptonica) 2022-12-21 15:44:40 +01:00
Sandro Mani
c53b79b4dd Use SPDX license tag 2022-11-18 22:32:27 +01:00
Sandro Mani
f671966b22 Backport patch to restore equality between cmake and autotools generated pkgconfig file 2022-09-23 12:46:20 +02:00
Sandro Mani
1c7b1feb9b Rebuild (icu) 2022-08-05 22:12:35 +02:00
František Zatloukal
0e28f1f953 Rebuilt for ICU 71.1 2022-08-01 15:11:18 +02:00
Fedora Release Engineering
5604e29486 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 10:18:28 +00:00
Sandro Mani
7d573208d5 Update to 5.2.0 2022-07-08 10:06:33 +02:00
Sandro Mani
d57de79962 Rebuild with mingw-gcc-12 2022-03-25 14:59:54 +01:00
Sandro Mani
b72178e0a5 Build training tool libraries statically 2022-03-11 11:30:12 +01:00
Sandro Mani
622725d184 Update to 5.1.0 2022-03-09 22:24:34 +01:00
Sandro Mani
169b89268f Bump as F36 needs another rebuild 2022-02-25 13:22:25 +01:00
Sandro Mani
c20ad5eae6 Make mingw subpackages noarch 2022-02-24 20:06:04 +01:00
Sandro Mani
ba095eadde Add mingw subpackages 2022-02-24 11:11:04 +01:00
Fedora Release Engineering
2de82b3be1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 02:32:10 +00:00
Sandro Mani
cf495ac5b5 Update to 5.0.1 2022-01-08 09:29:47 +01:00
Sandro Mani
e6f7f8f417 Workaround armv7hl build failure due to -mfpu=vfpv3-d16 appearing after mfpu=neon 2021-12-17 17:59:50 +01:00
Sandro Mani
3361cdfe52 Revert to autotools 2021-12-17 11:36:36 +01:00
Sandro Mani
60e83f645c Also install training libraries 2021-12-15 15:16:44 +01:00
Sandro Mani
999433700a Update to 5.0.0 2021-12-14 12:26:13 +01:00
Sandro Mani
7e0070b2c1 Update to 4.1.3 2021-11-17 20:49:21 +01:00
Fedora Release Engineering
b7e7f1cc99 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 19:05:37 +00:00
Pete Walter
e2dbb60141 Rebuild for ICU 69 2021-05-20 01:20:18 +01:00
Fedora Release Engineering
5c612220ed - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 21:47:52 +00:00
Tom Stellard
93771ebc51 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-08 22:27:16 +00:00
Fedora Release Engineering
9b0d582ec6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 12:18:47 +00:00
Pete Walter
e03fa52be2 Rebuild for ICU 67 2020-05-16 08:25:20 +01:00
Fedora Release Engineering
7ae0e18c8f - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 01:21:24 +00:00
Sandro Mani
343cdd3feb Update to 4.1.1 2019-12-27 21:30:06 +01:00
Pete Walter
59b0b60939 Rebuild for ICU 65 2019-11-01 15:52:21 +00:00
7 changed files with 403 additions and 85 deletions

7
.gitignore vendored
View File

@ -17,3 +17,10 @@ tesseract-2.00.eng.tar.gz
/tessdata_fast-4.0.0.tar.gz
/tesseract-4.0.0.tar.gz
/tesseract-4.1.0.tar.gz
/tesseract-4.1.1.tar.gz
/tesseract-4.1.3.tar.gz
/tesseract-5.0.0.tar.gz
/tesseract-5.0.1.tar.gz
/tesseract-5.1.0.tar.gz
/tesseract-5.2.0.tar.gz
/tesseract-5.3.0.tar.gz

View File

@ -1 +1 @@
SHA512 (tesseract-4.1.0.tar.gz) = d617f5c5b826640b2871dbe3d7973bcc5e66fafd837921a20e009d683806ed50f0f258aa455019d99fc54f5cb65c2fa0380e3a3c92b39ab0684b8799c730b09d
SHA512 (tesseract-5.3.0.tar.gz) = fc0cfda980059390b7d6d3d8e475b4ecc9dcfee1abc3b16fc9ffc8904db0a0847a5f6f1b32bd2e1f6f5a714a8c4df0fb3dc7c6aa25ece6162bf52fe86b4d0f34

View File

@ -1,26 +1,72 @@
#global pre beta.4
%if 0%{?rhel}
%bcond_with mingw
%else
%bcond_without mingw
%endif
Name: tesseract
Version: 4.1.0
Release: 1%{?pre:.%pre}%{?dist}
Version: 5.3.0
Release: 6%{?dist}
Summary: Raw OCR Engine
License: ASL 2.0
License: Apache-2.0
URL: https://github.com/tesseract-ocr/%{name}
Source0: https://github.com/tesseract-ocr/tesseract/archive/%{version}%{?pre:-%pre}/%{name}-%{version}%{?pre:-%pre}.tar.gz
# Tweak location of tessdata folder
Patch0: tesseract_datadir.patch
# Fix library name case
# Fix shared library version suffix
# Honour TESSDATA_PREFIX
# Build training libs statically
Patch0: tesseract_cmake.patch
# Generate correct libdir path in /usr/lib64/pkgconfig/tesseract.pc
# Already merged upstream, can be dropped at next release
# https://github.com/tesseract-ocr/tesseract/commit/5e116fa5cad249b8a08d22af652cf52f44fbb8cd
Patch1: tesseract_libdir.patch
# Fixed FTBFS under GCC 13:
# https://github.com/tesseract-ocr/tesseract/commit/2025b53de6b3d97285d7c5f80497493007c586c3
Patch2: tesseract_gcc13.patch
BuildRequires: automake
BuildRequires: autoconf-archive
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: giflib-devel
BuildRequires: leptonica-devel
BuildRequires: libicu-devel
BuildRequires: libjpeg-turbo-devel
BuildRequires: libtool
BuildRequires: libtiff-devel
BuildRequires: leptonica-devel
BuildRequires: cairo-devel
BuildRequires: libicu-devel
BuildRequires: libwebp-devel
BuildRequires: pango-devel
BuildRequires: /usr/bin/asciidoc
BuildRequires: /usr/bin/xsltproc
%if %{with mingw}
BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-gcc
BuildRequires: mingw32-giflib
BuildRequires: mingw32-binutils
BuildRequires: mingw32-icu
BuildRequires: mingw32-leptonica
BuildRequires: mingw32-libgomp
BuildRequires: mingw32-libjpeg-turbo
BuildRequires: mingw32-libtiff
BuildRequires: mingw32-libwebp
BuildRequires: mingw32-pango
BuildRequires: mingw64-filesystem >= 95
BuildRequires: mingw64-gcc
BuildRequires: mingw64-giflib
BuildRequires: mingw64-binutils
BuildRequires: mingw64-icu
BuildRequires: mingw64-leptonica
BuildRequires: mingw64-libgomp
BuildRequires: mingw64-libjpeg-turbo
BuildRequires: mingw64-libtiff
BuildRequires: mingw64-libwebp
BuildRequires: mingw64-pango
%endif
Requires: tesseract-langpack-eng
@ -48,46 +94,93 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
The %{name}-tools package contains tools for training %{name}.
%package -n mingw32-%{name}
Summary: MinGW Windows tesseract-ocr library
BuildArch: noarch
%description -n mingw32-%{name}
MinGW Windows tesseract-ocr library.
%package -n mingw32-%{name}-tools
Summary: MinGW Windows tesseract-ocr library tools
Requires: mingw32-%{name} = %{version}-%{release}
BuildArch: noarch
%description -n mingw32-%{name}-tools
MinGW Windows tesseract-ocr library tools.
%package -n mingw64-%{name}
Summary: MinGW Windows tesseract-ocr library
BuildArch: noarch
%description -n mingw64-%{name}
MinGW Windows tesseract-ocr library.
%package -n mingw64-%{name}-tools
Summary: MinGW Windows tesseract-ocr library tools
Requires: mingw64-%{name} = %{version}-%{release}
BuildArch: noarch
%description -n mingw64-%{name}-tools
MinGW Windows tesseract-ocr library tools.
%{?mingw_debug_package}
%prep
%autosetup -p1 -n %{name}-%{version}%{?pre:-%pre}
%build
autoreconf -ifv
%configure --disable-static
# Native build
%cmake -DCMAKE_INSTALL_LIBDIR=%{_lib} -DTESSDATA_PREFIX=%{_datadir}/%{name}
%cmake_build
%make_build
%make_build training
# Manually build manfiles, cmake does not build them
man_xslt=http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
for file in doc/*.asc; do
asciidoc -b docbook -d manpage -o - $file | XML_CATALOG_FILES=%{_sysconfdir}/xml/catalog xsltproc --nonet -o ${file/.asc/} $man_xslt -
done
%if %{with mingw}
# MinGW build
MINGW32_CMAKE_ARGS=-DTESSDATA_PREFIX=%{mingw32_datadir}/%{name} \
MINGW64_CMAKE_ARGS=-DTESSDATA_PREFIX=%{mingw64_datadir}/%{name}
%mingw_cmake -DSW_BUILD=OFF
%mingw_make_build
%endif
%install
%make_install
%make_install training-install
%cmake_install
mkdir -p %{buildroot}%{_mandir}/{man1,man5}/
cp -a doc/*.1 %{buildroot}%{_mandir}/man1/
cp -a doc/*.5 %{buildroot}%{_mandir}/man5/
find %{buildroot}%{_libdir} -type f -name '*.la' -delete
# Create directory for tessdata
mkdir -p %{buildroot}/%{_datadir}/%{name}/tessdata/
%ldconfig_scriptlets
%if %{with mingw}
%mingw_make_install
%mingw_debug_install_post
%endif
%files
%license LICENSE
%doc AUTHORS ChangeLog README.md
%{_bindir}/%{name}
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/tessdata
%{_datadir}/%{name}/tessdata/configs/
%{_datadir}/%{name}/tessdata/tessconfigs/
%{_datadir}/%{name}/tessdata/pdf.ttf
%{_libdir}/lib%{name}*.so.4*
%{_libdir}/lib%{name}.so.5.3.0
%{_datadir}/%{name}/
%{_mandir}/man1/tesseract.1*
%files devel
%{_includedir}/%{name}
%{_libdir}/lib%{name}*.so
%{_libdir}/lib%{name}.so
%{_libdir}/libcommon_training.a
%{_libdir}/libunicharset_training.a
%{_libdir}/cmake/%{name}/
%{_libdir}/pkgconfig/%{name}.pc
%files tools
@ -97,21 +190,162 @@ mkdir -p %{buildroot}/%{_datadir}/%{name}/tessdata/
%{_bindir}/combine_lang_model
%{_bindir}/combine_tessdata
%{_bindir}/dawg2wordlist
%{_bindir}/language-specific.sh
%{_bindir}/lstmeval
%{_bindir}/lstmtraining
%{_bindir}/merge_unicharsets
%{_bindir}/mftraining
%{_bindir}/set_unicharset_properties
%{_bindir}/shapeclustering
%{_bindir}/tesstrain.sh
%{_bindir}/tesstrain_utils.sh
%{_bindir}/text2image
%{_bindir}/unicharset_extractor
%{_bindir}/wordlist2dawg
%{_mandir}/man1/ambiguous_words.1*
%{_mandir}/man1/classifier_tester.1*
%{_mandir}/man1/cntraining.1*
%{_mandir}/man1/combine_lang_model.1*
%{_mandir}/man1/combine_tessdata.1*
%{_mandir}/man1/dawg2wordlist.1*
%{_mandir}/man1/lstmeval.1*
%{_mandir}/man1/lstmtraining.1*
%{_mandir}/man1/merge_unicharsets.1*
%{_mandir}/man1/mftraining.1*
%{_mandir}/man1/set_unicharset_properties.1*
%{_mandir}/man1/shapeclustering.1*
%{_mandir}/man1/text2image.1*
%{_mandir}/man1/unicharset_extractor.1*
%{_mandir}/man1/wordlist2dawg.1*
%{_mandir}/man5/unicharambigs.5.gz*
%{_mandir}/man5/unicharset.5.gz*
%if %{with mingw}
%files -n mingw32-%{name}
%license LICENSE
%{mingw32_bindir}/libtesseract-53.dll
%{mingw32_includedir}/tesseract/
%{mingw32_libdir}/libtesseract.dll.a
%{mingw32_libdir}/libcommon_training.a
%{mingw32_libdir}/libunicharset_training.a
%{mingw32_libdir}/pkgconfig/tesseract.pc
%{mingw32_libdir}/cmake/%{name}/
%{mingw32_datadir}/%{name}/
%files -n mingw32-%{name}-tools
%{mingw32_bindir}/*.exe
%files -n mingw64-%{name}
%license LICENSE
%{mingw64_bindir}/libtesseract-53.dll
%{mingw64_includedir}/tesseract/
%{mingw64_libdir}/libtesseract.dll.a
%{mingw64_libdir}/libcommon_training.a
%{mingw64_libdir}/libunicharset_training.a
%{mingw64_libdir}/pkgconfig/tesseract.pc
%{mingw64_libdir}/cmake/%{name}/
%{mingw64_datadir}/%{name}/
%files -n mingw64-%{name}-tools
%{mingw64_bindir}/*.exe
%endif
%changelog
* Mon Mar 20 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 5.3.0-6
- Backported GCC 13 build fix. Fixed FTBFS on Fedora 38+.
* Fri Feb 03 2023 FeRD (Frank Dana) <ferdnyc@gmail.com> - 5.3.0-5
- Add patch from upstream to fix pkg-config libdir value
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Jan 03 2023 Sandro Mani <manisandro@gmail.com> - 5.3.0-3
- Rebuild (mingw-icu)
* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 5.3.0-2
- Rebuild for ICU 72
* Fri Dec 23 2022 Sandro Mani <manisandro@gmail.com> - 5.3.0-1
- Update to 5.3.0
* Wed Dec 21 2022 Sandro Mani <manisandro@gmail.com> - 5.2.0-6
- Rebuild (leptonica)
* Fri Sep 23 2022 Sandro Mani <manisandro@gmail.com> - 5.2.0-5
- Backport patch to restore equality between cmake and autotools generated
pkgconfig file
* Fri Aug 05 2022 Sandro Mani <manisandro@gmail.com> - 5.2.0-4
- Rebuild (icu)
* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 5.2.0-3
- Rebuilt for ICU 71.1
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jul 07 2022 Sandro Mani <manisandro@gmail.com> - 5.2.0-1
- Update to 5.2.0
* Fri Mar 25 2022 Sandro Mani <manisandro@gmail.com> - 5.1.0-3
- Rebuild with mingw-gcc-12
* Fri Mar 11 2022 Sandro Mani <manisandro@gmail.com> - 5.1.0-2
- Build training tool libraries statically
* Wed Mar 02 2022 Sandro Mani <manisandro@gmail.com> - 5.1.0-1
- Update to 5.1.0
* Fri Feb 25 2022 Sandro Mani <manisandro@gmail.com> - 5.0.1-5
- Bump as F36 needs another rebuild
* Thu Feb 24 2022 Sandro Mani <manisandro@gmail.com> - 5.0.1-4
- Make mingw subpackages noarch
* Sat Feb 19 2022 Sandro Mani <manisandro@gmail.com> - 5.0.1-3
- Add mingw subpackage
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Sat Jan 08 2022 Sandro Mani <manisandro@gmail.com> - 5.0.1-1
- Update to 5.0.1
* Fri Dec 17 2021 Sandro Mani <manisandro@gmail.com> - 5.0.0-3
- Switch back to autotools
* Wed Dec 15 2021 Sandro Mani <manisandro@gmail.com> - 5.0.0-2
- Also install training libraries
* Fri Dec 10 2021 Sandro Mani <manisandro@gmail.com> - 5.0.0-1
- Update to 5.0.0
* Wed Nov 17 2021 Sandro Mani <manisandro@gmail.com> - 4.1.3-1
- Update to 4.1.7
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu May 20 2021 Pete Walter <pwalter@fedoraproject.org> - 4.1.1-6
- Rebuild for ICU 69
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 4.1.1-3
- Rebuild for ICU 67
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Dec 27 2019 Sandro Mani <manisandro@gmail.com> - 4.1.1-1
- Update to 4.1.1
* Fri Nov 01 2019 Pete Walter <pwalter@fedoraproject.org> - 4.1.0-2
- Rebuild for ICU 65
* Sun Jul 28 2019 Sandro Mani <manisandro@gmail.com> - 4.1.0-1
- Update to 4.1.0

70
tesseract_cmake.patch Normal file
View File

@ -0,0 +1,70 @@
diff -rupN --no-dereference tesseract-5.3.0/CMakeLists.txt tesseract-5.3.0-new/CMakeLists.txt
--- tesseract-5.3.0/CMakeLists.txt 2022-12-22 14:57:57.000000000 +0100
+++ tesseract-5.3.0-new/CMakeLists.txt 2022-12-23 10:33:09.303707322 +0100
@@ -345,7 +345,7 @@ elseif(UNIX)
set(LIB_pthread pthread)
endif()
elseif(WIN32)
- set(LIB_Ws2_32 Ws2_32)
+ set(LIB_Ws2_32 ws2_32)
endif()
add_definitions("-DCMAKE_BUILD")
@@ -812,11 +812,14 @@ set_target_properties(libtesseract
set_target_properties(libtesseract
PROPERTIES SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
-if(WIN32)
+if(MSVC)
set_target_properties(libtesseract
PROPERTIES OUTPUT_NAME tesseract${VERSION_MAJOR}${VERSION_MINOR})
set_target_properties(libtesseract
PROPERTIES DEBUG_OUTPUT_NAME tesseract${VERSION_MAJOR}${VERSION_MINOR}d)
+elseif(MINGW)
+ set_target_properties(libtesseract PROPERTIES SUFFIX "-${VERSION_MAJOR}${VERSION_MINOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ set_target_properties(libtesseract PROPERTIES OUTPUT_NAME tesseract)
else()
set_target_properties(libtesseract PROPERTIES OUTPUT_NAME tesseract)
endif()
@@ -931,9 +934,9 @@ install(
if(INSTALL_CONFIGS)
install(FILES ${TESSERACT_CONFIGS}
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/tessdata/configs)
+ DESTINATION ${TESSDATA_PREFIX}/tessdata/configs)
install(FILES ${TESSERACT_TESSCONFIGS}
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/tessdata/tessconfigs)
+ DESTINATION ${TESSDATA_PREFIX}/tessdata/tessconfigs)
endif()
# ##############################################################################
diff -rupN --no-dereference tesseract-5.3.0/src/training/CMakeLists.txt tesseract-5.3.0-new/src/training/CMakeLists.txt
--- tesseract-5.3.0/src/training/CMakeLists.txt 2022-12-22 14:57:57.000000000 +0100
+++ tesseract-5.3.0-new/src/training/CMakeLists.txt 2022-12-23 10:33:09.303707322 +0100
@@ -115,7 +115,7 @@ if(NOT DISABLED_LEGACY_ENGINE)
common/trainingsampleset.h)
endif()
-add_library(common_training ${COMMON_TRAINING_SRC})
+add_library(common_training STATIC ${COMMON_TRAINING_SRC})
target_include_directories(common_training PUBLIC common
${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(common_training PUBLIC libtesseract)
@@ -254,7 +254,7 @@ if(ICU_FOUND)
file(GLOB unicharset_training_src unicharset/*)
- add_library(unicharset_training ${unicharset_training_src})
+ add_library(unicharset_training STATIC ${unicharset_training_src})
if(SW_BUILD)
target_link_libraries(unicharset_training
PUBLIC common_training org.sw.demo.unicode.icu.i18n)
@@ -378,7 +378,7 @@ if(ICU_FOUND)
file(GLOB pango_training_src pango/*)
- add_library(pango_training ${pango_training_src})
+ add_library(pango_training STATIC ${pango_training_src})
target_link_libraries(pango_training PUBLIC unicharset_training)
if(SW_BUILD)
target_link_libraries(pango_training

View File

@ -1,50 +0,0 @@
diff -rupN tesseract-4.1.0/src/ccutil/Makefile.am tesseract-4.1.0-new/src/ccutil/Makefile.am
--- tesseract-4.1.0/src/ccutil/Makefile.am 2019-07-07 14:34:08.000000000 +0200
+++ tesseract-4.1.0-new/src/ccutil/Makefile.am 2019-07-16 19:14:00.221957997 +0200
@@ -2,7 +2,7 @@ AM_CXXFLAGS =
AM_CPPFLAGS =
if !NO_TESSDATA_PREFIX
-AM_CXXFLAGS += -DTESSDATA_PREFIX=@datadir@
+AM_CXXFLAGS += -DTESSDATA_PREFIX=@datadir@/tesseract/
endif
if VISIBILITY
diff -rupN tesseract-4.1.0/src/lstm/Makefile.am tesseract-4.1.0-new/src/lstm/Makefile.am
--- tesseract-4.1.0/src/lstm/Makefile.am 2019-07-07 14:34:08.000000000 +0200
+++ tesseract-4.1.0-new/src/lstm/Makefile.am 2019-07-16 19:14:00.221957997 +0200
@@ -16,7 +16,7 @@ AM_CPPFLAGS += -I/usr/include/tensorflow
endif
if !NO_TESSDATA_PREFIX
-AM_CXXFLAGS += -DTESSDATA_PREFIX=@datadir@
+AM_CXXFLAGS += -DTESSDATA_PREFIX=@datadir@/tesseract/
endif
if VISIBILITY
diff -rupN tesseract-4.1.0/tessdata/configs/Makefile.am tesseract-4.1.0-new/tessdata/configs/Makefile.am
--- tesseract-4.1.0/tessdata/configs/Makefile.am 2019-07-07 14:34:08.000000000 +0200
+++ tesseract-4.1.0-new/tessdata/configs/Makefile.am 2019-07-16 19:14:00.221957997 +0200
@@ -1,4 +1,4 @@
-datadir = @datadir@/tessdata/configs
+datadir = @datadir@/tesseract/tessdata/configs
data_DATA = inter makebox box.train unlv ambigs.train lstm.train lstmdebug
data_DATA += api_config kannada box.train.stderr quiet logfile digits get.images
data_DATA += lstmbox wordstrbox
diff -rupN tesseract-4.1.0/tessdata/Makefile.am tesseract-4.1.0-new/tessdata/Makefile.am
--- tesseract-4.1.0/tessdata/Makefile.am 2019-07-07 14:34:08.000000000 +0200
+++ tesseract-4.1.0-new/tessdata/Makefile.am 2019-07-16 19:14:00.221957997 +0200
@@ -1,4 +1,4 @@
-datadir = @datadir@/tessdata
+datadir = @datadir@/tesseract/tessdata
data_DATA = pdf.ttf
EXTRA_DIST = $(data_DATA)
diff -rupN tesseract-4.1.0/tessdata/tessconfigs/Makefile.am tesseract-4.1.0-new/tessdata/tessconfigs/Makefile.am
--- tesseract-4.1.0/tessdata/tessconfigs/Makefile.am 2019-07-07 14:34:08.000000000 +0200
+++ tesseract-4.1.0-new/tessdata/tessconfigs/Makefile.am 2019-07-16 19:14:00.221957997 +0200
@@ -1,3 +1,3 @@
-datadir = @datadir@/tessdata/tessconfigs
+datadir = @datadir@/tesseract/tessdata/tessconfigs
data_DATA = batch batch.nochop nobatch matdemo segdemo msdemo
EXTRA_DIST = batch batch.nochop nobatch matdemo segdemo msdemo

28
tesseract_gcc13.patch Normal file
View File

@ -0,0 +1,28 @@
From 2025b53de6b3d97285d7c5f80497493007c586c3 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 30 Jan 2023 11:27:07 -0800
Subject: [PATCH] Fix build with gcc 13 by including <cstdint>
gcc 13 moved some includes around and as a result <cstdint> is
no longer transitively included [1]. Explicitly include it for
int32_t.
[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/ccutil/params.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/ccutil/params.h b/src/ccutil/params.h
index f514d8709c..0f3f874357 100644
--- a/src/ccutil/params.h
+++ b/src/ccutil/params.h
@@ -21,6 +21,7 @@
#include <tesseract/export.h> // for TESS_API
+#include <cstdint>
#include <cstdio>
#include <cstring>
#include <string>

29
tesseract_libdir.patch Normal file
View File

@ -0,0 +1,29 @@
From 5e116fa5cad249b8a08d22af652cf52f44fbb8cd Mon Sep 17 00:00:00 2001
From: Frank Dana <ferdnyc@gmail.com>
Date: Thu, 2 Feb 2023 19:57:59 -0500
Subject: [PATCH] Fix libdir in tesseract.pc from CMake
tesseract.pc.cmake was hardcoding libdir to
`{prefix}/lib`, which is wrong for systems that use
`/usr/lib64/` on 64-bit. `CMAKE_INSTALL_LIBDIR`
is already expected to contain the libdir path
relative to the install prefix.
---
tesseract.pc.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tesseract.pc.cmake b/tesseract.pc.cmake
index 7f36ce19..5469a398 100644
--- a/tesseract.pc.cmake
+++ b/tesseract.pc.cmake
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}/bin
-libdir=${prefix}/lib
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
includedir=${prefix}/include
Name: @tesseract_NAME@
--
2.39.1