(name . Guix Patches)(address . guix-patches@gnu.org)
OzmDrVj033wJjZtMzm9hY6ow89vVr0TnCM_GPKmCcMgvhKmiIqoA-N-Dj2Rm4pJzEMZ0we2cU6J2dtXNfPISC1RA0M36K_ebmGymatks4oc=@protonmail.com
Hi,
these 2 patches add KDE diff tools. However, only the kdiff3 is working. Kcompare shows dialog with message: Could not load KcompareViewPart.
Not sure how to fix that error atm.
----
Petr
From 6915606982b0944c96e49bce8970614860a1149d Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 2 Dec 2022 09:06:53 +0100
Subject: [PATCH 2/2] !gnu: Add kompare.
* gnu/packages/kde-utils.scm (kompare): New variable.
Toggle diff (35 lines)
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 8348ece735..0232b660c1 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -705,6 +705,28 @@ (define-public kirogi
(license ;GPL for programs, LGPL for libraries
(list license:gpl2+ license:lgpl2.0)))))
+(define-public kompare
+ (package
+ (name "kompare")
+ (version "22.08.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://invent.kde.org/sdk/kompare/-/archive/v" version "/kompare-v" version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0fkdfkdfmfidxsjd9ygs09ncijpbnnczr4ixq4csgkr8rpbpmlf4"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules kdoctools))
+ (inputs (list kcoreaddons kcodecs kiconthemes
+ kjobwidgets kservice kconfig kparts ktexteditor kwidgetsaddons libkomparediff2))
+ (home-page "https://invent.kde.org/sdk/kompare")
+ (synopsis "Graphical File Differences Tool")
+ (description "This package provides tool to show diffrences in
+files.")
+(license license:gpl2+)))
+
(define-public kontrast
(package
(name "kontrast")
--
2.38.1
From 1f25afd32d1ad6d4d242fd0abdf8d8626a8b72a8 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 2 Dec 2022 09:06:20 +0100
Subject: [PATCH 1/2] gnu: Add kdiff3.
* gnu/packages/kde-utils.scm (kdiff3): New variable.
Toggle diff (48 lines)
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