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

[Caleb Maclennan]

    Date: Saturday, January 29, 2022 @ 11:27:48
  Author: alerque
Revision: 1119799

upgpkg: gimagereader 3.3.1-5; rebuild for tesseract 5

Added:
  gimagereader/trunk/gimagereader-quazip1.patch
Modified:
  gimagereader/trunk/PKGBUILD
Deleted:
  gimagereader/trunk/gimagereader-automoc.patch
  gimagereader/trunk/gimagereader-quazip1.patch

----------------------------+
 PKGBUILD                   |   19 ++++++++++++-------
 gimagereader-automoc.patch |   12 ------------
 gimagereader-quazip1.patch |   30 +++++++++++++++---------------
 3 files changed, 27 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-29 10:56:28 UTC (rev 1119798)
+++ PKGBUILD	2022-01-29 11:27:48 UTC (rev 1119799)
@@ -1,26 +1,30 @@
 # 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=4
+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' 'libxml++' 'libzip' 'podofo' 'poppler-glib'
+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')
-source=("https://github.com/manisandro/gImageReader/releases/download/v$pkgver/$pkgbase-$pkgver.tar.xz"
+_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'
-        'gimagereader-automoc.patch')
+        "$_fedora_patch_base/gimagereader-automoc.patch"
+        "$_fedora_patch_base/gimagereader-tesseract5.patch")
 sha256sums=('7688c9c20cbf2fa4f5b6ba0a8d77bd8d2e5929882ed965c7c07ccc529673f0dd'
             'ee84de7fee390ee54152b4e332e50d8f585b0c9a3aa8b40a04f865b5250607c2'
-            '0b432d99e79ab49c8ffff9763ba436a105684dcacf405af9e41d6065edb2a876'
+            '6c58c753ade526ffc712609bf880bf95bd571fd32a513b4354d8f036a9b16edc'
             '5e213cde5d5078c18031dfd0922c5399e387303cfca12b421e220c1dad07a506'
-            '37668af2c039d756b1661078610aed07120d88441cc38851a2563dc2f8fac4a5')
+            '987f8c9ba6d2ed52e0d2c12ed758df7826191e4b2f5da773e88d4e11b0adab7d'
+            '97e441ee850285d5f05328ab354cf072723a87874133aa1ef837e45adff43828')
 
 prepare() {
   cd $pkgbase-$pkgver
@@ -29,9 +33,10 @@
   # https://github.com/manisandro/gImageReader/issues/285
   patch -Np1 -i ../openmp.patch
 
-  patch -p1 -i ../gimagereader-quazip1.patch # Fix build with quazip 1.0
+  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() {

Deleted: gimagereader-automoc.patch
===================================================================
--- gimagereader-automoc.patch	2022-01-29 10:56:28 UTC (rev 1119798)
+++ gimagereader-automoc.patch	2022-01-29 11:27:48 UTC (rev 1119799)
@@ -1,12 +0,0 @@
-diff -rupN gimagereader-3.3.1/CMakeLists.txt gimagereader-3.3.1-new/CMakeLists.txt
---- gimagereader-3.3.1/CMakeLists.txt	2019-07-28 22:59:40.000000000 +0200
-+++ gimagereader-3.3.1-new/CMakeLists.txt	2020-07-29 10:33:51.491682621 +0200
-@@ -1,4 +1,8 @@
- CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-+IF(${CMAKE_VERSION} VERSION_GREATER "3.17.0")
-+CMAKE_POLICY(SET CMP0100 NEW)
-+ENDIF()
-+
- LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
- INCLUDE(GSettings)
- SET(ENV{LC_ALL} "C")

Deleted: gimagereader-quazip1.patch
===================================================================
--- gimagereader-quazip1.patch	2022-01-29 10:56:28 UTC (rev 1119798)
+++ gimagereader-quazip1.patch	2022-01-29 11:27:48 UTC (rev 1119799)
@@ -1,15 +0,0 @@
-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.0/quazip QuaZip-Qt5-1.1/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()

Added: gimagereader-quazip1.patch
===================================================================
--- gimagereader-quazip1.patch	                        (rev 0)
+++ gimagereader-quazip1.patch	2022-01-29 11:27:48 UTC (rev 1119799)
@@ -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()