From patchwork Fri Dec 2 08:38:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 45018 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7C6AC27BBEC; Fri, 2 Dec 2022 08:39:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 15A9B27BBE9 for ; Fri, 2 Dec 2022 08:39:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p11ZZ-0000Zm-78; Fri, 02 Dec 2022 03:39:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p11ZW-0000Zd-Ey for guix-patches@gnu.org; Fri, 02 Dec 2022 03:39:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p11ZW-0006Qk-2m for guix-patches@gnu.org; Fri, 02 Dec 2022 03:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p11ZV-0003rc-VP for guix-patches@gnu.org; Fri, 02 Dec 2022 03:39:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59767] KDE diff tools Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Dec 2022 08:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59767 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 59767@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.166997032714838 (code B ref -1); Fri, 02 Dec 2022 08:39:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Dec 2022 08:38:47 +0000 Received: from localhost ([127.0.0.1]:45355 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p11ZH-0003rG-0h for submit@debbugs.gnu.org; Fri, 02 Dec 2022 03:38:47 -0500 Received: from lists.gnu.org ([209.51.188.17]:37824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p11ZF-0003r8-02 for submit@debbugs.gnu.org; Fri, 02 Dec 2022 03:38:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p11ZE-0000XA-Qd for guix-patches@gnu.org; Fri, 02 Dec 2022 03:38:44 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p11ZC-0005if-Bl for guix-patches@gnu.org; Fri, 02 Dec 2022 03:38:44 -0500 Date: Fri, 02 Dec 2022 08:38:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1669970319; x=1670229519; bh=HQPfbbmutkePac9qRHpj6rYQinsSEZFeSrEwaQsHhxg=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=X+GC/46PRZzWh0ZGpLX6rki9p/JYjo2RzsxfBualCI45EDguA8mwZBPbYAeLjFpme QYcsI8iqeo5iiKuYJM0x/J/edY+ubT4pBCh8S+p2jxQnp+xw9Gg4wVj/VJHU8GxifF BRW5+KBZYgdGfOB+knUREy+T1bcZmPIT1fKJJqpzarS0YzXEN96nzmEdUB08pV+ZHx jPBosN84kIuFccnF93uN1CVtI87JtMnSq6A3gBtcm93crdJ5K8m6lUI+9Ix8vLeccS FG3M6eFdJ2RJnEKuMbUTy+XCuHy5KzSPQCMaWIgD5SJK4Bgrb06zImeb07aX+jvSXa t926zy6lrGZSQ== Message-ID: Feedback-ID: 14143818:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.22; envelope-from=phodina@protonmail.com; helo=mail-4322.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 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