From patchwork Thu Nov 23 23:17:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mehmet Tekman X-Patchwork-Id: 56785 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 2B88B27BBE9; Thu, 23 Nov 2023 23:19:24 +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=unavailable 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 D099727BBE2 for ; Thu, 23 Nov 2023 23:19:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6IyK-0006NG-4c; Thu, 23 Nov 2023 18:19:00 -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 1r6IyI-0006Mx-1A for guix-patches@gnu.org; Thu, 23 Nov 2023 18:18:58 -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 1r6IyH-0003G4-Jv for guix-patches@gnu.org; Thu, 23 Nov 2023 18:18:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r6IyL-0003t4-Lo for guix-patches@gnu.org; Thu, 23 Nov 2023 18:19:01 -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: Thu, 23 Nov 2023 23:19:01 +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.170078148614864 (code B ref 67349); Thu, 23 Nov 2023 23:19:01 +0000 Received: (at 67349) by debbugs.gnu.org; 23 Nov 2023 23:18:06 +0000 Received: from localhost ([127.0.0.1]:35329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6IxS-0003rf-1J for submit@debbugs.gnu.org; Thu, 23 Nov 2023 18:18:06 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:58541) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6IxP-0003r5-OC for 67349@debbugs.gnu.org; Thu, 23 Nov 2023 18:18:04 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40b39d33fe0so1544215e9.0 for <67349@debbugs.gnu.org>; Thu, 23 Nov 2023 15:17:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700781473; x=1701386273; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=ii+2s6I3xPeCa82TEY/xJbQG2VsRclB4DeAeT2I7Cm4=; b=KADUywyS2BQdZ9XQ4tGnkQxvWLoh//8IF/FDyQ08rkPrtyWwnmPo8os8ezT+OsbYkV mVRpNajw8zqBDBCQt6CxaS+bxEExuhgoJ9AtwYBN9HWe22pDdFJLmod47k5BduWuFy2n XI/4crE7DsD7IBnlYbLiU62Acmv3qJ0urATidO8dhaG09NftYaRzzKltoCPnBTSfFNcW kbKgBUN98CNkC/IEGyKKFzqlnreys/Oz02xYq2z3kOPEaf8V04MkM07Uu79hzseOAf6Z ZjXuAFSe3yBPHuI5ew1qQbdbMkDub/nvLNypNCCZ4kIlMsR3Nk9LGrJ1wP4EG2hKaiCB MxMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700781473; x=1701386273; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ii+2s6I3xPeCa82TEY/xJbQG2VsRclB4DeAeT2I7Cm4=; b=g03QUm+fgCH36uZdYtTxuMeCENKHf5jYHXZHKYVqWJtxWHDSGlD4U4PytTbeBnbSD6 76DE5cxISgHtG52ZzbXUtbQiMCK999oAL6aQ2BRP6x+YX3luZ2EftmKH9Gp989C98hn0 0AwjxpjatX4Mbstyfq2U5SMfJYWUw05uj+94zYDq3i9icQTfYnsyC2hd6smrVWsxiM0e Ay63WEXHNs79gGqwCkAIkoQEtJ2Oyk9VpkfZcF5PmR8RZz+Z+RzuaXZFJgVnGLEjHt1F KKrqOgU93GuWcR2XOlirCNWo61CJwY774ijmBkLetupgmxy/I7A6trCT3UqpKz/KN0A/ Xrsg== X-Gm-Message-State: AOJu0YyGyFoNHYgkYM3U+8Nnh8UDtend7K/KBvB55gaFnkiIWhgCjW27 mr7ShsNdt1vr4NMXTDuPdwDqJqZQivQ= X-Google-Smtp-Source: AGHT+IHJ55mQ55vc9Ta5ZEp67spBZnwd3E5xCKiGVUzeADYG77blaG3SljBKPN08hfLNGZl6OfqAGg== X-Received: by 2002:a05:600c:4f4b:b0:404:6ed9:98d1 with SMTP id m11-20020a05600c4f4b00b004046ed998d1mr908636wmq.41.1700781473164; Thu, 23 Nov 2023 15:17:53 -0800 (PST) Received: from hayvan (pharma2-70.w2k.pharmakol.uni-freiburg.de. [132.230.165.170]) by smtp.gmail.com with ESMTPSA id o18-20020a05600c4fd200b0040b38082b99sm1914542wmq.1.2023.11.23.15.17.52 for <67349@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 15:17:52 -0800 (PST) From: Mehmet Tekman Date: Fri, 24 Nov 2023 00:17:51 +0100 Message-ID: <87ttpcawkg.fsf@gmail.com> MIME-Version: 1.0 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 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. From 49d5d1075125df7de48543ee9531dc1b1291c230 Mon Sep 17 00:00:00 2001 From: mtekman 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