From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id MCRGAU5+8GM4gwAAbAwnHQ (envelope-from ) for ; Sat, 18 Feb 2023 08:29:18 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id eIseAU5+8GNvRAEAauVa8A (envelope-from ) for ; Sat, 18 Feb 2023 08:29:18 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 710E847DDC for ; Sat, 18 Feb 2023 08:29:17 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="B/CeUNRO"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676705357; a=rsa-sha256; cv=none; b=NFePlndY0uFs7VNEngH3urnObGBTj14DmxvPnJOj8BLVD2yeJYjb+EtrBfC04KGYf9TaPr EXmMxgIMA2jJIRAsejEDtoOnMGxP8P+ruji7o2aI3dSCA7+OipN46ARP67zohT6dOuxtIz yJScUVbkXgcoBi7caIdObYZ/LDuK/TmbEoyrIUeluJoe8YPHmkEeGaU++hg/eoi11IjyvU dMoG0xpDLgV3N+ugP3vtx42zdq3b3uWZ0SgqArdAmzhzZpiQlYt4G6/2J+/EBIw24bLgn6 /DIK2xw16PK2bwcoYEWa8TcQDX8mx7AB23/OIPjJbNwDIoifapdmMTy3fhci4w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="B/CeUNRO"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676705357; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Fc8B3a2Dkb/9hptJasNJFBrGMC0zGZKp+NObzvL4/jo=; b=EwuaRXSET5ZdiqcjY/gzQULXbCHjJBHMK9P3fhizql3VhHSbSmfDiXaGh2dqAEcQEUZ9xu iIaKOWxzoAt7aP6eC4beYGXaLzkutQODBd+IVc73VkiUuy0Ny5CNyjE0bdvkPBB8NGT/h3 3Qz92+CNTpHF1KBfRfc7GrtFzmsLFaaz8YGEf9S/gLbfqOg2/TtBpge40QkaF0GzPHXuDc nr1xlbkpeDx4w5ZVlf6h4DxZZ/lqAR1uFMTs19tDQZRkn3toSlWwyFpy/8qALe5ZlWlKg0 WA/6fNcMJ04xbWq5KuOSbm9rvFiXGqPkfNAr/zSK0rYWiIzaiiLCNEYBFl4egg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pTHeb-0003Vn-9F; Sat, 18 Feb 2023 02:29: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 1pTHeZ-0003VP-3N for guix-patches@gnu.org; Sat, 18 Feb 2023 02:29:03 -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 1pTHeY-0004aA-R6 for guix-patches@gnu.org; Sat, 18 Feb 2023 02:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pTHeY-0002L1-GE for guix-patches@gnu.org; Sat, 18 Feb 2023 02:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61592] [PATCH] gnu: meld: Update to 3.22.0 Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Feb 2023 07:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61592 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Andy Tai , 61592@debbugs.gnu.org Received: via spool by 61592-submit@debbugs.gnu.org id=B61592.16767053218945 (code B ref 61592); Sat, 18 Feb 2023 07:29:02 +0000 Received: (at 61592) by debbugs.gnu.org; 18 Feb 2023 07:28:41 +0000 Received: from localhost ([127.0.0.1]:42313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTHeD-0002KD-5f for submit@debbugs.gnu.org; Sat, 18 Feb 2023 02:28:41 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:38456) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTHeA-0002Jy-Hz for 61592@debbugs.gnu.org; Sat, 18 Feb 2023 02:28:39 -0500 Received: by mail-wm1-f65.google.com with SMTP id o10-20020a05600c510a00b003e21e018039so1495249wms.3 for <61592@debbugs.gnu.org>; Fri, 17 Feb 2023 23:28:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Fc8B3a2Dkb/9hptJasNJFBrGMC0zGZKp+NObzvL4/jo=; b=B/CeUNROf1eqFTlLg4BtYCiv0rbUxGFJ0FnfQ5SRk73MSnQZRWu04MxOCe/eyLJyn+ w5HL5iVbsH+IThz2X6dEdhE7mrEa45jYNGxzw0hKLxglmY/naMIFUEeteSzOi1ArgqPf 9O0f6DdhMhja2GEJvaB3al26Ka4NpGwQB0YSlm6uHW1P7MoEXcnlAHJU3fgSNHiARhVv +Xinjznss9ZcOxEjt7CtvSI1jJLiIAP5WxS8sH06HIg5rjrNtxvPBNOxBVXHYvlnGuxl /0dO6SqHVeyUgacCEk5f4heqJEJ2+LB+dj7ZXQdsCDbvbRjSW93MVpm6+IIZIab/qRIr orGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Fc8B3a2Dkb/9hptJasNJFBrGMC0zGZKp+NObzvL4/jo=; b=so6j37lGys9lh0ars0l/UEgNe0Fd/2eunUsxHnM3JeSvj9CdYUO/1s2RbtFIUrCA4u m/50O7EGeTBic46Jz26ajQpGM7GFWRCxv6u9LT8QPvsTOuilCxFSiuFm4qDtvEX1wy58 sgaJBc8xsJlQ1FtZOH7FkcLYMhb8OrVx9yNAHUqGVLQXL7whz5/1OZNTKdlf27MstGYf rI8l9vu2lkOpcuvsPkDl5X1xOJ7nJNXTb/neiuJ2hprD4NiK4K6OHnNHyx5QXyK7lYHT H/6vAS0Luu495BExBy1oGtg+SqDhtgl2l3SBHBlbJxFEVAGWb3vtXYgd+HnI9cvTVmQn p2Ig== X-Gm-Message-State: AO0yUKWufHO9CNhEmO7JfmU97RBPU3toSwq47E24qGW7lWzSB8yEeL21 K3yxaZkpezuoXCxGTENXlEjxAaO4rGXILg== X-Google-Smtp-Source: AK7set+rbvw4zKrXatVZSTWOnPC7sp6D+ZHQaF8GAUtQcC/yZQQSHCAu1VluzNV2VARtf/oiGWPaGg== X-Received: by 2002:a05:600c:4da4:b0:3e2:1e32:36f6 with SMTP id v36-20020a05600c4da400b003e21e3236f6mr4054348wmp.2.1676705312273; Fri, 17 Feb 2023 23:28:32 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id n24-20020a7bcbd8000000b003dc4aae4739sm2955993wmi.27.2023.02.17.23.28.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 23:28:31 -0800 (PST) Message-ID: <392b7a650f6b1730dda4a7b3c7b33558a6189e91.camel@gmail.com> From: Liliana Marie Prikler Date: Sat, 18 Feb 2023 08:28:28 +0100 In-Reply-To: <20230218021218.10783-1-atai@atai.org> References: <20230218021218.10783-1-atai@atai.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 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: X-Migadu-Queue-Id: 710E847DDC X-Spam-Score: -1.13 X-Migadu-Spam-Score: -1.13 X-Migadu-Scanner: scn0.migadu.com List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-TUID: 282AxKCGQRgV Am Freitag, dem 17.02.2023 um 18:12 -0800 schrieb Andy Tai: > * gnu/packages/patchutils.scm (meld): Update to 3.22.0 > --- > =C2=A0gnu/packages/patchutils.scm | 87 +++++++++++++++++-----------------= - > -- > =C2=A01 file changed, 39 insertions(+), 48 deletions(-) >=20 > diff --git a/gnu/packages/patchutils.scm > b/gnu/packages/patchutils.scm > index dd5e6bae9a..b5347d6a22 100644 > --- a/gnu/packages/patchutils.scm > +++ b/gnu/packages/patchutils.scm > @@ -5,6 +5,7 @@ > =C2=A0;;; Copyright =C2=A9 2019 Christopher Baines > =C2=A0;;; Copyright =C2=A9 2021 Xinglu Chen > =C2=A0;;; Copyright =C2=A9 2022 jgart > +;;; Copyright =C2=A9 2023 Andy Tai > =C2=A0;;; > =C2=A0;;; This file is part of GNU Guix. > =C2=A0;;; > @@ -29,6 +30,8 @@ (define-module (gnu packages patchutils) > =C2=A0=C2=A0 #:use-module (guix download) > =C2=A0=C2=A0 #:use-module (guix git-download) > =C2=A0=C2=A0 #:use-module (guix build-system gnu) > +=C2=A0 #:use-module (guix build-system glib-or-gtk) > +=C2=A0 #:use-module (guix build-system meson) > =C2=A0=C2=A0 #:use-module (guix build-system python) > =C2=A0=C2=A0 #:use-module (gnu packages) > =C2=A0=C2=A0 #:use-module (gnu packages ed) > @@ -37,6 +40,7 @@ (define-module (gnu packages patchutils) > =C2=A0=C2=A0 #:use-module (gnu packages check) > =C2=A0=C2=A0 #:use-module (gnu packages databases) > =C2=A0=C2=A0 #:use-module (gnu packages django) > +=C2=A0 #:use-module (gnu packages freedesktop) > =C2=A0=C2=A0 #:use-module (gnu packages file) > =C2=A0=C2=A0 #:use-module (gnu packages gawk) > =C2=A0=C2=A0 #:use-module (gnu packages gettext) > @@ -47,8 +51,11 @@ (define-module (gnu packages patchutils) > =C2=A0=C2=A0 #:use-module (gnu packages less) > =C2=A0=C2=A0 #:use-module (gnu packages mail) > =C2=A0=C2=A0 #:use-module (gnu packages ncurses) > +=C2=A0 #:use-module (gnu packages package-management) > =C2=A0=C2=A0 #:use-module (gnu packages perl) > +=C2=A0 #:use-module (gnu packages pkg-config) > =C2=A0=C2=A0 #:use-module (gnu packages python) > +=C2=A0 #:use-module (gnu packages python-build) > =C2=A0=C2=A0 #:use-module (gnu packages python-xyz) > =C2=A0=C2=A0 #:use-module (gnu packages version-control) > =C2=A0=C2=A0 #:use-module (gnu packages xml)) > @@ -214,7 +221,7 @@ (define-public vbindiff > =C2=A0(define-public meld > =C2=A0=C2=A0 (package > =C2=A0=C2=A0=C2=A0=C2=A0 (name "meld") > -=C2=A0=C2=A0=C2=A0 (version "3.20.4") > +=C2=A0=C2=A0=C2=A0 (version "3.22.0") > =C2=A0=C2=A0=C2=A0=C2=A0 (source > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (origin > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (method url-fetch) > @@ -222,66 +229,50 @@ (define-public meld > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (version-major+minor version) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 "/meld-" version ".tar.xz")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (sha256 > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (base32 > "04vx2mdbcdin0g3w8x910czfch5vyrl8drv1f2l8gxh6qvp113pl")))) > -=C2=A0=C2=A0=C2=A0 (build-system python-build-system) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (base32 > "03f4j27amyi28flkks8i9bhqzd6xhm6d3c6jzxc57rzniv4hgh9z")))) > +=C2=A0=C2=A0=C2=A0 (build-system meson-build-system) > =C2=A0=C2=A0=C2=A0=C2=A0 (native-inputs > -=C2=A0=C2=A0=C2=A0=C2=A0 `(("intltool" ,intltool) > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ("xmllint" ,libxml2) > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ("glib-compile-schemas" ,glib "bin"= ) > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ("python-pytest" ,python-pytest))) > +=C2=A0=C2=A0=C2=A0=C2=A0 (list desktop-file-utils > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 intltool > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 itstool > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 libxml2 > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 `(,glib "bin") > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 `(,gtk+ "bin")=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 ; for gtk-update-icon-cache > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 gobject-introspection > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pkg-config > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 python) Even if it's a chore, please separate style changes and actual changes into two commits. Cheers