From 2f33de1dfd427c4924fdc89c92bbb8001cbfceb2 Mon Sep 17 00:00:00 2001 From: Sughosha Date: Fri, 10 Oct 2025 14:03:52 +0530 Subject: [PATCH] gnu: libkdcraw(-qt5): Move to kde-graphics.scm. * gnu/packages/kde-frameworks.scm (libkdcraw): Remove variable. (libkdcraw-qt5): Ditto. * gnu/packages/kde-graphics.scm (libkdcraw): New variable. (libkdcraw-qt5): Ditto. Change-Id: Ibb12a66a2fac35cf8332620da7daf081cf19870a --- gnu/packages/kde-frameworks.scm | 35 ------------------------------ gnu/packages/kde-graphics.scm | 38 +++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 35 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index f1d161af8fc9505675472b11f9ce5f08350699c2..ce7d43286c1582e2fef1df38b2501f63cff391e4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2204,41 +2204,6 @@ uses a job-based interface to queue tasks and execute them in an efficient way." (inputs (list qtbase-5)))) -(define-public libkdcraw - (package - (name "libkdcraw") - (version "24.12.1") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/" name "-" version ".tar.xz")) - (sha256 - (base32 "0m2wi3bhfd5yn57dpix9mbsrzkxm7p1s42zs1x899wmznk8blnib")))) - (build-system cmake-build-system) - (native-inputs - (list pkg-config extra-cmake-modules)) - (inputs - (list libraw qtbase)) - (arguments (list #:tests? #f - #:configure-flags - #~(list #$(string-append - "-DQT_MAJOR_VERSION=" - (version-major - (package-version - (this-package-input "qtbase"))))))) - (home-page "https://invent.kde.org/graphics/libkdcraw") - (synopsis "C++ interface used to decode RAW picture files") - (description "Libkdcraw is a C++ interface around LibRaw library used to -decode RAW picture files.") - (license (list license:gpl2+ license:bsd-3)))) - -(define-public libkdcraw-qt5 - (package - (inherit libkdcraw) - (name "libkdcraw-qt5") - (inputs (modify-inputs (package-inputs libkdcraw) - (replace "qtbase" qtbase-5))))) ;; Tier 2 ;; diff --git a/gnu/packages/kde-graphics.scm b/gnu/packages/kde-graphics.scm index bc52d4dd3635d41e07cf1da459fb8bcdd2400fec..b9bc0781740648669a1c27cf72d28747b3f677c2 100644 --- a/gnu/packages/kde-graphics.scm +++ b/gnu/packages/kde-graphics.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Mehmet Tekman ;;; Copyright © 2023, 2025 Sughosha +;;; Copyright © 2024 Maxim Cournoyer ;;; Copyright © 2024 Remco van 't Veer ;;; Copyright © 2025 Sergio Pastor Pérez ;;; Copyright © 2025 pinoaffe @@ -41,6 +42,7 @@ #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) #:use-module (guix packages) #:use-module (gnu packages) #:use-module (gnu packages algebra) @@ -661,6 +663,42 @@ features include brush stabilizers, brush engines and wrap-around mode.") expression library, that is used in Krita.") (license license:gpl3+))) +(define-public libkdcraw + (package + (name "libkdcraw") + (version "24.12.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/" name "-" version ".tar.xz")) + (sha256 + (base32 "0m2wi3bhfd5yn57dpix9mbsrzkxm7p1s42zs1x899wmznk8blnib")))) + (build-system cmake-build-system) + (native-inputs + (list pkg-config extra-cmake-modules)) + (inputs + (list libraw qtbase)) + (arguments (list #:tests? #f + #:configure-flags + #~(list #$(string-append + "-DQT_MAJOR_VERSION=" + (version-major + (package-version + (this-package-input "qtbase"))))))) + (home-page "https://invent.kde.org/graphics/libkdcraw") + (synopsis "C++ interface used to decode RAW picture files") + (description "Libkdcraw is a C++ interface around LibRaw library used to +decode RAW picture files.") + (license (list license:gpl2+ license:bsd-3)))) + +(define-public libkdcraw-qt5 + (package + (inherit libkdcraw) + (name "libkdcraw-qt5") + (inputs (modify-inputs (package-inputs libkdcraw) + (replace "qtbase" qtbase-5))))) + (define-public libksane (package (name "libksane")