tesseract-ocr(4.1.1): fix absolute link paths in .pc file

Replace the line (for MINGW64)

  Libs: -L${libdir} -ltesseract -LD:/msys64/mingw64/lib -larchive -LD:/msys64/mingw64/lib -lcurl

by

  Libs: -L${libdir} -ltesseract -L/mingw64/lib -larchive -L/mingw64/lib -lcurl

* mingw-w64-tesseract-ocr/PKGBUILD:
  - replace absolute Windows paths in line of .pc file starting with
    'Libs:' by absolute Unix paths.
  - remove references to patch 001-proper-include-thread.patch having no
    effect.
* mingw-w64-tesseract-ocr/001-proper-include-thread.patch:
  - remove file.
This commit is contained in:
Jannick
2020-03-31 18:00:42 +02:00
parent a392bd3a40
commit 082deaea3e
2 changed files with 10 additions and 20 deletions

View File

@@ -1,14 +0,0 @@
--- tesseract-4.0.0/src/ccstruct/imagedata.cpp.orig 2018-10-29 13:26:44.598482600 +0000
+++ tesseract-4.0.0/src/ccstruct/imagedata.cpp 2018-10-29 13:27:01.678763600 +0000
@@ -26,9 +26,9 @@
#if defined(__MINGW32__)
#include <unistd.h>
-#else
-#include <thread>
#endif
+#include <thread>
+
#include "allheaders.h" // for pixDestroy, pixGetHeight, pixGetWidth, lept_...
#include "boxread.h" // for ReadMemBoxes

View File

@@ -5,7 +5,7 @@ _realname=tesseract-ocr
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=4.1.1
pkgrel=1
pkgrel=2
pkgdesc="Tesseract OCR (mingw-w64)"
arch=('any')
url="https://github.com/tesseract-ocr/tesseract"
@@ -19,15 +19,12 @@ depends=(${MINGW_PACKAGE_PREFIX}-cairo
${MINGW_PACKAGE_PREFIX}-zlib)
options=('!libtool' 'strip')
source=(${_realname}-${pkgver}.tar.gz::https://github.com/tesseract-ocr/tesseract/archive/${pkgver}.tar.gz
https://github.com/tesseract-ocr/tessdata_fast/raw/master/osd.traineddata
001-proper-include-thread.patch)
https://github.com/tesseract-ocr/tessdata_fast/raw/master/osd.traineddata)
sha256sums=('2a66ff0d8595bff8f04032165e6c936389b1e5727c3ce5a27b3e059d218db1cb'
'9cf5d576fcc47564f11265841e5ca839001e7e6f38ff7f7aacf46d15a96b00ff'
'0c8eec0552e9d3af93e84f594e71cfce0e996c630bddc6a0c2ca509f516696c9')
'9cf5d576fcc47564f11265841e5ca839001e7e6f38ff7f7aacf46d15a96b00ff')
prepare() {
cd "${srcdir}/tesseract-${pkgver}"
patch -p1 -i ${srcdir}/001-proper-include-thread.patch
./autogen.sh
}
@@ -41,6 +38,10 @@ build() {
extra_config+=( --enable-debug )
fi
# tesseract 4.1.1: skip creating the documentation by
# pretending that asciidoc is not available, since
# otherwise running make results in an error
ac_cv_prog_have_asciidoc=no \
../tesseract-${pkgver}/configure \
--build=${MINGW_CHOST} \
--host=${MINGW_CHOST} \
@@ -64,4 +65,7 @@ package() {
make DESTDIR="${pkgdir}" training-install
mkdir -p ${pkgdir}${MINGW_PREFIX}/share/tessdata
install -Dm0644 ${srcdir}/osd.traineddata ${pkgdir}${MINGW_PREFIX}/share/tessdata/osd.traineddata
# Fix .pc file
sed -s "/^Libs:/ { s|$(cygpath -m ${MINGW_PREFIX})|${MINGW_PREFIX}|g }" -i "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/tesseract.pc
}