From d971f1228ee59195203438abecaccb4b5e19fdef Mon Sep 17 00:00:00 2001 From: Sughosha Date: Tue, 7 Oct 2025 08:25:04 +0530 Subject: [PATCH] gnu: digikam: Move to kde-graphics.scm. * gnu/packages/image-viewers.scm (digikam): Remove variable. * gnu/packages/kde-graphics.scm (digikam): New variable. Change-Id: Ib29dca2aa8a7c82694ecbb131aae44171017a49e --- gnu/packages/image-viewers.scm | 133 --------------------------------- gnu/packages/kde-graphics.scm | 131 ++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 133 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 020f3e5e4d3ff3e73bcbce3f327f0c7683fe37d0..8d31719ff8669f6702a39c39da0685f10a980303 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -74,7 +74,6 @@ #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) - #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages cmake) @@ -83,7 +82,6 @@ #:use-module (gnu packages curl) #:use-module (gnu packages documentation) #:use-module (gnu packages djvu) - #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gawk) @@ -97,15 +95,9 @@ #:use-module (gnu packages golang-xyz) #:use-module (gnu packages gtk) #:use-module (gnu packages graphics) - #:use-module (gnu packages graphviz) #:use-module (gnu packages image) #:use-module (gnu packages image-processing) #:use-module (gnu packages imagemagick) - #:use-module (gnu packages kde) - #:use-module (gnu packages kde-education) - #:use-module (gnu packages kde-frameworks) - #:use-module (gnu packages kde-graphics) - #:use-module (gnu packages kde-pim) #:use-module (gnu packages linux) #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) @@ -123,8 +115,6 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) - #:use-module (gnu packages ruby) - #:use-module (gnu packages scanner) #:use-module (gnu packages suckless) #:use-module (gnu packages stb) #:use-module (gnu packages terminals) @@ -1165,129 +1155,6 @@ synchronization of multiple instances.") "xzgv is a fast image viewer that provides extensive keyboard support.") (license license:gpl2+))) -(define-public digikam - (package - (name "digikam") - (version "8.7.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/digikam/" - version "/digiKam-" version ".tar.xz")) - (sha256 - (base32 "0bx0kpzgq47pj3msrnd7gxr8n2qbak0cjird6bw4r4s31b15xqvr")))) - (build-system qt-build-system) - (home-page "https://www.digikam.org/download/git/") - (arguments (list - #:tests? #f - #:build-type "Release" - #:configure-flags #~(list "-DENABLE_MEDIAPLAYER=ON" ; for video playback - "-DENABLE_QWEBENGINE=ON" ; for web content - "-DENABLE_KFILEMETADATASUPPORT=ON" - "-DENABLE_AKONADICONTACTSUPPORT=ON" - "-DBUILD_WITH_QT6=ON" - "-DENABLE_APPSTYLES=ON") - #:qtbase qtbase - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'copy-test-data - (lambda* (#:key inputs #:allow-other-keys) - (copy-recursively (assoc-ref inputs "digikam-test-data") - "test-data"))) - (add-after 'install 'wrap-binary - (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (string-append (assoc-ref outputs "out") - "/bin/digikam") - `("PATH" ":" prefix - (,(dirname - (search-input-file inputs "/bin/exiftool")))))))))) - (native-search-paths - (list (search-path-specification - (variable "DK_PLUGIN_PATH") - (separator ";") - (files '("lib/qt6/plugins/digikam"))))) - (inputs (list - akonadi-contacts - bash-minimal - boost - ecm - eigen - exiv2-static ; digikam only wants to statically link against exiv2 - ffmpeg - glib - ijg-libjpeg - imagemagick - jasper - kcalendarcore - kconfig - kcoreaddons - kfilemetadata - ki18n - kiconthemes - kio - knotifications - knotifyconfig - kservice - kwindowsystem - kxmlgui - lcms - lensfun - libgphoto2 - libheif - libjpeg-turbo - libjxl - libksane - libpng - libtiff - libxml2 - libxslt - marble-qt - mesa - opencv - perl-image-exiftool - python-wrapper - qtimageformats - qtmultimedia - qtnetworkauth - qtscxml - qtsvg - qtwebengine - ruby - sane-backends - solid - sonnet - threadweaver - x265)) - (native-inputs (list - (origin - (method git-fetch) - (uri (git-reference - (url "https://invent.kde.org/graphics/digikam-test-data/") - (commit "83efefdfc7fffa35e5e260d3b5a4aec01ebbdb40"))) - (file-name "digikam-test-data") - (sha256 - (base32 - "0mf7rzwhy5yyj47xh4vs0i841m8885yy9qganli04d8skikl0s6z"))) - appstream - bison - doxygen - extra-cmake-modules - flex - graphviz ; for inheritance graphs in documentation - perl - pkg-config)) - (synopsis "Photo management, organizing and editing suite") - (description "digiKam is an advanced open-source digital photo management -application. It provides a comprehensive set of tools for importing, -managing, editing, and sharing photos and RAW files. - -You can use digiKam's import capabilities to easily transfer photos, RAW -files, and videos directly from your camera and external storage devices (SD -cards, USB disks, etc.). The application allows you to configure import -settings and rules that process and organize imported items on-the-fly.") - (license (list license:bsd-3 ; cmake scripts - license:cc0 ; test data - license:gpl2+)))) ; code - (define-public hydrus-network (package (name "hydrus-network") diff --git a/gnu/packages/kde-graphics.scm b/gnu/packages/kde-graphics.scm index c00e10f9fc3beb9ab9edd03076766e071a1e5fcc..bc5094da3cdec7ba2c1a0eb3111657c233427573 100644 --- a/gnu/packages/kde-graphics.scm +++ b/gnu/packages/kde-graphics.scm @@ -44,13 +44,18 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gimp) + #:use-module (gnu packages gl) + #:use-module (gnu packages glib) #:use-module (gnu packages graphics) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages image-processing) #:use-module (gnu packages kde) + #:use-module (gnu packages kde-education) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages kde-pim) #:use-module (gnu packages kde-plasma) #:use-module (gnu packages maths) #:use-module (gnu packages markup) @@ -60,13 +65,139 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages qt) + #:use-module (gnu packages ruby) + #:use-module (gnu packages scanner) #:use-module (gnu packages sdl) #:use-module (gnu packages tex) #:use-module (gnu packages unicode) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) +(define-public digikam + (package + (name "digikam") + (version "8.7.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/digikam/" + version "/digiKam-" version ".tar.xz")) + (sha256 + (base32 "0bx0kpzgq47pj3msrnd7gxr8n2qbak0cjird6bw4r4s31b15xqvr")))) + (build-system qt-build-system) + (home-page "https://www.digikam.org/download/git/") + (arguments (list + #:tests? #f + #:build-type "Release" + #:configure-flags #~(list "-DENABLE_MEDIAPLAYER=ON" ; for video playback + "-DENABLE_QWEBENGINE=ON" ; for web content + "-DENABLE_KFILEMETADATASUPPORT=ON" + "-DENABLE_AKONADICONTACTSUPPORT=ON" + "-DBUILD_WITH_QT6=ON" + "-DENABLE_APPSTYLES=ON") + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-test-data + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "digikam-test-data") + "test-data"))) + (add-after 'install 'wrap-binary + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/digikam") + `("PATH" ":" prefix + (,(dirname + (search-input-file inputs "/bin/exiftool")))))))))) + (native-search-paths + (list (search-path-specification + (variable "DK_PLUGIN_PATH") + (separator ";") + (files '("lib/qt6/plugins/digikam"))))) + (inputs (list + akonadi-contacts + bash-minimal + boost + ecm + eigen + exiv2-static ; digikam only wants to statically link against exiv2 + ffmpeg + glib + ijg-libjpeg + imagemagick + jasper + kcalendarcore + kconfig + kcoreaddons + kfilemetadata + ki18n + kiconthemes + kio + knotifications + knotifyconfig + kservice + kwindowsystem + kxmlgui + lcms + lensfun + libgphoto2 + libheif + libjpeg-turbo + libjxl + libksane + libpng + libtiff + libxml2 + libxslt + marble-qt + mesa + opencv + perl-image-exiftool + python-wrapper + qtimageformats + qtmultimedia + qtnetworkauth + qtscxml + qtsvg + qtwebengine + ruby + sane-backends + solid + sonnet + threadweaver + x265)) + (native-inputs (list + (origin + (method git-fetch) + (uri (git-reference + (url "https://invent.kde.org/graphics/digikam-test-data/") + (commit "83efefdfc7fffa35e5e260d3b5a4aec01ebbdb40"))) + (file-name "digikam-test-data") + (sha256 + (base32 + "0mf7rzwhy5yyj47xh4vs0i841m8885yy9qganli04d8skikl0s6z"))) + appstream + bison + doxygen + extra-cmake-modules + flex + graphviz ; for inheritance graphs in documentation + perl + pkg-config)) + (synopsis "Photo management, organizing and editing suite") + (description "digiKam is an advanced open-source digital photo management +application. It provides a comprehensive set of tools for importing, +managing, editing, and sharing photos and RAW files. + +You can use digiKam's import capabilities to easily transfer photos, RAW +files, and videos directly from your camera and external storage devices (SD +cards, USB disks, etc.). The application allows you to configure import +settings and rules that process and organize imported items on-the-fly.") + (license (list license:bsd-3 ; cmake scripts + license:cc0 ; test data + license:gpl2+)))) ; code + (define-public gwenview (package (name "gwenview")