* [bug#59767] KDE diff tools
@ 2022-12-02 8:38 phodina via Guix-patches via
2023-03-21 14:05 ` Maxim Cournoyer
0 siblings, 1 reply; 2+ messages in thread
From: phodina via Guix-patches via @ 2022-12-02 8:38 UTC (permalink / raw)
To: 59767
[-- Attachment #1.1: Type: text/plain, Size: 194 bytes --]
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
[-- Attachment #1.2: Type: text/html, Size: 474 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-Add-kompare.patch --]
[-- Type: text/x-patch; name=0002-gnu-Add-kompare.patch, Size: 1472 bytes --]
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.
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0001-gnu-Add-kdiff3.patch --]
[-- Type: text/x-patch; name=0001-gnu-Add-kdiff3.patch, Size: 1944 bytes --]
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.
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* [bug#59767] KDE diff tools
2022-12-02 8:38 [bug#59767] KDE diff tools phodina via Guix-patches via
@ 2023-03-21 14:05 ` Maxim Cournoyer
0 siblings, 0 replies; 2+ messages in thread
From: Maxim Cournoyer @ 2023-03-21 14:05 UTC (permalink / raw)
To: phodina; +Cc: 59767
Hi,
phodina <phodina@protonmail.com> writes:
> 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.
>
> 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
^tools ^differences
> +files.")
> +(license license:gpl2+)))
Please run 'guix style' on this. Also, at run time, I get:
--8<---------------cut here---------------start------------->8---
$ /gnu/store/j2gp8aqd9xiwpwybwf5zj1zrc92mf8y1-kompare-22.08.1/bin/kompare
kf.service.services: The desktop entry file "/run/current-system/profile/share/applications/qemu.desktop" has Type= "Application" but no Exec line
kf.service.sycoca: Invalid Service : "/run/current-system/profile/share/applications/qemu.desktop"
kf.service.services: The desktop entry file "/home/maxim/.guix-profile/share/applications/qemu.desktop" has Type= "Application" but no Exec line
kf.service.sycoca: Invalid Service : "/home/maxim/.guix-profile/share/applications/qemu.desktop"
kf.service.services: KServiceTypeTrader: serviceType "KParts/ReadOnlyPart" not found
--8<---------------cut here---------------end--------------->8---
and cannot use it. Is it expected to only work inside a KDE
environment?
> (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.
>
> 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
^utilities ^merge files
> +well as directories.")
> + (license license:gpl2+)))
This one appears to run fine on my side.
Could you address the issues here (at least the typos and guix style),
but hopefully add a comment explaining the environment requirements for
kcompare to run and send a v2, or even a fix! :-)
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-21 14:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-02 8:38 [bug#59767] KDE diff tools phodina via Guix-patches via
2023-03-21 14:05 ` Maxim Cournoyer
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).