diff mbox series

[meta-oe] tesseract: upgrade 5.3.0 -> 5.3.1

Message ID 1681115532-24518-1-git-send-email-wangmy@fujitsu.com
State Under Review
Headers show
Series [meta-oe] tesseract: upgrade 5.3.0 -> 5.3.1 | expand

Commit Message

Mingyu Wang (Fujitsu) April 10, 2023, 8:32 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-Fix-build-with-gcc-13-by-including-cstdint.patch
removed since it's included in 5.3.1

Changelog:
==========
 Update README.md by @seupedro in #3992
 Fix FP division by zero (issue #3995)
 Fix linkage of icu and pango
 Fix build with gcc 13 by including
 msvc debug: fix wrong lib name in generated pkgconfig file
 Fix libdir in tesseract.pc from CMake
 Replace 'can not' by 'cannot'
 Readme: Link to list of supported languages
 Improve the DebugDump output by slightly adjusting the format.
 Fix issue #4010

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...ild-with-gcc-13-by-including-cstdint.patch | 32 -------------------
 ...{tesseract_5.3.0.bb => tesseract_5.3.1.bb} |  5 ++-
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/tesseract/tesseract/0001-Fix-build-with-gcc-13-by-including-cstdint.patch
 rename meta-oe/recipes-graphics/tesseract/{tesseract_5.3.0.bb => tesseract_5.3.1.bb} (79%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-graphics/tesseract/tesseract/0001-Fix-build-with-gcc-13-by-including-cstdint.patch b/meta-oe/recipes-graphics/tesseract/tesseract/0001-Fix-build-with-gcc-13-by-including-cstdint.patch
deleted file mode 100644
index 2978080c9..000000000
--- a/meta-oe/recipes-graphics/tesseract/tesseract/0001-Fix-build-with-gcc-13-by-including-cstdint.patch
+++ /dev/null
@@ -1,32 +0,0 @@ 
-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
-
-Upstream-Status: Submitted [https://github.com/tesseract-ocr/tesseract/pull/4009]
-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 f514d870..0f3f8743 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>
--- 
-2.39.1
-
diff --git a/meta-oe/recipes-graphics/tesseract/tesseract_5.3.0.bb b/meta-oe/recipes-graphics/tesseract/tesseract_5.3.1.bb
similarity index 79%
rename from meta-oe/recipes-graphics/tesseract/tesseract_5.3.0.bb
rename to meta-oe/recipes-graphics/tesseract/tesseract_5.3.1.bb
index 057a7cd85..8e54a2791 100644
--- a/meta-oe/recipes-graphics/tesseract/tesseract_5.3.0.bb
+++ b/meta-oe/recipes-graphics/tesseract/tesseract_5.3.1.bb
@@ -5,9 +5,8 @@  BUGTRACKER = "https://github.com/tesseract-ocr/tesseract/issues"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "080da83cc51c4ef8b324a7e03146fe0bd7e0944b"
-SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=main;protocol=https \
-           file://0001-Fix-build-with-gcc-13-by-including-cstdint.patch"
+SRCREV = "71af4542990adae6d9f31d6657068bc0139c6ec4"
+SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=main;protocol=https"
 
 S = "${WORKDIR}/git"