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

[Antonio Rojas]

    Date: Sunday, October 11, 2020 @ 21:28:24
  Author: arojas
Revision: 398035

Better quazip patch

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

---------------------+
 PKGBUILD            |    2 -
 krita-quazip1.patch |   76 ++++++++++++++++++++++++++++++--------------------
 2 files changed, 47 insertions(+), 31 deletions(-)

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

Modified: krita-quazip1.patch
===================================================================
--- krita-quazip1.patch	2020-10-11 20:04:45 UTC (rev 398034)
+++ krita-quazip1.patch	2020-10-11 21:28:24 UTC (rev 398035)
@@ -1,31 +1,47 @@
-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()
+diff --git a/cmake/modules/FindQuaZip.cmake b/cmake/modules/FindQuaZip.cmake
+index 345c7909ab..574577e230 100644
+--- a/cmake/modules/FindQuaZip.cmake
++++ b/cmake/modules/FindQuaZip.cmake
+@@ -4,11 +4,15 @@
+ # QUAZIP_LIBRARIES           - List of QuaZip libraries
+ # QUAZIP_ZLIB_INCLUDE_DIR    - The include dir of zlib headers
  
- # FIXME: better way to do this?
- list (APPEND ANDROID_EXTRA_LIBS ${QUAZIP_LIBRARIES}
+-
+-IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
++find_package(QuaZip-Qt5 QUIET)
++IF (QuaZip-Qt5_FOUND)
++        set(QUAZIP_INCLUDE_DIRS QuaZip::QuaZip)
++        set(QUAZIP_LIBRARIES QuaZip::QuaZip)
++        set(QUAZIP_FOUND TRUE)
++ELSEIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+ 	# in cache already
+ 	SET(QUAZIP_FOUND TRUE)
+-ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
++ELSE ()
+     IF (Qt5Core_FOUND)
+         set(QUAZIP_LIB_VERSION_SUFFIX 5)
+     ENDIF()
+@@ -25,19 +29,19 @@ 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)
+ 		FIND_LIBRARY(QUAZIP_LIBRARIES
+ 			WIN32_DEBUG_POSTFIX d
+-            NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
++            NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
+ 			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}
+ 		)
+ 		FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
+ 	ENDIF (WIN32)
+ 	INCLUDE(FindPackageHandleStandardArgs)
+ 	SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR})
+ 	find_package_handle_standard_args(QUAZIP DEFAULT_MSG  QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS)
+-ENDIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
++ENDIF ()