From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 345C6158042 for ; Tue, 5 Nov 2024 19:45:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D5F8E07EC; Tue, 5 Nov 2024 19:45:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5FC0FE07EC for ; Tue, 5 Nov 2024 19:45:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 72F8633BEFF for ; Tue, 5 Nov 2024 19:45:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F2461953 for ; Tue, 5 Nov 2024 19:45:17 +0000 (UTC) From: "Bernard Cafarelli" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Bernard Cafarelli" Message-ID: <1730835909.098e47f5c087c82d3d0f08c7f3d46367289560e9.voyageur@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/, app-text/tesseract/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/tesseract/Manifest app-text/tesseract/files/tesseract-5.3.0-gcc-13.patch app-text/tesseract/metadata.xml app-text/tesseract/tesseract-5.3.0.ebuild app-text/tesseract/tesseract-5.3.4.ebuild X-VCS-Directories: app-text/tesseract/files/ app-text/tesseract/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: 098e47f5c087c82d3d0f08c7f3d46367289560e9 X-VCS-Branch: master Date: Tue, 5 Nov 2024 19:45:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 972239f1-9ae2-486b-be63-b0093fc45d49 X-Archives-Hash: 5a76c6ad7b068142ca25e3211eb2a90b commit: 098e47f5c087c82d3d0f08c7f3d46367289560e9 Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Nov 5 19:45:09 2024 +0000 Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Nov 5 19:45:09 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=098e47f5 app-text/tesseract: drop 5.3.0, 5.3.4 Signed-off-by: Bernard Cafarelli gentoo.org> app-text/tesseract/Manifest | 2 - .../tesseract/files/tesseract-5.3.0-gcc-13.patch | 25 ------ app-text/tesseract/metadata.xml | 1 - app-text/tesseract/tesseract-5.3.0.ebuild | 96 ---------------------- app-text/tesseract/tesseract-5.3.4.ebuild | 96 ---------------------- 5 files changed, 220 deletions(-) diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest index 08149308d5ac..d3f9ed3a4abe 100644 --- a/app-text/tesseract/Manifest +++ b/app-text/tesseract/Manifest @@ -1,3 +1 @@ -DIST tesseract-5.3.0.tar.gz 1913678 BLAKE2B 975b3a50dc2c9ec7ded82caaa068d2d9d362ee0bc6d51b41a52c692ac7f51231d4c64a9dda9e7b850297d4c1f13eb40a709e59eebe143df4f5e2a060cfbbfd3a SHA512 fc0cfda980059390b7d6d3d8e475b4ecc9dcfee1abc3b16fc9ffc8904db0a0847a5f6f1b32bd2e1f6f5a714a8c4df0fb3dc7c6aa25ece6162bf52fe86b4d0f34 -DIST tesseract-5.3.4.tar.gz 1918319 BLAKE2B f4becd425594be132df2c206847faa91daf9bc58d83eac31096f92cf7d7b6c9234ae224ee94ed1f3099414bde393bb86f94d1f76fdc05b4310b415b0d7eb05af SHA512 a81c98c3754a71093df7b51390ccd43d05f661352b4cb564e403b96d81909664c2ecbf2eb6f37614c4639e6dadbf2329b926d09271dbbdaa302f2d7b6b0d628a DIST tesseract-5.4.1.tar.gz 1899949 BLAKE2B 8e9ff54902d467a4ef0dc61665570a6d34ecdd2d89fd0023775212eb531e3c11659d17e5bb1733f570f785af4714d5a5259d1f809f6e28c0a65375ba02d21bdc SHA512 a97a31d1b735930a3e8b17bc2eae24210d8242d31399822f8bc2e9f18903d513cf6d02b2274e2f3ce431183467570b3327e01cbc49dca80e38acb90327cc235e diff --git a/app-text/tesseract/files/tesseract-5.3.0-gcc-13.patch b/app-text/tesseract/files/tesseract-5.3.0-gcc-13.patch deleted file mode 100644 index 959948aa677c..000000000000 --- a/app-text/tesseract/files/tesseract-5.3.0-gcc-13.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://github.com/tesseract-ocr/tesseract/commit/2025b53de6b3d97285d7c5f80497493007c586c3 - -From 2025b53de6b3d97285d7c5f80497493007c586c3 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 30 Jan 2023 11:27:07 -0800 -Subject: [PATCH] Fix build with gcc 13 by including - -gcc 13 moved some includes around and as a result 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 ---- a/src/ccutil/params.h -+++ b/src/ccutil/params.h -@@ -21,6 +21,7 @@ - - #include // for TESS_API - -+#include - #include - #include - #include - diff --git a/app-text/tesseract/metadata.xml b/app-text/tesseract/metadata.xml index f0a94f168931..d6c7013dc4a0 100644 --- a/app-text/tesseract/metadata.xml +++ b/app-text/tesseract/metadata.xml @@ -17,7 +17,6 @@ Support float for model training and text recognition (faster, requires less RAM) - Enable opencl support for speedup using GPU computation. Install training applications to add support for new languages. diff --git a/app-text/tesseract/tesseract-5.3.0.ebuild b/app-text/tesseract/tesseract-5.3.0.ebuild deleted file mode 100644 index bca9d3973c0e..000000000000 --- a/app-text/tesseract/tesseract-5.3.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools multilib-minimal toolchain-funcs - -DESCRIPTION="An OCR Engine, originally developed at HP, now open source" -HOMEPAGE="https://github.com/tesseract-ocr" -SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/5" -KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86" -IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp" - -COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?] - opencl? ( - virtual/opencl[${MULTILIB_USEDEP}] - media-libs/tiff:=[${MULTILIB_USEDEP}] - media-libs/leptonica:=[tiff] - ) - training? ( - dev-libs/icu:= - x11-libs/pango:= - x11-libs/cairo:= - )" -RDEPEND="${COMMON_DEPEND} - || ( - >=app-text/tessdata_fast-4.0.0 - >=app-text/tessdata_best-4.0.0 - >=app-text/tessdata_legacy-4.0.0 - )" -DEPEND="${COMMON_DEPEND} - app-text/asciidoc - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - doc? ( app-text/doxygen )" - -PATCHES=( - "${FILESDIR}"/${P}-gcc-13.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - # scrollview disabled for now, see bug #686944 - local myeconfargs=( - --enable-shared - --disable-graphics - $(use_enable float32) - $(use_enable opencl) - $(use_enable openmp) - $(use_enable static-libs static) - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - if multilib_is_native_abi; then - use doc && emake doc - use training && emake training - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md ) - if use doc; then - HTML_DOCS=( doc/html/. ) - fi - einstalldocs - - if use training; then - emake DESTDIR="${D}" training-install - fi - fi - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - find "${D}" -name '*.la' -type f -delete || die -} diff --git a/app-text/tesseract/tesseract-5.3.4.ebuild b/app-text/tesseract/tesseract-5.3.4.ebuild deleted file mode 100644 index 1b9959185042..000000000000 --- a/app-text/tesseract/tesseract-5.3.4.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools multilib-minimal toolchain-funcs - -DESCRIPTION="An OCR Engine, originally developed at HP, now open source" -HOMEPAGE="https://github.com/tesseract-ocr" -SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/5" -KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86" -IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp" - -COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?] - opencl? ( - virtual/opencl[${MULTILIB_USEDEP}] - media-libs/tiff:=[${MULTILIB_USEDEP}] - media-libs/leptonica:=[tiff] - ) - training? ( - dev-libs/icu:= - x11-libs/pango:= - x11-libs/cairo:= - )" -RDEPEND="${COMMON_DEPEND} - || ( - >=app-text/tessdata_fast-4.0.0 - >=app-text/tessdata_best-4.0.0 - >=app-text/tessdata_legacy-4.0.0 - )" -DEPEND="${COMMON_DEPEND} - app-text/asciidoc - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - doc? ( app-text/doxygen )" - -PATCHES=( - "${FILESDIR}"/${PN}-5.4.1-arm64-neon-tesseract.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - # scrollview disabled for now, see bug #686944 - local myeconfargs=( - --enable-shared - --disable-graphics - $(use_enable float32) - $(use_enable opencl) - $(use_enable openmp) - $(use_enable static-libs static) - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - if multilib_is_native_abi; then - use doc && emake doc - use training && emake training - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md ) - if use doc; then - HTML_DOCS=( doc/html/. ) - fi - einstalldocs - - if use training; then - emake DESTDIR="${D}" training-install - fi - fi - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - find "${D}" -name '*.la' -type f -delete || die -}