Package: guix-patches;
Reported by: Mehmet Tekman <mtekman89 <at> gmail.com>
Date: Tue, 21 Nov 2023 21:59:02 UTC
Severity: normal
Tags: patch
Done: Sharlatan Hellseher <sharlatanus <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 67349 in the body.
You can then email your comments to 67349 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
paren <at> disroot.org, guix <at> cbaines.net, ludo <at> gnu.org, othacehe <at> gnu.org, rg <at> raghavgururajan.name, rekado <at> elephly.net, zimon.toutoune <at> gmail.com, me <at> tobias.gr, jgart <at> dismail.de, guix-patches <at> gnu.org
:bug#67349
; Package guix-patches
.
(Tue, 21 Nov 2023 21:59:02 GMT) Full text and rfc822 format available.Mehmet Tekman <mtekman89 <at> gmail.com>
:paren <at> disroot.org, guix <at> cbaines.net, ludo <at> gnu.org, othacehe <at> gnu.org, rg <at> raghavgururajan.name, rekado <at> elephly.net, zimon.toutoune <at> gmail.com, me <at> tobias.gr, jgart <at> dismail.de, guix-patches <at> gnu.org
.
(Tue, 21 Nov 2023 21:59:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Mehmet Tekman <mtekman89 <at> gmail.com> To: guix-patches <at> gnu.org Subject: [PATCH] Update Krita to 5.2.1 Date: Tue, 21 Nov 2023 22:58:22 +0100
[Message part 1 (text/plain, inline)]
This updates Krita from 5.1.5 to 5.2.1, with extra package dependencies from: - [bug#67342] Add kfkdcraw : https://patches.guix-patches.cbaines.net/project/guix-patches/patch/87r0kiu8u5.fsf <at> gmail.com/ - [bug#67343] Add fftw-cmake : https://patches.guix-patches.cbaines.net/project/guix-patches/patch/87o7fmu8or.fsf <at> gmail.com/ Please apply these patches first before testing this patch. The fftw-cmake patch aims to address some missing FFTW Cmake files, during the Krita configure stage, but sadly it still does not find them. I'm submitting this patch in the hopes that someone can help debug this issue further. I've CC'd the mentors teams. Below is the current state of the patch.
[0003-gnu-krita-Update-to-5.2.1.patch (text/x-patch, inline)]
From e884efecff6841a4ed3cb5d8d8fc7a94b84194ab Mon Sep 17 00:00:00 2001 From: Mehmet Tekman <mtekman89 <at> gmail.com> Date: Tue, 21 Nov 2023 17:35:14 +0100 Subject: [PATCH 3/3] gnu: krita: Update to 5.2.1 * gnu/packages/kde.scm (krita): Update to 5.2.1 Change-Id: I36bd54093817245d8fa0d1362de4d95f8087861a --- gnu/packages/kde.scm | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 20fbb41d73..9dfb360a72 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -63,6 +63,7 @@ (define-module (gnu packages kde) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages fribidi) #:use-module (gnu packages geo) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) @@ -71,6 +72,7 @@ (define-module (gnu packages kde) #:use-module (gnu packages gnome) #:use-module (gnu packages gperf) #:use-module (gnu packages gps) + #:use-module (gnu packages gtk) #:use-module (gnu packages graphics) #:use-module (gnu packages image) #:use-module (gnu packages image-processing) @@ -93,8 +95,10 @@ (define-module (gnu packages kde) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages samba) + #:use-module (gnu packages sdl) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) + #:use-module (gnu packages unicode) #:use-module (gnu packages qt) #:use-module (gnu packages version-control) #:use-module (gnu packages video) @@ -702,7 +706,7 @@ (define-public kolourpaint (define-public krita (package (name "krita") - (version "5.1.5") + (version "5.2.1") (source (origin (method url-fetch) @@ -710,7 +714,7 @@ (define-public krita "mirror://kde/stable/krita/" version "/krita-" version ".tar.gz")) (sha256 - (base32 "1lx4x4affkbh47b7w5qvahkkr4db0vcw6h24nykak6gpy2z5wxqw")))) + (base32 "1kzmn89b1vrasba7z8hp8izyrrskgc7ggnz82zqyyy1v5d8mnri7")))) (build-system qt-build-system) (arguments `(#:tests? #f @@ -727,15 +731,21 @@ (define-public krita (inputs (list boost exiv2 - fftw + fontconfig + fftw-cmake + freetype + fribidi giflib gsl + harfbuzz imath + immer karchive kcompletion kconfig kcoreaddons kcrash + kfkdcraw kguiaddons ki18n kiconthemes @@ -745,21 +755,27 @@ (define-public krita kwidgetsaddons kwindowsystem kxmlgui + lager lcms libjpeg-turbo + libjxl libheif libmypaint libpng libraw libtiff + libunibreak libwebp libx11 libxcb libxi + mlt opencolorio openexr openjpeg perl + python-pyqt + python-pyqt5-sip poppler-qt5 qtbase-5 qtdeclarative-5 @@ -767,7 +783,10 @@ (define-public krita qtsvg-5 qtx11extras quazip-0 - zlib)) + sdl2 + xsimd + zlib + zug)) (home-page "https://krita.org") (synopsis "Digital painting application") (description -- 2.41.0
guix-patches <at> gnu.org
:bug#67349
; Package guix-patches
.
(Thu, 23 Nov 2023 23:19:01 GMT) Full text and rfc822 format available.Message #8 received at 67349 <at> debbugs.gnu.org (full text, mbox):
From: Mehmet Tekman <mtekman89 <at> gmail.com> To: 67349 <at> debbugs.gnu.org Subject: [PATCH] Update Krita to 5.2.1 Date: Fri, 24 Nov 2023 00:17:51 +0100
[Message part 1 (text/plain, inline)]
Disregard the last patch, the one below is the complete patch which successfully builds the package. It depends only on fftw-cmake (#67343) and kfkdcraw (#67342) to be merged first.
[0001-gnu-krita-Update-to-5.2.1.patch (text/x-patch, inline)]
From 49d5d1075125df7de48543ee9531dc1b1291c230 Mon Sep 17 00:00:00 2001 From: mtekman <mtekman89 <at> gmail.com> Date: Thu, 23 Nov 2023 17:22:00 +0100 Subject: [PATCH] gnu: krita: Update to 5.2.1 * gnu/packages/kde.scm (krita): Update to 5.2.1 Due to a missing patch in the upstream libraqm, we cannot depend on the existing libraqm library, but must instead use the one embedded in the package. It compiles, but needs to be told to use the -fPIC flag. Dependency fftw also does not provide the required CMake file FFTW3Librarydepends.cmake, and only does so when compile via cmake and not gnu. Due to the many packages that depend on fftw, a seperate fftw-cmake was used. Change-Id: I0871f09238a678ff470a8042aa1f813028708d1a --- gnu/packages/kde.scm | 67 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 12 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 20fbb41d73..ed5cf13530 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -46,6 +46,7 @@ (define-module (gnu packages kde) #:use-module (gnu packages apr) #:use-module (gnu packages astronomy) #:use-module (gnu packages audio) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) @@ -63,6 +64,7 @@ (define-module (gnu packages kde) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages fribidi) #:use-module (gnu packages geo) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) @@ -71,6 +73,7 @@ (define-module (gnu packages kde) #:use-module (gnu packages gnome) #:use-module (gnu packages gperf) #:use-module (gnu packages gps) + #:use-module (gnu packages gtk) #:use-module (gnu packages graphics) #:use-module (gnu packages image) #:use-module (gnu packages image-processing) @@ -93,8 +96,10 @@ (define-module (gnu packages kde) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages samba) + #:use-module (gnu packages sdl) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) + #:use-module (gnu packages unicode) #:use-module (gnu packages qt) #:use-module (gnu packages version-control) #:use-module (gnu packages video) @@ -702,37 +707,63 @@ (define-public kolourpaint (define-public krita (package (name "krita") - (version "5.1.5") + (version "5.2.1") (source (origin (method url-fetch) (sha256 - (base32 "1lx4x4affkbh47b7w5qvahkkr4db0vcw6h24nykak6gpy2z5wxqw")))) + (base32 "1kzmn89b1vrasba7z8hp8izyrrskgc7ggnz82zqyyy1v5d8mnri7")))) (build-system qt-build-system) (arguments `(#:tests? #f - #:configure-flags (list "-DBUILD_TESTING=OFF"))) - (native-inputs - (list curl + #:configure-flags (list "-DBUILD_TESTING=OFF -DCMAKE_CXX_FLAGS=-fPIC") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-raqm + (lambda _ + ;; Uncomment the substitute block underneath this once the + ;; libraqm variable is patched upstream. This will force it to + ;; use the Guix provided library. + ;; (substitute* "CMakeLists.txt" + ;; (("add_subdirectory\\(3rdparty_vendor\\)") + ;; "find_package(Raqm 0.10.1 REQUIRED)")) + ;; (delete-file-recursively "3rdparty_vendor")) + ;; + ;; Patch the supplied vendor Raqm library (v0.10.1) to use fPIC + (substitute* "3rdparty_vendor/raqm/CMakeLists.txt" + (("set\\(CMAKE_AUTOMOC OFF\\)") + "set(CMAKE_AUTOMOC OFF) +set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -fPIC\" ) +set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\" ) "))))))) + (native-inputs (list curl eigen extra-cmake-modules gettext-minimal kitemmodels pkg-config + libtool qwt vc)) - (inputs - (list boost + (inputs (list boost exiv2 - fftw + fontconfig + fftw-cmake + ;; fftw + ;; We use fftw-cmake since fftwm doesn't provide the required + ;; CMake files when build with gnu. + ;; See: https://bugzilla.redhat.com/show_bug.cgi?id=1729652#c5 + freetype + fribidi giflib gsl + harfbuzz imath + immer karchive kcompletion kconfig kcoreaddons kcrash + kfkdcraw kguiaddons ki18n kiconthemes @@ -745,21 +775,31 @@ (define-public krita kwidgetsaddons kwindowsystem kxmlgui + lager lcms libjpeg-turbo + libjxl libheif libmypaint libpng libraw + ;; libraqm + ;; We use the provided 3rd_party_vendor library instead of + ;; libraqm 0.10.1 with patches until libraqm is patched. + ;; See: https://github.com/HOST-Oman/libraqm/issues/191 libtiff + libunibreak libwebp libx11 libxcb libxi + mlt opencolorio openexr openjpeg perl + python-pyqt + python-pyqt5-sip poppler-qt5 qtbase-5 qtdeclarative-5 @@ -767,7 +807,10 @@ (define-public krita qtsvg-5 qtx11extras quazip-0 - zlib)) + sdl2 + xsimd + zlib + zug)) (home-page "https://krita.org") (synopsis "Digital painting application") (description -- 2.41.0
guix-patches <at> gnu.org
:bug#67349
; Package guix-patches
.
(Mon, 27 Nov 2023 23:06:02 GMT) Full text and rfc822 format available.Message #11 received at 67349 <at> debbugs.gnu.org (full text, mbox):
From: Mehmet Tekman <mtekman89 <at> gmail.com> To: 67349 <at> debbugs.gnu.org Subject: [PATCH] Update Krita to 5.2.1 Date: Tue, 28 Nov 2023 00:05:10 +0100
[Message part 1 (text/plain, inline)]
This is a hotfix that should be applied ontop of the previous patch. For some reason I thought that kfkdcraw did not exist already in Guix, but upon closer inspection I see that it does indeed exist under the name "libkdcraw".
[0002-gnu-krita-hotfix.patch (text/x-patch, inline)]
From 1fb0c3d794589895140da05d246ac78b738be8a5 Mon Sep 17 00:00:00 2001 From: mtekman <mtekman89 <at> gmail.com> Date: Mon, 27 Nov 2023 23:49:35 +0100 Subject: [PATCH] gnu: krita: hotfix * gnu/packages/kde.scm (krita): hotfix no longer dependent on kfkdcraw but uses libkdcraw which is the same. Change-Id: I2a4b8b1d5ed70f5eb8a8f906413946015789ed33 --- gnu/packages/kde.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 9dfb360a72..ab25dffc1a 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021, 2022, 2023 Vinicius Monego <monego <at> posteo.net> ;;; Copyright © 2022 Brendan Tildesley <mail <at> brendan.scot> ;;; Copyright © 2022 Petr Hodina <phodina <at> protonmail.com> +;;; Copyright © 2023 Mehmet Tekman <mtekman89 <at> gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -745,7 +746,7 @@ (define-public krita kconfig kcoreaddons kcrash - kfkdcraw + libkdcraw kguiaddons ki18n kiconthemes @@ -757,9 +758,10 @@ (define-public krita kxmlgui lager lcms + libheif libjpeg-turbo libjxl - libheif + libkdcraw libmypaint libpng libraw -- 2.41.0
guix-patches <at> gnu.org
:bug#67349
; Package guix-patches
.
(Tue, 28 Nov 2023 13:26:02 GMT) Full text and rfc822 format available.Message #14 received at 67349 <at> debbugs.gnu.org (full text, mbox):
From: Mehmet Tekman <mtekman89 <at> gmail.com> To: 67349 <at> debbugs.gnu.org Subject: [PATCH] Update Krita to 5.2.1 Date: Tue, 28 Nov 2023 14:25:11 +0100
[Message part 1 (text/plain, inline)]
Ignore previous patches. Full patch with hotfix included, and sorted inputs. Dependent on an updated libkdcraw (#67509) and fftw-cmake (#67343)
[0003-gnu-krita-Update-to-5.2.1.patch (text/x-patch, inline)]
From 1f19bb405174db71b1e041639d3aed24530290e4 Mon Sep 17 00:00:00 2001 Message-ID: <1f19bb405174db71b1e041639d3aed24530290e4.1701176454.git.mtekman89 <at> gmail.com> In-Reply-To: <82f7a7d8c60e1773565e3655dfd06dda28056924.1701176454.git.mtekman89 <at> gmail.com> References: <82f7a7d8c60e1773565e3655dfd06dda28056924.1701176454.git.mtekman89 <at> gmail.com> From: Mehmet Tekman <mtekman89 <at> gmail.com> Date: Tue, 28 Nov 2023 13:04:07 +0100 Subject: [PATCH 3/3] gnu: krita: Update to 5.2.1 * gnu/packages/kde.scm (krita): Update to 5.2.1 Due to a missing patch in the upstream libraqm, we cannot depend on the existing libraqm library, but must instead use the one embedded in the package. It compiles, but needs to be told to use the -fPIC flag. Dependency fftw also does not provide the required CMake file FFTW3Librarydepends.cmake, and only does so when compile via cmake and not gnu. Due to the many packages that depend on fftw, a seperate fftw-cmake was used. Change-Id: I956451d05d8499580b909e843fd8e4418e396642 --- gnu/packages/kde.scm | 60 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 53 insertions(+), 7 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 20fbb41d73..61e6645411 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021, 2022, 2023 Vinicius Monego <monego <at> posteo.net> ;;; Copyright © 2022 Brendan Tildesley <mail <at> brendan.scot> ;;; Copyright © 2022 Petr Hodina <phodina <at> protonmail.com> +;;; Copyright © 2023 Mehmet Tekman <mtekman89 <at> gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +47,7 @@ (define-module (gnu packages kde) #:use-module (gnu packages apr) #:use-module (gnu packages astronomy) #:use-module (gnu packages audio) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) @@ -63,6 +65,7 @@ (define-module (gnu packages kde) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages fribidi) #:use-module (gnu packages geo) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) @@ -72,6 +75,7 @@ (define-module (gnu packages kde) #:use-module (gnu packages gperf) #:use-module (gnu packages gps) #:use-module (gnu packages graphics) + #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages image-processing) #:use-module (gnu packages kde-frameworks) @@ -92,10 +96,12 @@ (define-module (gnu packages kde) #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages qt) #:use-module (gnu packages samba) + #:use-module (gnu packages sdl) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) - #:use-module (gnu packages qt) + #:use-module (gnu packages unicode) #:use-module (gnu packages version-control) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) @@ -702,7 +708,7 @@ (define-public kolourpaint (define-public krita (package (name "krita") - (version "5.1.5") + (version "5.2.1") (source (origin (method url-fetch) @@ -710,11 +716,28 @@ (define-public krita "mirror://kde/stable/krita/" version "/krita-" version ".tar.gz")) (sha256 - (base32 "1lx4x4affkbh47b7w5qvahkkr4db0vcw6h24nykak6gpy2z5wxqw")))) + (base32 "1kzmn89b1vrasba7z8hp8izyrrskgc7ggnz82zqyyy1v5d8mnri7")))) (build-system qt-build-system) (arguments `(#:tests? #f - #:configure-flags (list "-DBUILD_TESTING=OFF"))) + #:configure-flags (list "-DBUILD_TESTING=OFF -DCMAKE_CXX_FLAGS=-fPIC") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-raqm + (lambda _ + ;; Uncomment the substitute block underneath this once the + ;; libraqm variable is patched upstream. This will force it to + ;; use the Guix provided library. + ;; (substitute* "CMakeLists.txt" + ;; (("add_subdirectory\\(3rdparty_vendor\\)") + ;; "find_package(Raqm 0.10.1 REQUIRED)")) + ;; (delete-file-recursively "3rdparty_vendor")) + ;; + ;; Patch the supplied vendor Raqm library (v0.10.1) to use fPIC + (substitute* "3rdparty_vendor/raqm/CMakeLists.txt" + (("set\\(CMAKE_AUTOMOC OFF\\)") + "set(CMAKE_AUTOMOC OFF) +set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -fPIC\" ) +set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\" ) "))))))) (native-inputs (list curl eigen @@ -727,10 +750,19 @@ (define-public krita (inputs (list boost exiv2 - fftw + fontconfig + fftw-cmake + ;; fftw + ;; We use fftw-cmake since fftwm doesn't provide the required + ;; CMake files when build with gnu. + ;; See: https://bugzilla.redhat.com/show_bug.cgi?id=1729652#c5 + freetype + fribidi giflib gsl + harfbuzz imath + immer karchive kcompletion kconfig @@ -745,29 +777,43 @@ (define-public krita kwidgetsaddons kwindowsystem kxmlgui + lager lcms - libjpeg-turbo libheif + libjpeg-turbo + libjxl + libkdcraw libmypaint libpng + ;; libraqm + ;; We use the provided 3rd_party_vendor library instead of + ;; libraqm 0.10.1 with patches until libraqm is patched. + ;; See: https://github.com/HOST-Oman/libraqm/issues/191 libraw libtiff + libunibreak libwebp libx11 libxcb libxi + mlt opencolorio openexr openjpeg perl poppler-qt5 + python-pyqt + python-pyqt5-sip qtbase-5 qtdeclarative-5 qtmultimedia-5 qtsvg-5 qtx11extras quazip-0 - zlib)) + sdl2 + xsimd + zlib + zug)) (home-page "https://krita.org") (synopsis "Digital painting application") (description -- 2.42.1
Sharlatan Hellseher <sharlatanus <at> gmail.com>
:Mehmet Tekman <mtekman89 <at> gmail.com>
:Message #19 received at 67349-done <at> debbugs.gnu.org (full text, mbox):
From: Sharlatan Hellseher <sharlatanus <at> gmail.com> To: 67349-done <at> debbugs.gnu.org Subject: [PATCH] Update Krita to 5.2.1 Date: Fri, 29 Mar 2024 16:48:09 +0000
[Message part 1 (text/plain, inline)]
Pushed as 37d31495c1c3c38d1b74e0c5b3ba279c1d99c7d5 to master. -- Oleg
[signature.asc (application/pgp-signature, inline)]
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org
.
(Sat, 27 Apr 2024 11:24:39 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.