<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/719d557396819aee894e316174e4dd532184142f">https://github.com/macports/macports-ports/commit/719d557396819aee894e316174e4dd532184142f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 719d5573968 tesseract: fix 10.7, variants, and configure
</span>719d5573968 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 719d557396819aee894e316174e4dd532184142f
</span>Author: Mark Anderson <mark@macports.org>
AuthorDate: Sat Nov 27 18:04:01 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> tesseract: fix 10.7, variants, and configure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Add --disable-silent-rules to configure
</span><span style='display:block; white-space:pre;color:#404040;'> - Blacklist compiler to fix on 10.7
</span><span style='display:block; white-space:pre;color:#404040;'> - Move variants to subports only
</span><span style='display:block; white-space:pre;color:#404040;'> - Change kurdish from kur to kmr as done upstream
</span><span style='display:block; white-space:pre;color:#404040;'> - Mark kur as obsolete
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64015
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64016
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64014
</span>---
textproc/tesseract/Portfile | 34 +++++++++++++++++++++++++---------
1 file changed, 25 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/tesseract/Portfile b/textproc/tesseract/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index be1f426fead..b8dc3c8e021 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/tesseract/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/tesseract/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,7 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span>
name tesseract
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,14 +53,6 @@ if {${subport} in [list tesseract tesseract-training]} {
</span> notes "To use tesseract you must also install one of its language data subports. (ex tesseract-eng)"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant best conflicts fast description {Use best training data} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "Legacy OCR Engine mode (--oem 0) is not supported by this variant"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant fast conflicts best description {Use fast training data} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "Legacy OCR Engine mode (--oem 0) is not supported by this variant"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> subport ${name}-training {
depends_lib-append path:lib/pkgconfig/cairo.pc:cairo \
port:icu \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,10 +64,15 @@ subport ${name}-training {
</span> }
if {${subport} in [list tesseract tesseract-training]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # error: use of undeclared identifier '__cpuid_count'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append macports-clang-3.3 {clang < 503}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_autoreconf yes
autoreconf.cmd ./autogen.sh
autoreconf.args
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append port:pkgconfig \
port:autoconf \
port:automake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,6 +95,14 @@ if {${subport} in [list tesseract tesseract-training]} {
</span> build {}
depends_run-append port:${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant best conflicts fast description {Use best training data} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "Legacy OCR Engine mode (--oem 0) is not supported by this variant"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant fast conflicts best description {Use fast training data} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "Legacy OCR Engine mode (--oem 0) is not supported by this variant"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
set langs {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,7 +158,7 @@ set langs {
</span> khm Central
kir Kirghiz
kor Korean
<span style='display:block; white-space:pre;background:#ffe0e0;'>- kur Kurdish
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kmr Kurdish
</span> lao Lao
lat Latin
lav Latvian
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -201,6 +207,16 @@ set langs {
</span> yid Yiddish
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Kurdish kur data changed to kmr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Obsolete Date: 2021-11-29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-kur {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by ${name}-kmr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Kurdish language data for the Tesseract OCR engine"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description "Kurdish language data for the Tesseract OCR engine"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach {lang_code lang_name} ${langs} {
subport ${name}-[strsed ${lang_code} {g/_/-/}] "
description ${lang_name} language data for the Tesseract OCR engine
</pre><pre style='margin:0'>
</pre>