From ed049db757c10cbc070c0a79e92ed6890e3b9bc595dd5b52d9abc0bee6954d45 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 11 Oct 2020 08:24:39 +0000 Subject: [PATCH 1/2] Accepting request 840870 from home:wolfi323:branches:KDE:Extra - 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 --- Support-quazip-1.0.patch | 36 ++++++++++++++++++++++++++++++++++++ krita.changes | 5 +++++ krita.spec | 3 +++ 3 files changed, 44 insertions(+) create mode 100644 Support-quazip-1.0.patch diff --git a/Support-quazip-1.0.patch b/Support-quazip-1.0.patch new file mode 100644 index 0000000..64e8ff8 --- /dev/null +++ b/Support-quazip-1.0.patch @@ -0,0 +1,36 @@ +From 3eaf480ae5d615e8e26153cca98115ff0f23135f Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +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/krita.changes b/krita.changes index fba6ad1..4e37509 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 10 15:00:08 UTC 2020 - Wolfgang Bauer + +- Add Support-quazip-1.0.patch to fix build with quazip 1.0 + ------------------------------------------------------------------- Thu Jul 9 07:42:45 UTC 2020 - Michel Normand diff --git a/krita.spec b/krita.spec index 5f6b0d1..e8d00f9 100644 --- a/krita.spec +++ b/krita.spec @@ -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 From 3d73dfb40e99a246487335580963e4a5eb4dce55ec88f1360c1ebc70338ebf12 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 12 Oct 2020 07:23:41 +0000 Subject: [PATCH 2/2] Accepting request 841045 from home:wolfi323:branches:KDE:Extra - Update Support-quazip-1.0.patch to support quazip 1.1 as well OBS-URL: https://build.opensuse.org/request/show/841045 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=126 --- Support-quazip-1.0.patch | 2 +- krita.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Support-quazip-1.0.patch b/Support-quazip-1.0.patch index 64e8ff8..cd3723a 100644 --- a/Support-quazip-1.0.patch +++ b/Support-quazip-1.0.patch @@ -27,7 +27,7 @@ index 7e628fcd4b..345c7909ab 100644 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 ++ 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/krita.changes b/krita.changes index 4e37509..f98620c 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Oct 11 14:35:46 UTC 2020 - Wolfgang Bauer + +- Update Support-quazip-1.0.patch to support quazip 1.1 as well + ------------------------------------------------------------------- Sat Oct 10 15:00:08 UTC 2020 - Wolfgang Bauer