rpm/krita
SHA256
1
0
Fork 0
forked from pool/krita
Code Pull Requests Activity

Accepting request 840870 from home:wolfi323:branches:KDE:Extra

Browse Source 
- Add Support-quazip-1.0.patch to fix build with quazip 1.0

OBS-URL: https://build.opensuse.org/request/show/840870
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=125
This commit is contained in:
Christophe Giboudeaux 2020-10-11 08:24:39 +00:00 committed by Git OBS Bridge
parent fe4fd32e6a
commit ed049db757
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Support-quazip-1.0.patch Normal file
View File

@ -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

5
krita.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Oct 10 15:00:08 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>
- Add Support-quazip-1.0.patch to fix build with quazip 1.0
-------------------------------------------------------------------
Thu Jul 9 07:42:45 UTC 2020 - Michel Normand <normand@linux.vnet.ibm.com>

3
krita.spec
View File

@ -31,6 +31,8 @@ License: GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND
Group: Productivity/Graphics/Bitmap Editors
URL: https://www.krita.org/
Source0: https://download.kde.org/stable/krita/%{version}/krita-%{version}.tar.xz
# PATCH-FIX-UPSTREAM
Patch0: Support-quazip-1.0.patch
%ifnarch %{arm} aarch64
# causes build failure on ARM currently
BuildRequires: OpenColorIO-devel
@ -109,6 +111,7 @@ Development headers and libraries for Krita.
%prep
%setup -q
%autopatch -p1
%build
%ifarch %{arm} aarch64