[arch-commits] Commit in gimagereader/repos (4 files)

Caleb Maclennan alerque at gemini.archlinux.org
Sat Jan 29 11:27:59 UTC 2022


    Date: Saturday, January 29, 2022 @ 11:27:59
  Author: alerque
Revision: 1119800

archrelease: copy trunk to community-staging-x86_64

Added:
  gimagereader/repos/community-staging-x86_64/
  gimagereader/repos/community-staging-x86_64/PKGBUILD
    (from rev 1119799, gimagereader/trunk/PKGBUILD)
  gimagereader/repos/community-staging-x86_64/gimagereader-quazip1.patch
    (from rev 1119799, gimagereader/trunk/gimagereader-quazip1.patch)
  gimagereader/repos/community-staging-x86_64/openmp.patch
    (from rev 1119799, gimagereader/trunk/openmp.patch)

----------------------------+
 PKGBUILD                   |   83 +++++++++++++++++++++++++++++++++++++++++++
 gimagereader-quazip1.patch |   15 +++++++
 openmp.patch               |   26 +++++++++++++
 3 files changed, 124 insertions(+)

Copied: gimagereader/repos/community-staging-x86_64/PKGBUILD (from rev 1119799, gimagereader/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2022-01-29 11:27:59 UTC (rev 1119800)
@@ -0,0 +1,83 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Caleb Maclennan <caleb at alerque.com>
+
+pkgbase=gimagereader
+pkgname=(gimagereader-gtk gimagereader-qt gimagereader-common)
+pkgver=3.3.1
+pkgrel=5
+url='https://github.com/manisandro/gImageReader'
+pkgdesc='Gtk/Qt front-end to tesseract-ocr'
+arch=('x86_64')
+license=('GPL3')
+depends=('djvulibre' 'gtksourceviewmm' 'gtkspellmm' 'libtesseract.so' 'libxml++' 'libzip' 'podofo' 'poppler-glib'
+         'poppler-qt5' 'qt5-imageformats' 'qtspell' 'quazip' 'sane' 'tesseract')
+makedepends=('cmake' 'intltool' 'ninja' 'python-gobject')
+_fedora_patch_base='https://src.fedoraproject.org/rpms/gimagereader/raw/65159207e55fc99b8ec72425ca7324409d7f20c6/f'
+source=("$url/releases/download/v$pkgver/$pkgbase-$pkgver.tar.xz"
+        'openmp.patch'
+        'gimagereader-quazip1.patch'
+        'gimagereader-qt5.14.patch::https://github.com/manisandro/gImageReader/commit/6209e25d.patch'
+        "$_fedora_patch_base/gimagereader-automoc.patch"
+        "$_fedora_patch_base/gimagereader-tesseract5.patch")
+sha256sums=('7688c9c20cbf2fa4f5b6ba0a8d77bd8d2e5929882ed965c7c07ccc529673f0dd'
+            'ee84de7fee390ee54152b4e332e50d8f585b0c9a3aa8b40a04f865b5250607c2'
+            '6c58c753ade526ffc712609bf880bf95bd571fd32a513b4354d8f036a9b16edc'
+            '5e213cde5d5078c18031dfd0922c5399e387303cfca12b421e220c1dad07a506'
+            '987f8c9ba6d2ed52e0d2c12ed758df7826191e4b2f5da773e88d4e11b0adab7d'
+            '97e441ee850285d5f05328ab354cf072723a87874133aa1ef837e45adff43828')
+
+prepare() {
+  cd $pkgbase-$pkgver
+
+  # Run OpenMP once before calling tesseract
+  # https://github.com/manisandro/gImageReader/issues/285
+  patch -Np1 -i ../openmp.patch
+
+  patch -p1 -i ../gimagereader-quazip1.patch # Fix build with quazip 1.x
+  patch -p1 -i ../gimagereader-qt5.14.patch # Fix build with Qt 5.14
+  patch -p1 -i ../gimagereader-automoc.patch # Fix linking errors (Fedora)
+  patch -p1 -i ../gimagereader-tesseract5.patch # Make Tesseract 5 compatible (Fedora)
+}
+
+build() {
+  cmake -S $pkgbase-$pkgver -B build-gtk -G Ninja \
+    -DCMAKE_INSTALL_PREFIX='/usr' \
+    -DINTERFACE_TYPE=gtk
+  cmake --build build-gtk
+
+  cmake -S $pkgbase-$pkgver -B build-qt -G Ninja \
+    -DCMAKE_INSTALL_PREFIX='/usr' \
+    -DINTERFACE_TYPE=qt5
+  cmake --build build-qt
+}
+
+package_gimagereader-gtk() {
+  pkgdesc='Gtk front-end to tesseract-ocr'
+  depends=('gimagereader-common' 'djvulibre' 'gtksourceviewmm' 'gtkspellmm' 'libxml++' 'libzip'
+           'podofo' 'poppler-glib' 'sane' 'tesseract')
+
+  DESTDIR="$pkgdir" cmake --install build-gtk
+
+  # Split gimagereader-common
+  mkdir gimagereader-common
+  mv "$pkgdir"/usr/share/{doc,icons,locale} gimagereader-common
+}
+
+package_gimagereader-qt() {
+  pkgdesc='Qt front-end to tesseract-ocr'
+  depends=('gimagereader-common' 'djvulibre' 'podofo' 'poppler-qt5' 'qt5-imageformats' 'qtspell'
+           'quazip' 'sane' 'tesseract')
+
+  DESTDIR="$pkgdir" cmake --install build-qt
+
+  # Split gimagereader-common
+  rm -r "$pkgdir"/usr/share/{doc,icons,locale}
+}
+
+package_gimagereader-common() {
+  pkgdesc='Common files for gImageReader'
+  depends=('hicolor-icon-theme')
+
+  mkdir -p "$pkgdir"/usr/share
+  mv gimagereader-common/* "$pkgdir/usr/share"
+}

Copied: gimagereader/repos/community-staging-x86_64/gimagereader-quazip1.patch (from rev 1119799, gimagereader/trunk/gimagereader-quazip1.patch)
===================================================================
--- community-staging-x86_64/gimagereader-quazip1.patch	                        (rev 0)
+++ community-staging-x86_64/gimagereader-quazip1.patch	2022-01-29 11:27:59 UTC (rev 1119800)
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 397e5dc..93a7693 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -178,8 +178,8 @@ ELSEIF("${INTERFACE_TYPE}" STREQUAL "qt5")
+     FIND_PACKAGE(Qt5PrintSupport REQUIRED)
+     FIND_PACKAGE(QuaZip5)
+     IF(NOT QUAZIP_FOUND)
+-        FIND_PATH(QUAZIP_INCLUDE_DIR NAME quazipfile.h PATH_SUFFIXES quazip5)
+-        FIND_LIBRARY(QUAZIP_LIBRARIES quazip5)
++        FIND_PATH(QUAZIP_INCLUDE_DIR NAME quazipfile.h PATH_SUFFIXES quazip5 QuaZip-Qt5-1.2/quazip QuaZip-Qt5-1.1/quazip QuaZip-Qt5-1.0/quazip)
++        FIND_LIBRARY(QUAZIP_LIBRARIES NAMES quazip5 quazip1-qt5)
+         IF(NOT QUAZIP_INCLUDE_DIR OR NOT QUAZIP_LIBRARIES)
+             MESSAGE(FATAL_ERROR "QuaZip5 is required but was not found")
+         ENDIF()

Copied: gimagereader/repos/community-staging-x86_64/openmp.patch (from rev 1119799, gimagereader/trunk/openmp.patch)
===================================================================
--- community-staging-x86_64/openmp.patch	                        (rev 0)
+++ community-staging-x86_64/openmp.patch	2022-01-29 11:27:59 UTC (rev 1119800)
@@ -0,0 +1,26 @@
+From 122ed08d72265e3abb02c48c4be804d793058fc9 Mon Sep 17 00:00:00 2001
+From: Philip Rinn <rinni at inventati.org>
+Date: Fri, 5 Jan 2018 15:22:47 +0100
+Subject: [PATCH] Run OpenMP once before calling tesseract (fixes: #285)
+
+---
+ gtk/src/main.cc | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/gtk/src/main.cc b/gtk/src/main.cc
+index a2668e4..9fec77a 100644
+--- a/gtk/src/main.cc
++++ b/gtk/src/main.cc
+@@ -94,6 +94,12 @@ int main (int argc, char *argv[]) {
+ 	}
+ #endif
+ 
++    // Run OpenMP once before tesseract is called, otherwise it might be
++    // _very_ slow, see https://github.com/manisandro/gImageReader/issues/285
++    // Sleep 1 millisecond to prevent being optimized out.
++    #pragma omp parallel for schedule(static)
++    for(int i = 0; i < 1; i++) { sleep(1); }
++
+ 	std::string localeDir = Glib::build_filename(pkgDir, "share", "locale");
+ 
+ 	bindtextdomain(GETTEXT_PACKAGE, localeDir.c_str());



More information about the arch-commits mailing list