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

[Antonio Rojas]

    Date: Monday, October 5, 2020 @ 18:48:50
  Author: arojas
Revision: 718908

quazip 1.0 rebuild

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

----------------------------+
 PKGBUILD                   |   16 +++++++++++++---
 gimagereader-automoc.patch |   12 ++++++++++++
 gimagereader-quazip1.patch |   15 +++++++++++++++
 3 files changed, 40 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-05 18:47:13 UTC (rev 718907)
+++ PKGBUILD	2020-10-05 18:48:50 UTC (rev 718908)
@@ -3,7 +3,7 @@
 pkgbase=gimagereader
 pkgname=(gimagereader-gtk gimagereader-qt gimagereader-common)
 pkgver=3.3.1
-pkgrel=1
+pkgrel=2
 url="https://github.com/manisandro/gImageReader"
 pkgdesc="Gtk/Qt front-end to tesseract-ocr"
 arch=(x86_64)
@@ -12,9 +12,15 @@
          poppler-glib poppler-qt5 qt5-imageformats qtspell quazip sane tesseract)
 makedepends=(cmake intltool python-gobject)
 source=(https://github.com/manisandro/gImageReader/releases/download/v$pkgver/$pkgbase-$pkgver.tar.xz
-        openmp.patch)
+        openmp.patch
+        gimagereader-quazip1.patch
+        gimagereader-qt5.14.patch::"https://github.com/manisandro/gImageReader/commit/6209e25d.patch"
+        gimagereader-automoc.patch)
 sha256sums=('7688c9c20cbf2fa4f5b6ba0a8d77bd8d2e5929882ed965c7c07ccc529673f0dd'
-            'ee84de7fee390ee54152b4e332e50d8f585b0c9a3aa8b40a04f865b5250607c2')
+            'ee84de7fee390ee54152b4e332e50d8f585b0c9a3aa8b40a04f865b5250607c2'
+            'c693f97984667bff435af2ba1028b44e9dffaac957d0e39bc454c097bfc3ed21'
+            '5e213cde5d5078c18031dfd0922c5399e387303cfca12b421e220c1dad07a506'
+            '37668af2c039d756b1661078610aed07120d88441cc38851a2563dc2f8fac4a5')
 
 prepare() {
   [[ -d build-gtk ]] || mkdir build-gtk
@@ -26,6 +32,10 @@
   # 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.0
+  patch -p1 -i ../gimagereader-qt5.14.patch # Fix build with Qt 5.14
+  patch -p1 -i ../gimagereader-automoc.patch # Fix linking errors (Fedora)
 }
 
 build() {

Added: gimagereader-automoc.patch
===================================================================
--- gimagereader-automoc.patch	                        (rev 0)
+++ gimagereader-automoc.patch	2020-10-05 18:48:50 UTC (rev 718908)
@@ -0,0 +1,12 @@
+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")

Added: gimagereader-quazip1.patch
===================================================================
--- gimagereader-quazip1.patch	                        (rev 0)
+++ gimagereader-quazip1.patch	2020-10-05 18:48:50 UTC (rev 718908)
@@ -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.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()