[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     1176cc65055bad4ebaf56465578afa995da6e5a7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 16:31:29 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 19:52:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1176cc65

media-gfx/krita: Support build with >=dev-libs/quazip-1.0

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/krita/files/krita-4.4.2-quazip1.patch | 36 +++++++++++++++++++++++++
 media-gfx/krita/krita-4.4.2.ebuild              |  3 ++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/media-gfx/krita/files/krita-4.4.2-quazip1.patch b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
new file mode 100644
index 00000000000..6a49bd3ba2e
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
@@ -0,0 +1,36 @@
+From 3eaf480ae5d615e8e26153cca98115ff0f23135f Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Mon, 5 Oct 2020 20:11:26 +0200
+Subject: [PATCH] Support quazip 1.0
+
+Update FindQuaZip to find the QuaZip 1.0 library names and include dirs. Once support for quazip<1 is dropped this should be ported to use quazip's own QuaZipConfig
+---
+ cmake/modules/FindQuaZip.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+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)
+-- 
+GitLab
+

diff --git a/media-gfx/krita/krita-4.4.2.ebuild b/media-gfx/krita/krita-4.4.2.ebuild
index 3a09834e46d..62d25fd3463 100644
--- a/media-gfx/krita/krita-4.4.2.ebuild
+++ b/media-gfx/krita/krita-4.4.2.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
 "
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
-	dev-libs/quazip
+	dev-libs/quazip:0=
 	$(python_gen_cond_dep '
 		dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
 		dev-python/sip[${PYTHON_MULTI_USEDEP}]
@@ -90,6 +90,7 @@ RESTRICT+=" test"
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
 	"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
+	"${FILESDIR}"/${P}-quazip1.patch
 )
 
 pkg_setup() {