From patchwork Tue Nov 28 13:25:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mehmet Tekman X-Patchwork-Id: 56926 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 061B227BBEA; Tue, 28 Nov 2023 13:26:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AFE8D27BBE2 for ; Tue, 28 Nov 2023 13:26:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r7y6A-0007EP-FQ; Tue, 28 Nov 2023 08:25:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r7y68-0007EG-5s for guix-patches@gnu.org; Tue, 28 Nov 2023 08:25:56 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r7y67-0005E1-NY for guix-patches@gnu.org; Tue, 28 Nov 2023 08:25:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r7y6E-0000an-JF for guix-patches@gnu.org; Tue, 28 Nov 2023 08:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67349] [PATCH] Update Krita to 5.2.1 References: <87il5uu5tt.fsf@gmail.com> In-Reply-To: <87il5uu5tt.fsf@gmail.com> Resent-From: Mehmet Tekman Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Nov 2023 13:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67349 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67349@debbugs.gnu.org Received: via spool by 67349-submit@debbugs.gnu.org id=B67349.17011779342235 (code B ref 67349); Tue, 28 Nov 2023 13:26:02 +0000 Received: (at 67349) by debbugs.gnu.org; 28 Nov 2023 13:25:34 +0000 Received: from localhost ([127.0.0.1]:45814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7y5l-0000Zy-T7 for submit@debbugs.gnu.org; Tue, 28 Nov 2023 08:25:34 -0500 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:58787) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7y5h-0000Za-KW for 67349@debbugs.gnu.org; Tue, 28 Nov 2023 08:25:32 -0500 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-6c115026985so5322043b3a.1 for <67349@debbugs.gnu.org>; Tue, 28 Nov 2023 05:25:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701177917; x=1701782717; darn=debbugs.gnu.org; h=message-id:date:mime-version:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=WzVh3vqupES8pp4P67TY7OaS55blB/YrynymHXyOR9w=; b=iptjIZUDfmMMscyJ/feRx0AoOyuCWfUOO9M04+tu66KLwb7ODUDMlQtxqmdF4aYeil IJNF/3BhNuyOGH5OmeEsoxZRVE1PCxGvCmbq25mnaiqa1j1GgpJmSLT5egHeMMzGcXpX XlDzmOQZQ+g6P/0ppP4lz+9A3Hc9LhltEpFN8lSv/BDekBY09t0iKjjxNikDmkvL/uHc UX68buwEMBWyb6XJzN5gYpIWWk3POE42GojJXtTylUGCqSBvMs9a/2YOhG9MUa9pA3c3 YB4sreYuN+h/a6PmJSgBAAuVZfxijSS9IggVupR9UFUzynmaAl95kNN3tD3/Yp0kCNDS 3q0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701177917; x=1701782717; h=message-id:date:mime-version:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=WzVh3vqupES8pp4P67TY7OaS55blB/YrynymHXyOR9w=; b=fXB5AEsLByH6onqAuFwEgZ7i7QqXgaEwLL+TQWR2DOP8cxWo/dzLKNejAkXKSPMs7c A71DRYCMsyDBWWvMVuvT4A3mhpEDxqrIhGTBYNhnC5DYCdXWia0XAYlf1T7YxiWzOtF6 6y9U4OdR+j2aOe1oX+ZxI56s7jTg07kvp/pD2Gm9acpcnWaEdH5ER2YQsxipray/dxwN 4jLONCBj/K2gKnZsxHnFj54LuTYNI6r8ajNPM9jer2oLL9kxihedxLVIuq/YH2bJoOmL AgpMgp8yq2T7r9Dj7cD21rSU1a3Afhmt7Zi6OCWUygaABHOW1pGUelml/gSaaSIa9vaL pZXg== X-Gm-Message-State: AOJu0Yx4lg1/eCDrhXImHyfU08HgcGghS0prBOubut7agzkR/5xpqWMD 3r99N/SWvJ08n3okwx2EilDsB8Zo8hY= X-Google-Smtp-Source: AGHT+IHvaFdcLmYyymD6PHgBGF4TaKwdi1eWe2001GoH1bM/O3VeS6iX2oTUl3XPyd4rNZrv/XzLwg== X-Received: by 2002:a05:6a20:7294:b0:18c:ad4d:3469 with SMTP id o20-20020a056a20729400b0018cad4d3469mr6039420pzk.53.1701177916834; Tue, 28 Nov 2023 05:25:16 -0800 (PST) Received: from hayvan (pharma2-70.w2k.pharmakol.uni-freiburg.de. [132.230.165.170]) by smtp.gmail.com with ESMTPSA id ey11-20020a056a0038cb00b0068ffd56f705sm8973210pfb.118.2023.11.28.05.25.14 for <67349@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 05:25:16 -0800 (PST) From: Mehmet Tekman MIME-Version: 1.0 Date: Tue, 28 Nov 2023 14:25:11 +0100 Message-ID: <874jh6xb60.fsf@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Ignore previous patches. Full patch with hotfix included, and sorted inputs. Dependent on an updated libkdcraw (#67509) and fftw-cmake (#67343) From 1f19bb405174db71b1e041639d3aed24530290e4 Mon Sep 17 00:00:00 2001 Message-ID: <1f19bb405174db71b1e041639d3aed24530290e4.1701176454.git.mtekman89@gmail.com> In-Reply-To: <82f7a7d8c60e1773565e3655dfd06dda28056924.1701176454.git.mtekman89@gmail.com> References: <82f7a7d8c60e1773565e3655dfd06dda28056924.1701176454.git.mtekman89@gmail.com> From: Mehmet Tekman 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 ;;; Copyright © 2022 Brendan Tildesley ;;; Copyright © 2022 Petr Hodina +;;; Copyright © 2023 Mehmet Tekman ;;; ;;; 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