From a0a407a81be3ab8ea3b76a33d4076d2cb2fd72f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 17 Jan 2018 01:53:59 +0100 Subject: [PATCH] tesseract-ocr: ship equ and osd with the package See #10165 --- srcpkgs/tesseract-ocr-equ | 1 - srcpkgs/tesseract-ocr-osd | 1 - srcpkgs/tesseract-ocr/template | 25 ++++++++----------------- 3 files changed, 8 insertions(+), 19 deletions(-) delete mode 120000 srcpkgs/tesseract-ocr-equ delete mode 120000 srcpkgs/tesseract-ocr-osd diff --git a/srcpkgs/tesseract-ocr-equ b/srcpkgs/tesseract-ocr-equ deleted file mode 120000 index 79bcf15f05b..00000000000 --- a/srcpkgs/tesseract-ocr-equ +++ /dev/null @@ -1 +0,0 @@ -tesseract-ocr \ No newline at end of file diff --git a/srcpkgs/tesseract-ocr-osd b/srcpkgs/tesseract-ocr-osd deleted file mode 120000 index 79bcf15f05b..00000000000 --- a/srcpkgs/tesseract-ocr-osd +++ /dev/null @@ -1 +0,0 @@ -tesseract-ocr \ No newline at end of file diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template index 2e518010c3e..dc19910a07a 100644 --- a/srcpkgs/tesseract-ocr/template +++ b/srcpkgs/tesseract-ocr/template @@ -40,6 +40,7 @@ post_build() { make ${makejobs} training } post_install() { + local lang # Rename binary to avoid conflict with tesseract package mv ${DESTDIR}/usr/bin/tesseract{,-ocr} mv ${DESTDIR}/usr/share/man/man1/tesseract{,-ocr}.1 @@ -48,6 +49,12 @@ post_install() { vdoc testing/eurotext.tif vdoc testing/phototest.tif vlicense tessdata/COPYING LICENSE-tessdata + # Move the pseudo languges "equ" (math / equation detection) and + # "osd" (orientation and script detection) to the main package + for lang in equ osd; do + $(pkg_lang ${lang}) + done + } tesseract-ocr-tools_package() { depends="${sourcepkg}>=${version}_${revision}" @@ -106,7 +113,7 @@ tesseract-ocr-all_package() { depends="${sourcepkg}>=${version}_${revision}" conflicts="tesseract-ocr-basic>=0" short_desc+=" - all languages data" - # All aVailable languages + # All available languages for lang in afr amh ara asm aze aze_cyrl bel ben bod bos bul cat ceb \ ces chi_sim chi_tra chr cym dan deu dzo ell eng enm epo est eus \ fas fin fra frk frm gle glg grc guj hat heb hin hrv hun iku ind isl ita \ @@ -317,14 +324,6 @@ tesseract-ocr-epo_package() { $(pkg_lang ${pkgname#tesseract-ocr-}) } } -tesseract-ocr-equ_package() { - noarch=yes - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - Math / equation detection module" - pkg_install() { - $(pkg_lang ${pkgname#tesseract-ocr-}) - } -} tesseract-ocr-est_package() { noarch=yes depends="${sourcepkg}>=${version}_${revision}" @@ -685,14 +684,6 @@ tesseract-ocr-ori_package() { $(pkg_lang ${pkgname#tesseract-ocr-}) } } -tesseract-ocr-osd_package() { - noarch=yes - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - Orientation and script detection module" - pkg_install() { - $(pkg_lang ${pkgname#tesseract-ocr-}) - } -} tesseract-ocr-pan_package() { noarch=yes depends="${sourcepkg}>=${version}_${revision}"