guix_mirror_bot pushed a commit to branch kde-team
in repository guix.
commit e0548224d03a4de5089703683451c33d6044c9dc
Author: Sughosha <[email protected]>
AuthorDate: Tue Sep 30 23:23:48 2025 +0530
gnu: krita: Move to kde-graphics.scm.
* gnu/packages/kde.scm (krita): Remove variable.
* gnu/packages/kde-graphics.scm (krita): New variable.
Change-Id: Ia1245a3041e13b46672435b4bb0e06900e4db5fc
---
gnu/packages/kde-graphics.scm | 148 +++++++++++++++++++++++++++++++++++++++++-
gnu/packages/kde.scm | 135 +-------------------------------------
2 files changed, 148 insertions(+), 135 deletions(-)
diff --git a/gnu/packages/kde-graphics.scm b/gnu/packages/kde-graphics.scm
index 017b8c9a58..09ec6e8571 100644
--- a/gnu/packages/kde-graphics.scm
+++ b/gnu/packages/kde-graphics.scm
@@ -24,21 +24,41 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (gnu packages)
+ #:use-module (gnu packages algebra)
#:use-module (gnu packages astronomy)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages bison)
+ #:use-module (gnu packages boost)
#:use-module (gnu packages check)
+ #:use-module (gnu packages cpp)
+ #:use-module (gnu packages curl)
#:use-module (gnu packages compression)
#:use-module (gnu packages documentation)
#:use-module (gnu packages flex)
+ #:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages fribidi)
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
+ #:use-module (gnu packages gimp)
+ #:use-module (gnu packages graphics)
+ #:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages kde)
+ #:use-module (gnu packages image-processing)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages kde-plasma)
+ #:use-module (gnu packages maths)
+ #:use-module (gnu packages pdf)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages qt)
- #:use-module (gnu packages xdisorg))
+ #:use-module (gnu packages sdl)
+ #:use-module (gnu packages unicode)
+ #:use-module (gnu packages video)
+ #:use-module (gnu packages xdisorg)
+ #:use-module (gnu packages xorg))
(define-public gwenview
(package
@@ -167,6 +187,132 @@ illustrate project schedules.")
painting, image manipulating and icon editing.")
(license (list license:lgpl2.0+ license:bsd-2))))
+(define-public krita
+ (package
+ (name "krita")
+ (version "5.2.9")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/krita/" version "/krita-" version
+ ".tar.gz"))
+ (sha256
+ (base32 "19nb98rh8j9jdd8hz8m56hrpljqv74p7j1k5plqnkwpbdmaszj88"))
+ (patches (search-patches "krita-bump-sip-abi-version-to-12.8.patch"
+ "krita-xsimd-13-compat.patch"))))
+ (build-system qt-build-system)
+ (arguments
+ `(#:tests? #f
+ #:configure-flags (list "-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\" ) "))))
+ (add-after 'install 'wrap-bin
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (python-path (getenv "GUIX_PYTHONPATH")))
+ (wrap-program (string-append out "/bin/krita")
+ `("GUIX_PYTHONPATH" ":" prefix (,python-path)))))))))
+ (native-inputs
+ (list curl
+ eigen
+ extra-cmake-modules
+ gettext-minimal
+ kitemmodels
+ pkg-config
+ qwt
+ vc))
+ (inputs
+ (list bash-minimal
+ boost
+ exiv2
+ 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-5
+ kcompletion-5
+ kconfig-5
+ kcoreaddons-5
+ kcrash-5
+ kguiaddons-5
+ ki18n-5
+ kiconthemes-5
+ kio-5
+ kitemviews-5
+ kseexpr
+ kwidgetsaddons-5
+ kwindowsystem-5
+ kxmlgui-5
+ lager
+ lcms
+ libheif
+ libjpeg-turbo
+ libjxl
+ libkdcraw-qt5
+ 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-5
+ sdl2
+ xsimd
+ zlib
+ zug))
+ (home-page "https://krita.org";)
+ (synopsis "Digital painting application")
+ (description
+ "Krita is a professional painting tool designed for concept artists,
+illustrators, matte and texture artists, and the VFX industry. Notable
+features include brush stabilizers, brush engines and wrap-around mode.")
+ (license license:gpl2+)))
+
(define-public kseexpr
(package
(name "kseexpr")
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index afc711d0cb..4a9ff9b54a 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -62,22 +62,18 @@
#:use-module (gnu packages djvu)
#:use-module (gnu packages documentation)
#:use-module (gnu packages gnupg)
- #:use-module (gnu packages graphics)
#:use-module (gnu packages ebook)
#: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)
- #:use-module (gnu packages gimp)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#: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)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages kde-graphics)
#:use-module (gnu packages kde-pim)
@@ -90,7 +86,6 @@
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
- #:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages pulseaudio)
@@ -98,10 +93,8 @@
#:use-module (gnu packages qt)
#:use-module (gnu packages readline)
#:use-module (gnu packages scanner)
- #:use-module (gnu packages sdl)
#:use-module (gnu packages tex)
#:use-module (gnu packages tls)
- #:use-module (gnu packages unicode)
#:use-module (gnu packages video)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xml)
@@ -321,132 +314,6 @@ and desktop experiences.")
(description "KColorChooser is a utility to select a color.")
(license license:expat)))
-(define-public krita
- (package
- (name "krita")
- (version "5.2.9")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "mirror://kde/stable/krita/" version "/krita-" version
- ".tar.gz"))
- (sha256
- (base32 "19nb98rh8j9jdd8hz8m56hrpljqv74p7j1k5plqnkwpbdmaszj88"))
- (patches (search-patches "krita-bump-sip-abi-version-to-12.8.patch"
- "krita-xsimd-13-compat.patch"))))
- (build-system qt-build-system)
- (arguments
- `(#:tests? #f
- #:configure-flags (list "-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\" ) "))))
- (add-after 'install 'wrap-bin
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (python-path (getenv "GUIX_PYTHONPATH")))
- (wrap-program (string-append out "/bin/krita")
- `("GUIX_PYTHONPATH" ":" prefix (,python-path)))))))))
- (native-inputs
- (list curl
- eigen
- extra-cmake-modules
- gettext-minimal
- kitemmodels
- pkg-config
- qwt
- vc))
- (inputs
- (list bash-minimal
- boost
- exiv2
- 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-5
- kcompletion-5
- kconfig-5
- kcoreaddons-5
- kcrash-5
- kguiaddons-5
- ki18n-5
- kiconthemes-5
- kio-5
- kitemviews-5
- kseexpr
- kwidgetsaddons-5
- kwindowsystem-5
- kxmlgui-5
- lager
- lcms
- libheif
- libjpeg-turbo
- libjxl
- libkdcraw-qt5
- 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-5
- sdl2
- xsimd
- zlib
- zug))
- (home-page "https://krita.org";)
- (synopsis "Digital painting application")
- (description
- "Krita is a professional painting tool designed for concept artists,
-illustrators, matte and texture artists, and the VFX industry. Notable
-features include brush stabilizers, brush engines and wrap-around mode.")
- (license license:gpl2+)))
-
(define-public libqaccessibilityclient
(package
(name "libqaccessibilityclient")
