[arch-commits] Commit in krita/trunk (PKGBUILD krita-quazip1.patch)

[Antonio Rojas]

    Date: Monday, October 5, 2020 @ 18:15:19
  Author: arojas
Revision: 397311

quazip 1.0 rebuild

Added:
  krita/trunk/krita-quazip1.patch
Modified:
  krita/trunk/PKGBUILD

---------------------+
 PKGBUILD            |    9 ++++++---
 krita-quazip1.patch |   23 +++++++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-05 18:11:11 UTC (rev 397310)
+++ PKGBUILD	2020-10-05 18:15:19 UTC (rev 397311)
@@ -3,7 +3,7 @@
 pkgname=krita
 _pkgver=4.3.0
 pkgver=${_pkgver/-/}
-pkgrel=2
+pkgrel=3
 pkgdesc="Edit and paint images"
 arch=(x86_64)
 url="https://krita.org"
@@ -17,13 +17,16 @@
 conflicts=(calligra-krita krita-l10n)
 replaces=(calligra-krita krita-l10n)
 source=("https://download.kde.org/stable/krita/$_pkgver/$pkgname-$_pkgver.tar.gz"
-         krita-sip5.patch)
+         krita-sip5.patch
+         krita-quazip1.patch)
 sha256sums=('d071887c73bffbdc179054826b9752f5e5ab43fdcd9ffdd0402e9ab2ceee4bda'
-            '08076f5e3aa47a34f358efef16d95ae008dd71bcabc6da83a29f9597c1d25453')
+            '08076f5e3aa47a34f358efef16d95ae008dd71bcabc6da83a29f9597c1d25453'
+            'c14bf8911eb5722cb1f86f3a5a9a410231c76ad275689972f58a63bb63983ce4')
 validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt <foundation at krita.org>
 
 prepare() {
   patch -d $pkgname-$_pkgver -p1 -i ../krita-sip5.patch # Fix build with SIP 5
+  patch -d $pkgname-$_pkgver -p1 -i ../krita-quazip1.patch # Fix build with quazip 1
 }
 
 build() {

Added: krita-quazip1.patch
===================================================================
--- krita-quazip1.patch	                        (rev 0)
+++ krita-quazip1.patch	2020-10-05 18:15:19 UTC (rev 397311)
@@ -0,0 +1,23 @@
+diff --git a/cmake/modules/FindQuaZip.cmake b/cmake/modules/FindQuaZip.cmake
+index 7e628fcd4b..345c7909ab 100644
+--- a/cmake/modules/FindQuaZip.cmake
++++ b/cmake/modules/FindQuaZip.cmake
+@@ -25,15 +25,15 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+ 	ELSE(WIN32)
+ 		FIND_PACKAGE(PkgConfig)
+ #     pkg_check_modules(PC_QCA2 QUIET qca2)
+-		pkg_check_modules(PC_QUAZIP quazip)
++		pkg_check_modules(PC_QUAZIP quazip quazip1-qt5)
+ 		FIND_LIBRARY(QUAZIP_LIBRARIES
+ 			WIN32_DEBUG_POSTFIX d
+-            NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
++            NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} quazip1-qt5
+ 			HINTS /usr/lib /usr/lib64
+ 		)
+ 		FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
+ 			HINTS /usr/include /usr/local/include
+-			PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
++			PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} QuaZip-Qt5-1.0/quazip
+ 		)
+ 		FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
+ 	ENDIF (WIN32)