From 1f25afd32d1ad6d4d242fd0abdf8d8626a8b72a8 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Fri, 2 Dec 2022 09:06:20 +0100 Subject: [PATCH 1/2] gnu: Add kdiff3. * gnu/packages/kde-utils.scm (kdiff3): New variable. diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 2742d6b846..8348ece735 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -31,6 +31,7 @@ (define-module (gnu packages kde-utils) #:use-module (gnu packages) #:use-module (gnu packages backup) #:use-module (gnu packages bash) + #:use-module (gnu packages boost) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) @@ -426,6 +427,33 @@ (define-public kdebugsettings "This package allows to select which QLoggingCategory are displayed.") (license license:lgpl2.0+))) +(define-public kdiff3 + (package + (name "kdiff3") + (version "1.9.6") + (source (origin + (method url-fetch) + (uri (string-append + "https://invent.kde.org/sdk/kdiff3/-/archive/" version + "/kdiff3-" version ".tar.gz")) + (sha256 + (base32 + "024pwjanxdxyd6iiknw5wf05mw5zg0bcarf8pgcj6mgkaq12qrqk")))) + (build-system qt-build-system) + (native-inputs (list extra-cmake-modules kdoctools)) + (inputs (list boost + breeze-icons + ki18n + kcoreaddons + kcrash + kparts + kwidgetsaddons)) + (home-page "https://invent.kde.org/sdk/kompare") + (synopsis "Utility for comparing and merging files and directories") + (description "This package provides utility to compare and mege file as +well as directories.") + (license license:gpl2+))) + (define-public kbackup (package (name "kbackup") -- 2.38.1