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

[Antonio Rojas]

    Date: Sunday, October 11, 2020 @ 20:04:45
  Author: arojas
Revision: 398034

More future-proof quazip patch

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

---------------------+
 PKGBUILD            |    2 -
 krita-quazip1.patch |   54 ++++++++++++++++++++++++++++----------------------
 2 files changed, 32 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-11 19:04:55 UTC (rev 398033)
+++ PKGBUILD	2020-10-11 20:04:45 UTC (rev 398034)
@@ -21,7 +21,7 @@
          krita-quazip1.patch)
 sha256sums=('d071887c73bffbdc179054826b9752f5e5ab43fdcd9ffdd0402e9ab2ceee4bda'
             '08076f5e3aa47a34f358efef16d95ae008dd71bcabc6da83a29f9597c1d25453'
-            '4a790e0d485f95051103320203f78ec9abb11144a6ba32510148dfadfb3f9326')
+            'c530b4df375027d275204543d60d0c59b58154163bd006c0f7a122cd041ce057')
 validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt <foundation at krita.org>
 
 prepare() {

Modified: krita-quazip1.patch
===================================================================
--- krita-quazip1.patch	2020-10-11 19:04:55 UTC (rev 398033)
+++ krita-quazip1.patch	2020-10-11 20:04:45 UTC (rev 398034)
@@ -1,23 +1,31 @@
-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 QuaZip-Qt5-1.1/quazip
- 		)
- 		FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
- 	ENDIF (WIN32)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f88105d9dd..87b7f8e006 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -854,13 +854,19 @@ set_package_properties(Poppler PROPERTIES
+ ##
+ ## Test for quazip
+ ##
+-find_package(QuaZip 0.6)
+-set_package_properties(QuaZip PROPERTIES
+-    DESCRIPTION "A library for reading and writing zip files"
+-    URL "https://stachenov.github.io/quazip/"
+-    TYPE REQUIRED
+-    PURPOSE "Needed for reading and writing KRA and ORA files"
+-)
++find_package(QuaZip-Qt5)
++if(QuaZip-Qt5_FOUND)
++    set(QUAZIP_INCLUDE_DIRS QuaZip::QuaZip)
++    set(QUAZIP_LIBRARIES QuaZip::QuaZip)
++else()
++    find_package(QuaZip 0.6)
++    set_package_properties(QuaZip PROPERTIES
++        DESCRIPTION "A library for reading and writing zip files"
++        URL "https://stachenov.github.io/quazip/"
++        TYPE REQUIRED
++        PURPOSE "Needed for reading and writing KRA and ORA files"
++    )
++endif()
+ 
+ # FIXME: better way to do this?
+ list (APPEND ANDROID_EXTRA_LIBS ${QUAZIP_LIBRARIES}