Hello community, here is the log from the commit of package krita for openSUSE:Factory checked in at 2020-10-12 13:58:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krita (Old) and /work/SRC/openSUSE:Factory/.krita.new.3486 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krita" Mon Oct 12 13:58:21 2020 rev:46 rq:841157 version:4.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/krita/krita.changes 2020-07-10 15:30:58.650842013 +0200 +++ /work/SRC/openSUSE:Factory/.krita.new.3486/krita.changes 2020-10-12 13:59:35.902223193 +0200 @@ -1,0 +2,10 @@ +Sun Oct 11 14:35:46 UTC 2020 - Wolfgang Bauer <wba...@tmo.at> + +- Update Support-quazip-1.0.patch to support quazip 1.1 as well + +------------------------------------------------------------------- +Sat Oct 10 15:00:08 UTC 2020 - Wolfgang Bauer <wba...@tmo.at> + +- Add Support-quazip-1.0.patch to fix build with quazip 1.0 + +------------------------------------------------------------------- New: ---- Support-quazip-1.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krita.spec ++++++ --- /var/tmp/diff_new_pack.lJTaph/_old 2020-10-12 13:59:37.090223689 +0200 +++ /var/tmp/diff_new_pack.lJTaph/_new 2020-10-12 13:59:37.090223689 +0200 @@ -31,6 +31,8 @@ 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 @@ %prep %setup -q +%autopatch -p1 %build %ifarch %{arm} aarch64 ++++++ Support-quazip-1.0.patch ++++++ >From 3eaf480ae5d615e8e26153cca98115ff0f23135f Mon Sep 17 00:00:00 2001 From: Antonio Rojas <aro...@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 QuaZip-Qt5-1.1/quazip ) FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include) ENDIF (WIN32) -- GitLab
