From 0cc3d6ec2e93080302a7436d763831ef8ef92e11 Mon Sep 17 00:00:00 2001 From: Piotr Kubaj Date: Fri, 12 Jul 2019 23:19:53 +0000 Subject: graphics/tesseract: update to 4.1.0, change maintainer address, remove double USES=compiler Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D20887 --- graphics/tesseract/files/patch-configure.ac | 9 ++++----- graphics/tesseract/files/patch-doc_Makefile.am | 15 --------------- graphics/tesseract/files/patch-src_ccutil_ocrclass.h | 10 ++++++++++ 3 files changed, 14 insertions(+), 20 deletions(-) delete mode 100644 graphics/tesseract/files/patch-doc_Makefile.am create mode 100644 graphics/tesseract/files/patch-src_ccutil_ocrclass.h (limited to 'graphics/tesseract/files') diff --git a/graphics/tesseract/files/patch-configure.ac b/graphics/tesseract/files/patch-configure.ac index 43bbe5a7ca47..df7bb4812e2c 100644 --- a/graphics/tesseract/files/patch-configure.ac +++ b/graphics/tesseract/files/patch-configure.ac @@ -3,16 +3,15 @@ libpthread. Look for a symbol that causes us to load it. libtesseract.so is not linked against libomp if openmp is enabled, which makes dependent ports fail. This adds a workaround by linking directly against libomp. ---- configure.ac.orig 2019-03-26 21:58:42 UTC +--- configure.ac.orig 2019-07-07 12:34:08 UTC +++ configure.ac -@@ -375,6 +375,10 @@ CXXFLAGS="$OLD_CXXFLAGS" +@@ -372,6 +372,9 @@ esac # ---------------------------------------- - AC_SEARCH_LIBS([sem_init], [pthread rt]) -+AC_SEARCH_LIBS([pthread_create], [pthread]) + AC_SEARCH_LIBS([pthread_create], [pthread]) +if test "$enable_openmp" != no; then + AC_SEARCH_LIBS([omp_get_thread_num ], [omp]) +fi - + # ---------------------------------------- diff --git a/graphics/tesseract/files/patch-doc_Makefile.am b/graphics/tesseract/files/patch-doc_Makefile.am deleted file mode 100644 index 56b3cb9fd5d1..000000000000 --- a/graphics/tesseract/files/patch-doc_Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ ---- doc/Makefile.am.orig 2019-03-28 05:11:18 UTC -+++ doc/Makefile.am -@@ -36,7 +36,11 @@ EXTRA_DIST = $(man_MANS) Doxyfile - html: $(patsubst %,%.html,$(man_MANS)) - - %: %.asc -- $(asciidoc) -o $@ $< -+ $(asciidoc) $< -+ $(asciidoc) -b docbook $< -+ %%LOCALBASE%%/bin/xsltproc --nonet --param man.charmap.use.subset "0" \ -+ %%LOCALBASE%%/share/xsl/docbook/manpages/docbook.xsl \ -+ $@.xml - - %.html: %.asc - asciidoc -b html5 -o $@ $< diff --git a/graphics/tesseract/files/patch-src_ccutil_ocrclass.h b/graphics/tesseract/files/patch-src_ccutil_ocrclass.h new file mode 100644 index 000000000000..32e7ffb2844f --- /dev/null +++ b/graphics/tesseract/files/patch-src_ccutil_ocrclass.h @@ -0,0 +1,10 @@ +--- src/ccutil/ocrclass.h.orig 2019-07-08 13:00:14 UTC ++++ src/ccutil/ocrclass.h +@@ -31,6 +31,7 @@ + #ifdef _WIN32 + #include // for timeval + #endif ++#include + + /********************************************************************** + * EANYCODE_CHAR -- cgit v1.2.3