Maxim Cournoyer <maxim.cournoyer@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at 59767) by debbugs.gnu.org; 21 Mar 2023 14:05:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 21 10:05:38 2023
Received: from localhost ([127.0.0.1]:60040 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1peccL-0002PR-Qn
for submit <at> debbugs.gnu.org; Tue, 21 Mar 2023 10:05:38 -0400
Received: from mail-qt1-f177.google.com ([209.85.160.177]:35651)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1peccI-0002P6-Hg
for 59767 <at> debbugs.gnu.org; Tue, 21 Mar 2023 10:05:35 -0400
Received: by mail-qt1-f177.google.com with SMTP id ay22so6570096qtb.2
for <59767 <at> debbugs.gnu.org>; Tue, 21 Mar 2023 07:05:34 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20210112; t=1679407528;
h=mime-version:user-agent:message-id:in-reply-to:date:references
:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=ODWmKk13XNBMTE+UxmCGHpJxY7eB2oOSw66TrjERTks=;
b=pnM89iBw6fhNG2h+RB+eQTlFyaXQMDyNtCmgTOMg1ZC/Xyba79nqISATifuNSGX/lY
ZdLOiYRgSgeYlXGvF7ES0KOvyJqlioY5V0i8vn0Llfu9MfXt3RyN+8dSza8EwxvKfX7+
sxrJrRnmmziWMWusDylZHd1ezlwnlrp4Nh/9YUd646NYfkivBkzV16IVHrAFu8BN4D5j
GWXhU9XFPYeMMfhXKtsSztsM0v7ZQD23shE2zjCZQymlZLQJ9B56tbQQtYqK9nYKGKmn
PEFJY8hTNYCLIQp3byY4StkEK+aI5PZrTsUvqROI/IiJTZnb1QSj9/3Xack+83+7hhPy
ZNxQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112; t=1679407528;
h=mime-version:user-agent:message-id:in-reply-to:date:references
:subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=ODWmKk13XNBMTE+UxmCGHpJxY7eB2oOSw66TrjERTks=;
b=AUEyu84Yxz5Vzq/KkAe7YkW6Qix1pxajmMEsZf0jWl1CAoANGvTyHEI3o80OljCl9H
OYIlOd2C+tsz5z/hJxmsWZAT7pzild4K3CmxO16MiI3ft0eQ7ASDaAzrfbsA6XmhPSOI
PESZ8qae3fIduSe0YlPW+UNSJySqieenNHlySJcBL14vnT6v/UKdsbsIf0Ul6JwgzNKV
Vj/f5TysW1q0uPkfgNSfgjODs6QRbG8qoHVIaLZ98/21MNiMpFqPlBlBlH8tfTJjam26
swDWYXEIqvhV17CuWntkZzu2mYkdEwtrUasjFesTjY9QDHxweuGXlJgtpVZHaUYtIx3F
FO8A==
X-Gm-Message-State: AO0yUKV3ujRYnYQvnNg0ql5lyWB8GhC+FIY0fW6xYpztUeXu2bBbQKKC
QeGGt3z6eGt5i1je9wtOUzyLcduzfXS6YA==
X-Google-Smtp-Source: AK7set/WC0duj3VQrM8hf19PG6HzyfyPFqFiYRpzIVkOjVzveD8Yb4uTNWJPhLwArQd16Ilito+INQ==
X-Received: by 2002:ac8:7f51:0:b0:3bf:d8b6:4cc7 with SMTP id
g17-20020ac87f51000000b003bfd8b64cc7mr5006686qtk.58.1679407528540;
Tue, 21 Mar 2023 07:05:28 -0700 (PDT)
Received: from hurd (dsl-10-130-195.b2b2c.ca. [72.10.130.195])
by smtp.gmail.com with ESMTPSA id
s128-20020a372c86000000b0074374e2b630sm9445895qkh.119.2023.03.21.07.05.27
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 21 Mar 2023 07:05:27 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: phodina <phodina@HIDDEN>
Subject: Re: bug#59767: KDE diff tools
References: <OzmDrVj033wJjZtMzm9hY6ow89vVr0TnCM_GPKmCcMgvhKmiIqoA-N-Dj2Rm4pJzEMZ0we2cU6J2dtXNfPISC1RA0M36K_ebmGymatks4oc=@protonmail.com>
Date: Tue, 21 Mar 2023 10:05:26 -0400
In-Reply-To: <OzmDrVj033wJjZtMzm9hY6ow89vVr0TnCM_GPKmCcMgvhKmiIqoA-N-Dj2Rm4pJzEMZ0we2cU6J2dtXNfPISC1RA0M36K_ebmGymatks4oc=@protonmail.com>
(phodina@HIDDEN's message of "Fri, 02 Dec 2022 08:38:30
+0000")
Message-ID: <87h6ueqjx5.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 59767
Cc: 59767 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
phodina <phodina@HIDDEN> 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@HIDDEN>
> 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@HIDDEN>
> 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
guix-patches@HIDDEN:bug#59767; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 2 Dec 2022 08:38:47 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 02 03:38:47 2022 Received: from localhost ([127.0.0.1]:45355 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1p11ZH-0003rG-0h for submit <at> 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 <phodina@HIDDEN>) id 1p11ZF-0003r8-02 for submit <at> 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 <phodina@HIDDEN>) id 1p11ZE-0000XA-Qd for guix-patches@HIDDEN; 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 <phodina@HIDDEN>) id 1p11ZC-0005if-Bl for guix-patches@HIDDEN; 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== To: Guix Patches <guix-patches@HIDDEN> From: phodina <phodina@HIDDEN> Subject: KDE diff tools Message-ID: <OzmDrVj033wJjZtMzm9hY6ow89vVr0TnCM_GPKmCcMgvhKmiIqoA-N-Dj2Rm4pJzEMZ0we2cU6J2dtXNfPISC1RA0M36K_ebmGymatks4oc=@protonmail.com> Feedback-ID: 14143818:user:proton MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_AOyelRiKjX19GKQInFqjunA1J1YybARvEYViA8Ao4" Received-SPF: pass client-ip=185.70.43.22; envelope-from=phodina@HIDDEN; 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) This is a multi-part message in MIME format. --b1_AOyelRiKjX19GKQInFqjunA1J1YybARvEYViA8Ao4 Content-Type: multipart/alternative; boundary="b2_AOyelRiKjX19GKQInFqjunA1J1YybARvEYViA8Ao4" --b2_AOyelRiKjX19GKQInFqjunA1J1YybARvEYViA8Ao4 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: base64 SGksCgp0aGVzZSAyIHBhdGNoZXMgYWRkIEtERSBkaWZmIHRvb2xzLiBIb3dldmVyLCBvbmx5IHRo ZSBrZGlmZjMgaXMgd29ya2luZy4gS2NvbXBhcmUgc2hvd3MgZGlhbG9nIHdpdGggbWVzc2FnZTog Q291bGQgbm90IGxvYWQgS2NvbXBhcmVWaWV3UGFydC4KCk5vdCBzdXJlIGhvdyB0byBmaXggdGhh dCBlcnJvciBhdG0uCgotLS0tClBldHI= --b2_AOyelRiKjX19GKQInFqjunA1J1YybARvEYViA8Ao4 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: base64 PGRpdiBzdHlsZT0iZm9udC1mYW1pbHk6IEFyaWFsOyBmb250LXNpemU6IDE0cHg7Ij5IaSw8L2Rp dj48ZGl2IHN0eWxlPSJmb250LWZhbWlseTogQXJpYWw7IGZvbnQtc2l6ZTogMTRweDsiPjxicj48 L2Rpdj48ZGl2IHN0eWxlPSJmb250LWZhbWlseTogQXJpYWw7IGZvbnQtc2l6ZTogMTRweDsiPnRo ZXNlIDIgcGF0Y2hlcyBhZGQgS0RFIGRpZmYgdG9vbHMuIEhvd2V2ZXIsIG9ubHkgdGhlIGtkaWZm MyBpcyB3b3JraW5nLiBLY29tcGFyZSBzaG93cyBkaWFsb2cgd2l0aCBtZXNzYWdlOiBDb3VsZCBu b3QgbG9hZCBLY29tcGFyZVZpZXdQYXJ0Ljxicj48YnI+Tm90IHN1cmUgaG93IHRvIGZpeCB0aGF0 IGVycm9yIGF0bS48YnI+PGJyPi0tLS08YnI+UGV0cjwvZGl2PjxkaXYgY2xhc3M9InByb3Rvbm1h aWxfc2lnbmF0dXJlX2Jsb2NrIiBzdHlsZT0iZm9udC1mYW1pbHk6IEFyaWFsOyBmb250LXNpemU6 IDE0cHg7Ij4NCjwvZGl2Pg0K --b2_AOyelRiKjX19GKQInFqjunA1J1YybARvEYViA8Ao4-- --b1_AOyelRiKjX19GKQInFqjunA1J1YybARvEYViA8Ao4 Content-Type: text/x-patch; name=0002-gnu-Add-kompare.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0002-gnu-Add-kompare.patch RnJvbSA2OTE1NjA2OTgyYjA5NDRjOTZlNDliY2U4OTcwNjE0ODYwYTExNDlkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRyIEhvZGluYSA8cGhvZGluYUBwcm90b25tYWlsLmNvbT4K RGF0ZTogRnJpLCAyIERlYyAyMDIyIDA5OjA2OjUzICswMTAwClN1YmplY3Q6IFtQQVRDSCAyLzJd ICFnbnU6IEFkZCBrb21wYXJlLgoKKiBnbnUvcGFja2FnZXMva2RlLXV0aWxzLnNjbSAoa29tcGFy ZSk6IE5ldyB2YXJpYWJsZS4KCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMva2RlLXV0aWxzLnNj bSBiL2dudS9wYWNrYWdlcy9rZGUtdXRpbHMuc2NtCmluZGV4IDgzNDhlY2U3MzUuLjAyMzJiNjYw YzEgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9rZGUtdXRpbHMuc2NtCisrKyBiL2dudS9wYWNr YWdlcy9rZGUtdXRpbHMuc2NtCkBAIC03MDUsNiArNzA1LDI4IEBAIChkZWZpbmUtcHVibGljIGtp cm9naQogICAgICAgKGxpY2Vuc2UgO0dQTCBmb3IgcHJvZ3JhbXMsIExHUEwgZm9yIGxpYnJhcmll cwogICAgICAgICAgICAgICAgKGxpc3QgbGljZW5zZTpncGwyKyBsaWNlbnNlOmxncGwyLjApKSkp KQogCisoZGVmaW5lLXB1YmxpYyBrb21wYXJlCisgIChwYWNrYWdlCisgICAgKG5hbWUgImtvbXBh cmUiKQorICAgICh2ZXJzaW9uICIyMi4wOC4xIikKKyAgICAoc291cmNlIChvcmlnaW4KKyAgICAg ICAgICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gpCisgICAgICAgICAgICAgICh1cmkgKHN0cmluZy1h cHBlbmQKKwkJCSAgImh0dHBzOi8vaW52ZW50LmtkZS5vcmcvc2RrL2tvbXBhcmUvLS9hcmNoaXZl L3YiIHZlcnNpb24gIi9rb21wYXJlLXYiIHZlcnNpb24KKwkJCSAgIi50YXIuZ3oiKSkKKyAgICAg ICAgICAgICAgKHNoYTI1NgorICAgICAgICAgICAgICAgKGJhc2UzMgorICAgICAgICAgICAgICAg ICIwZmtkZmtkZm1maWR4c2pkOXlnczA5bmNpanBibm5jenI0aXhxNGNzZ2tyOHJwYnBtbGY0Iikp KSkKKwkoYnVpbGQtc3lzdGVtIHF0LWJ1aWxkLXN5c3RlbSkKKwkobmF0aXZlLWlucHV0cyAobGlz dCBleHRyYS1jbWFrZS1tb2R1bGVzIGtkb2N0b29scykpCisJKGlucHV0cyAobGlzdCBrY29yZWFk ZG9ucyBrY29kZWNzIGtpY29udGhlbWVzCisgIGtqb2J3aWRnZXRzIGtzZXJ2aWNlIGtjb25maWcg a3BhcnRzIGt0ZXh0ZWRpdG9yIGt3aWRnZXRzYWRkb25zIGxpYmtvbXBhcmVkaWZmMikpCisJKGhv bWUtcGFnZSAiaHR0cHM6Ly9pbnZlbnQua2RlLm9yZy9zZGsva29tcGFyZSIpCisgICAgKHN5bm9w c2lzICJHcmFwaGljYWwgRmlsZSBEaWZmZXJlbmNlcyBUb29sIikKKyAgICAoZGVzY3JpcHRpb24g IlRoaXMgcGFja2FnZSBwcm92aWRlcyB0b29sIHRvIHNob3cgZGlmZnJlbmNlcyBpbgorZmlsZXMu IikKKyhsaWNlbnNlIGxpY2Vuc2U6Z3BsMispKSkKKwogKGRlZmluZS1wdWJsaWMga29udHJhc3QK ICAgKHBhY2thZ2UKICAgICAobmFtZSAia29udHJhc3QiKQotLSAKMi4zOC4xCgo= --b1_AOyelRiKjX19GKQInFqjunA1J1YybARvEYViA8Ao4 Content-Type: text/x-patch; name=0001-gnu-Add-kdiff3.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-Add-kdiff3.patch RnJvbSAxZjI1YWZkMzJkMWFkNmQ0ZDI0MmZkMGFiZGY4ZDg2MjZhOGI3MmE4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRyIEhvZGluYSA8cGhvZGluYUBwcm90b25tYWlsLmNvbT4K RGF0ZTogRnJpLCAyIERlYyAyMDIyIDA5OjA2OjIwICswMTAwClN1YmplY3Q6IFtQQVRDSCAxLzJd IGdudTogQWRkIGtkaWZmMy4KCiogZ251L3BhY2thZ2VzL2tkZS11dGlscy5zY20gKGtkaWZmMyk6 IE5ldyB2YXJpYWJsZS4KCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMva2RlLXV0aWxzLnNjbSBi L2dudS9wYWNrYWdlcy9rZGUtdXRpbHMuc2NtCmluZGV4IDI3NDJkNmI4NDYuLjgzNDhlY2U3MzUg MTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9rZGUtdXRpbHMuc2NtCisrKyBiL2dudS9wYWNrYWdl cy9rZGUtdXRpbHMuc2NtCkBAIC0zMSw2ICszMSw3IEBAIChkZWZpbmUtbW9kdWxlIChnbnUgcGFj a2FnZXMga2RlLXV0aWxzKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcykKICAgIzp1c2Ut bW9kdWxlIChnbnUgcGFja2FnZXMgYmFja3VwKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdl cyBiYXNoKQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBib29zdCkKICAgIzp1c2UtbW9k dWxlIChnbnUgcGFja2FnZXMgY21ha2UpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGNv bXByZXNzaW9uKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBjcnlwdG8pCkBAIC00MjYs NiArNDI3LDMzIEBAIChkZWZpbmUtcHVibGljIGtkZWJ1Z3NldHRpbmdzCiAgICAgICJUaGlzIHBh Y2thZ2UgYWxsb3dzIHRvIHNlbGVjdCB3aGljaCBRTG9nZ2luZ0NhdGVnb3J5IGFyZSBkaXNwbGF5 ZWQuIikKICAgICAobGljZW5zZSBsaWNlbnNlOmxncGwyLjArKSkpCiAKKyhkZWZpbmUtcHVibGlj IGtkaWZmMworICAocGFja2FnZQorICAgIChuYW1lICJrZGlmZjMiKQorICAgICh2ZXJzaW9uICIx LjkuNiIpCisgICAgKHNvdXJjZSAob3JpZ2luCisgICAgICAgICAgICAgIChtZXRob2QgdXJsLWZl dGNoKQorICAgICAgICAgICAgICAodXJpIChzdHJpbmctYXBwZW5kCisgICAgICAgICAgICAgICAg ICAgICJodHRwczovL2ludmVudC5rZGUub3JnL3Nkay9rZGlmZjMvLS9hcmNoaXZlLyIgdmVyc2lv bgorICAgICAgICAgICAgICAgICAgICAiL2tkaWZmMy0iIHZlcnNpb24gIi50YXIuZ3oiKSkKKyAg ICAgICAgICAgICAgKHNoYTI1NgorICAgICAgICAgICAgICAgKGJhc2UzMgorICAgICAgICAgICAg ICAgICIwMjRwd2phbnhkeHlkNmlpa253NXdmMDVtdzV6ZzBiY2FyZjhwZ2NqNm1na2FxMTJxcnFr IikpKSkKKyAgICAoYnVpbGQtc3lzdGVtIHF0LWJ1aWxkLXN5c3RlbSkKKyAgICAobmF0aXZlLWlu cHV0cyAobGlzdCBleHRyYS1jbWFrZS1tb2R1bGVzIGtkb2N0b29scykpCisgICAgKGlucHV0cyAo bGlzdCBib29zdAorICAgICAgICAgICAgICAgICAgYnJlZXplLWljb25zCisgICAgICAgICAgICAg ICAgICBraTE4bgorICAgICAgICAgICAgICAgICAga2NvcmVhZGRvbnMKKyAgICAgICAgICAgICAg ICAgIGtjcmFzaAorICAgICAgICAgICAgICAgICAga3BhcnRzCisgICAgICAgICAgICAgICAgICBr d2lkZ2V0c2FkZG9ucykpCisgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9pbnZlbnQua2RlLm9yZy9z ZGsva29tcGFyZSIpCisgICAgKHN5bm9wc2lzICJVdGlsaXR5IGZvciBjb21wYXJpbmcgYW5kIG1l cmdpbmcgZmlsZXMgYW5kIGRpcmVjdG9yaWVzIikKKyAgICAoZGVzY3JpcHRpb24gIlRoaXMgcGFj a2FnZSBwcm92aWRlcyB1dGlsaXR5IHRvIGNvbXBhcmUgYW5kIG1lZ2UgZmlsZSBhcword2VsbCBh cyBkaXJlY3Rvcmllcy4iKQorICAgIChsaWNlbnNlIGxpY2Vuc2U6Z3BsMispKSkKKwogKGRlZmlu ZS1wdWJsaWMga2JhY2t1cAogICAocGFja2FnZQogICAgIChuYW1lICJrYmFja3VwIikKLS0gCjIu MzguMQoK --b1_AOyelRiKjX19GKQInFqjunA1J1YybARvEYViA8Ao4--
phodina <phodina@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#59767; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.