[arch-commits] Commit in tesseract/trunk (PKGBUILD tesseract.install)

[Caleb Maclennan]

    Date: Tuesday, February 1, 2022 @ 08:54:34
  Author: alerque
Revision: 1121808

upgpkg: tesseract 5.0.1-3

Modified:
  tesseract/trunk/PKGBUILD
Deleted:
  tesseract/trunk/tesseract.install

-------------------+
 PKGBUILD          |   24 ++++++++++++------------
 tesseract.install |    7 -------
 2 files changed, 12 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-01 07:53:53 UTC (rev 1121807)
+++ PKGBUILD	2022-02-01 08:54:34 UTC (rev 1121808)
@@ -6,7 +6,7 @@
 _langs=(afr amh ara asm aze aze_cyrl bel ben bod bos bre bul cat ceb ces
     chi_sim chi_tra chr cos cym dan dan_frak deu deu_frak div dzo ell eng enm epo
     equ est eus fao fas fil fin fra frk frm fry gla gle glg grc guj hat heb
-    hin hrv hun hye iku ind isl ita ita_old jav jpn kan kat kat_old kaz khm
+    hin hrv hun hye iku ind isl ita ita_old jav jpn jpn_vert kan kat kat_old kaz khm
     kir kmr kor kor_vert lao lat lav lit ltz mal mar mkd mlt mon mri msa
     mya nep nld nor oci ori osd pan pol por pus que ron rus san sin slk
     slk_frak slv snd spa spa_old sqi srp srp_latn sun swa swe syr tam tat
@@ -14,21 +14,18 @@
 
 pkgname=tesseract
 pkgver=5.0.1
-pkgrel=2
-pkgdesc="An OCR program"
+pkgrel=3
+pkgdesc='An OCR program'
 arch=(x86_64)
 url="https://github.com/tesseract-ocr/tesseract"
-license=("APACHE")
+license=('APACHE')
 depends=(libpng libtiff libjpeg-turbo zlib giflib gcc-libs curl libarchive leptonica)
 makedepends=(icu cairo pango asciidoc)
-install=tesseract.install
-optdepends=('icu' 'cairo' 'pango'
+optdepends=(icu cairo pango
             "${_langs[@]/#/tesseract-data-}")
 provides=(libtesseract.so)
-source=($pkgname-$pkgver.tar.gz::https://github.com/tesseract-ocr/tesseract/archive/$pkgver.tar.gz
-        https://github.com/tesseract-ocr/tessdata/raw/bf82613055ebc6e63d9e3b438a5c234bfd638c93/osd.traineddata)
-sha256sums=('b5b0e561650ed67feb1e9de38d4746121d302ae4c876c95b99b8b6f9f89d5c58'
-            '9cf5d576fcc47564f11265841e5ca839001e7e6f38ff7f7aacf46d15a96b00ff')
+source=("$url/archive/$pkgver/$pkgname-$pkgver.tar.gz")
+sha256sums=('b5b0e561650ed67feb1e9de38d4746121d302ae4c876c95b99b8b6f9f89d5c58')
 
 build() {
   cd "$srcdir"/$pkgname-${pkgver}
@@ -39,9 +36,12 @@
 }
 
 package() {
+  # The virtual package 'tessdata' is provided by all of the packaged language
+  # packs. All languages are listed as optdepends but at least one is required
+  # for basic functionality. These are in package() so they do not turn up in
+  # makedepends=() where they would be circular.
+  depends+=(tessdata tesseract-data-osd)
   cd "$srcdir"/$pkgname-${pkgver}
   make DESTDIR="$pkgdir" install
   make DESTDIR="$pkgdir" training-install
-  mkdir -p "$pkgdir"/usr/share/tessdata
-  install -Dm0644 "$srcdir"/osd.traineddata "$pkgdir"/usr/share/tessdata/osd.traineddata
 }

Deleted: tesseract.install
===================================================================
--- tesseract.install	2022-02-01 07:53:53 UTC (rev 1121807)
+++ tesseract.install	2022-02-01 08:54:34 UTC (rev 1121808)
@@ -1,7 +0,0 @@
-post_install() {
-  echo "You must install one of tesseract-data-* packages or whole tesseract-data group"
-}
-
-post_upgrade() {
-  post_install
-}