From unknown Wed Jun 18 23:00:01 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#61592 <61592@debbugs.gnu.org> To: bug#61592 <61592@debbugs.gnu.org> Subject: Status: [PATCH] gnu: meld: Update to 3.22.0 Reply-To: bug#61592 <61592@debbugs.gnu.org> Date: Thu, 19 Jun 2025 06:00:01 +0000 retitle 61592 [PATCH] gnu: meld: Update to 3.22.0 reassign 61592 guix-patches submitter 61592 Andy Tai severity 61592 normal tag 61592 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 17 21:12:34 2023 Received: (at submit) by debbugs.gnu.org; 18 Feb 2023 02:12:34 +0000 Received: from localhost ([127.0.0.1]:42037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTCiI-0001zu-57 for submit@debbugs.gnu.org; Fri, 17 Feb 2023 21:12:34 -0500 Received: from lists.gnu.org ([209.51.188.17]:38680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTCiG-0001zm-6m for submit@debbugs.gnu.org; Fri, 17 Feb 2023 21:12:32 -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 1pTCiB-0000D4-AH for guix-patches@gnu.org; Fri, 17 Feb 2023 21:12:28 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pTCi8-0005Nq-Lh for guix-patches@gnu.org; Fri, 17 Feb 2023 21:12:26 -0500 Received: by mail-pl1-x636.google.com with SMTP id ja17so421037plb.13 for ; Fri, 17 Feb 2023 18:12:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=ayBuV8dswJ6x/EaJDX0oyfh370cR5FCsTQ6NEX13rv4=; b=eWrGZBAczTpnG9RCdmEkQO224pmQCBdjlQBtcf86lGvGJopuEvmf3obCYREmsN1fI0 Kny4O8yQrx5OSkSgO+9/f54IT2ois9tlBR/11kMsORKCDKn164uWfq1W87+mlf5In54j FgvjPfMoFhgmhoOIEk41xpM3fwymFzXJSYaJ5aQINKhdhtsjplUCnuuHbUk2c9tMSTEC BPl1j+KCFCS1k1AQZG2P1fe8Z0zQJRX7Cqn22nOym5pcOhWzQCF7Tr/N5r8+yqFt/q9u 2zThPSfmabUyK210ZDrFA+MxvILXHOhuwgsvQ1zEKeXbdOuPVbq67MKuCDttYxIaazu4 ueiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ayBuV8dswJ6x/EaJDX0oyfh370cR5FCsTQ6NEX13rv4=; b=BiB0wHQ+6hqicHkzmxQZIp+SGPQotRJz4B84y67VyQh2Yx0s6/Jm+WlDGGTlOeofNU JoM1sXLWJ7E6tS/a0RsfdoPaYjwajgI1Pib+faj7uhkkpOQMgmon5kWhsD0U/X+xKf+4 XfkKGL9Yh0rHrEhDsgWfTIy3eJGbQiqDaVOs4lmtpqA05hLb3qfBzOoyjdUAnCCYphH6 Q+Os95dgCaQJAqOauUYoL0kLIEeviccWDvw0h4UOzeCGaxlCyC9aOU8Tw+ulc93MRNeM h4Ok22gs5SF4R+tudrRivVQ1iDW4dPgp8n3eSt81WGz+A4GKLSDREvYtppsgVWM8VN8g WeNQ== X-Gm-Message-State: AO0yUKVKl0E71ggP0fSjdnPz+sx1HdSw+HHYaOlKZbdgM28KpvD+pbK3 oKUUWGZcm+t4lLC2hfli0rBigBO9nQs= X-Google-Smtp-Source: AK7set/bYdHKNpEqKH6vUk1vCjPxDCPEWbzgk3XovRvm9qdVGvyJTnbxnPSib090OUN1tA1hcFbJ4Q== X-Received: by 2002:a17:90b:4f8f:b0:22c:6d7c:c521 with SMTP id qe15-20020a17090b4f8f00b0022c6d7cc521mr2869992pjb.45.1676686342292; Fri, 17 Feb 2023 18:12:22 -0800 (PST) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id b12-20020a17090a800c00b002341ae23ad7sm2381434pjn.1.2023.02.17.18.12.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 18:12:21 -0800 (PST) From: Andy Tai To: guix-patches@gnu.org Subject: [PATCH] gnu: meld: Update to 3.22.0 Date: Fri, 17 Feb 2023 18:12:18 -0800 Message-Id: <20230218021218.10783-1-atai@atai.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=lichengtai@gmail.com; helo=mail-pl1-x636.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) * gnu/packages/patchutils.scm (meld): Update to 3.22.0 --- gnu/packages/patchutils.scm | 87 +++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 48 deletions(-) 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 @@ ;;; Copyright © 2019 Christopher Baines ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2022 jgart +;;; Copyright © 2023 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +30,8 @@ (define-module (gnu packages patchutils) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages ed) @@ -37,6 +40,7 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages check) #:use-module (gnu packages databases) #:use-module (gnu packages django) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages file) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) @@ -47,8 +51,11 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages less) #:use-module (gnu packages mail) #:use-module (gnu packages ncurses) + #:use-module (gnu packages package-management) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages version-control) #:use-module (gnu packages xml)) @@ -214,7 +221,7 @@ (define-public vbindiff (define-public meld (package (name "meld") - (version "3.20.4") + (version "3.22.0") (source (origin (method url-fetch) @@ -222,66 +229,50 @@ (define-public meld (version-major+minor version) "/meld-" version ".tar.xz")) (sha256 - (base32 "04vx2mdbcdin0g3w8x910czfch5vyrl8drv1f2l8gxh6qvp113pl")))) - (build-system python-build-system) + (base32 "03f4j27amyi28flkks8i9bhqzd6xhm6d3c6jzxc57rzniv4hgh9z")))) + (build-system meson-build-system) (native-inputs - `(("intltool" ,intltool) - ("xmllint" ,libxml2) - ("glib-compile-schemas" ,glib "bin") - ("python-pytest" ,python-pytest))) + (list desktop-file-utils + intltool + itstool + libxml2 + `(,glib "bin") + `(,gtk+ "bin") ; for gtk-update-icon-cache + gobject-introspection + pkg-config + python)) (inputs - `(("python-cairo" ,python-pycairo) - ("python-gobject" ,python-pygobject) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtksourceview" ,gtksourceview-3))) + (list bash-minimal + python + python-pycairo + python-pygobject + gsettings-desktop-schemas + gtksourceview-4)) (propagated-inputs (list dconf)) (arguments - `(#:imported-modules ((guix build glib-or-gtk-build-system) - ,@%python-build-system-modules) - #:modules ((guix build python-build-system) - ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (list + #:glib-or-gtk? #t + #:imported-modules `(,@%meson-build-system-modules + (guix build python-build-system)) + #:modules '((guix build meson-build-system) + ((guix build python-build-system) #:prefix python:) (guix build utils)) #:phases - (modify-phases %standard-phases - ;; This setup.py script does not support one of the Python build - ;; system's default flags, "--single-version-externally-managed". - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "python" "setup.py" - ;; This setup.py runs gtk-update-icon-cache which we don't want. - "--no-update-icon-cache" - ;; "--no-compile-schemas" - "install" - (string-append "--prefix=" (assoc-ref outputs "out")) - "--root=/"))) - ;; The tests need to be run after installation. - (delete 'check) - (add-after 'install 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Tests look for installed package - (add-installed-pythonpath inputs outputs) - ;; The tests fail when HOME=/homeless-shelter. - (setenv "HOME" "/tmp") - (invoke "py.test" "-v" "-k" - ;; TODO: Those tests fail, why? - "not test_classify_change_actions"))) + #~(modify-phases %standard-phases (add-after 'install 'copy-styles (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((styles "/share/gtksourceview-3.0/styles")) + (let ((styles "/share/gtksourceview-4/styles")) (copy-recursively (string-append (assoc-ref inputs "gtksourceview") styles) (string-append (assoc-ref outputs "out") styles)) #t))) - (add-after 'wrap 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) - (add-after 'wrap 'wrap-typelib - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/meld") - `("GI_TYPELIB_PATH" prefix - ,(search-path-as-string->list (getenv "GI_TYPELIB_PATH")))) - #t)))))) + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/meld") + `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") + ,(python:site-packages inputs outputs))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) (home-page "https://meldmerge.org/") (synopsis "Compare files, directories and working copies") (description "Meld is a visual diff and merge tool targeted at base-commit: c1303a914c172dc80166be22389e7032c5ea5e09 -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 18 02:28:41 2023 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> Subject: Re: [PATCH] gnu: meld: Update to 3.22.0 From: Liliana Marie Prikler To: Andy Tai , 61592@debbugs.gnu.org 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61592 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 23 01:37:16 2023 Received: (at 61592) by debbugs.gnu.org; 23 Feb 2023 06:37:16 +0000 Received: from localhost ([127.0.0.1]:60985 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pV5EB-0005q2-KT for submit@debbugs.gnu.org; Thu, 23 Feb 2023 01:37:16 -0500 Received: from mail-pl1-f171.google.com ([209.85.214.171]:33626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pV5E9-0005pn-Mk for 61592@debbugs.gnu.org; Thu, 23 Feb 2023 01:37:15 -0500 Received: by mail-pl1-f171.google.com with SMTP id s5so11573363plg.0 for <61592@debbugs.gnu.org>; Wed, 22 Feb 2023 22:37:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=Nq709yVXQ6tsBLR5e6t+qDjcatzHpeLxmv2zvvrdmHQ=; b=W3wWRbweoWMQu0GTFkF3rZ2KYgiqoegrokkGy0dx9tVhAMAComyFE6nQacWTlORZ0T 4Dlk3LPgyvnYsPHC7Em3IzQcZZyV5xmVwiVGEpAvPfs+EowW7bwMPOnpOHKhdas0u+Ak QsJrT6NUmC9ixnRS+uFSn6oh7k1QhrM02JSkF+Pu7LpNp/WbwIHajQnw9O01F8SDX1B4 EfwgHOkLr6I59hq8ZPxfT3F2iabvFG7xT1wVlhaDSHbpqXC8UJjag3LbYV9BrI1+DzuU w45XRIHs0Yr++smMmS7L+wrMh4XlUrYquptcAvks5IM78RG3isx8WS/DJEbh1N8DT3A7 8QBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Nq709yVXQ6tsBLR5e6t+qDjcatzHpeLxmv2zvvrdmHQ=; b=3/XBnZDGiiqgxFD6rCmBREOODT211HKLINcmm86BkaCtwujOvnL8YkelMGmQulWYX5 kOHRFmqLGKMgL8CnoNw69BOWiyHia+4eUMXq+zpWeP9bTDCwJO6kd9msVDFgbyeJskPq P2SqqxdKvAp9yGo0bgZHhpcxSKOH2VCoTU8hLxzojVWQyhcUhND7guXm+s24YBtXTnVM X0tZbT3GRLD0vbdYxV5BpjzEHvsDgMAplzoNAY+/GXHLEvbWkoJKZ3nJzAS8e/hBsV9h pMGogzI5Ta3sHXV0AwujTr47UbXK0+xtGcQPl/491OfcAFLepQLfOAWDtJkBOtk9sxtM WK9g== X-Gm-Message-State: AO0yUKW7UaQGFFDMbEHMLAUY2sx8/KBfZAFNF4vRb70YtCv4PHJ+kR8U qkbj1B/Zr+dG8JL9+nUwdh0= X-Google-Smtp-Source: AK7set+lnS52mSXBqKsZ9vDbuiGljG5R3mnvv4dj2RoFYFNsUZeRDCGqVUO5rjwlEYLPBQJSYUL/7g== X-Received: by 2002:a17:902:fb4e:b0:19c:37ed:6517 with SMTP id lf14-20020a170902fb4e00b0019c37ed6517mr11141370plb.27.1677134227400; Wed, 22 Feb 2023 22:37:07 -0800 (PST) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id iw6-20020a170903044600b0019a5aa7eab0sm669043plb.54.2023.02.22.22.37.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 22:37:06 -0800 (PST) From: Andy Tai To: liliana.prikler@gmail.com, 61592@debbugs.gnu.org Subject: [PATCH v2 1/2] gnu: meld: Update to 3.22.0 Date: Wed, 22 Feb 2023 22:37:02 -0800 Message-Id: <20230223063702.5591-1-atai@atai.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 61592 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/patchutils.scm (meld): Update to 3.22.0 --- gnu/packages/patchutils.scm | 79 ++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 44 deletions(-) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index dd5e6bae9a..d093391ce5 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019 Christopher Baines ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2022 jgart +;;; Copyright © 2023 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +30,8 @@ (define-module (gnu packages patchutils) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages ed) @@ -37,6 +40,7 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages check) #:use-module (gnu packages databases) #:use-module (gnu packages django) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages file) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) @@ -47,8 +51,11 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages less) #:use-module (gnu packages mail) #:use-module (gnu packages ncurses) + #:use-module (gnu packages package-management) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages version-control) #:use-module (gnu packages xml)) @@ -214,7 +221,7 @@ (define-public vbindiff (define-public meld (package (name "meld") - (version "3.20.4") + (version "3.22.0") (source (origin (method url-fetch) @@ -222,66 +229,50 @@ (define-public meld (version-major+minor version) "/meld-" version ".tar.xz")) (sha256 - (base32 "04vx2mdbcdin0g3w8x910czfch5vyrl8drv1f2l8gxh6qvp113pl")))) - (build-system python-build-system) + (base32 "03f4j27amyi28flkks8i9bhqzd6xhm6d3c6jzxc57rzniv4hgh9z")))) + (build-system meson-build-system) (native-inputs - `(("intltool" ,intltool) + `(("desktop-file-utils" ,desktop-file-utils) + ("intltool" ,intltool) + ("itstool" ,itstool) ("xmllint" ,libxml2) ("glib-compile-schemas" ,glib "bin") - ("python-pytest" ,python-pytest))) + ("gtk-update-icon-cache" ,gtk+ "bin") + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) + ("python" ,python))) (inputs - `(("python-cairo" ,python-pycairo) + `(("bash-minimal" ,bash-minimal) + ("python" ,python) + ("python-cairo" ,python-pycairo) ("python-gobject" ,python-pygobject) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtksourceview" ,gtksourceview-3))) + ("gtksourceview" ,gtksourceview-4))) (propagated-inputs (list dconf)) (arguments - `(#:imported-modules ((guix build glib-or-gtk-build-system) - ,@%python-build-system-modules) - #:modules ((guix build python-build-system) - ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (list + #:glib-or-gtk? #t + #:imported-modules `(,@%meson-build-system-modules + (guix build python-build-system)) + #:modules '((guix build meson-build-system) + ((guix build python-build-system) #:prefix python:) (guix build utils)) #:phases - (modify-phases %standard-phases - ;; This setup.py script does not support one of the Python build - ;; system's default flags, "--single-version-externally-managed". - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "python" "setup.py" - ;; This setup.py runs gtk-update-icon-cache which we don't want. - "--no-update-icon-cache" - ;; "--no-compile-schemas" - "install" - (string-append "--prefix=" (assoc-ref outputs "out")) - "--root=/"))) - ;; The tests need to be run after installation. - (delete 'check) - (add-after 'install 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Tests look for installed package - (add-installed-pythonpath inputs outputs) - ;; The tests fail when HOME=/homeless-shelter. - (setenv "HOME" "/tmp") - (invoke "py.test" "-v" "-k" - ;; TODO: Those tests fail, why? - "not test_classify_change_actions"))) + #~(modify-phases %standard-phases (add-after 'install 'copy-styles (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((styles "/share/gtksourceview-3.0/styles")) + (let ((styles "/share/gtksourceview-4/styles")) (copy-recursively (string-append (assoc-ref inputs "gtksourceview") styles) (string-append (assoc-ref outputs "out") styles)) #t))) - (add-after 'wrap 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) - (add-after 'wrap 'wrap-typelib - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/meld") - `("GI_TYPELIB_PATH" prefix - ,(search-path-as-string->list (getenv "GI_TYPELIB_PATH")))) - #t)))))) + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/meld") + `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") + ,(python:site-packages inputs outputs))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) (home-page "https://meldmerge.org/") (synopsis "Compare files, directories and working copies") (description "Meld is a visual diff and merge tool targeted at base-commit: 31735e0ccfbc61905eb8558c14747bfcaea9b50f -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 23 01:37:48 2023 Received: (at 61592) by debbugs.gnu.org; 23 Feb 2023 06:37:48 +0000 Received: from localhost ([127.0.0.1]:60988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pV5Ei-0005qs-8s for submit@debbugs.gnu.org; Thu, 23 Feb 2023 01:37:48 -0500 Received: from mail-pl1-f180.google.com ([209.85.214.180]:45657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pV5Eg-0005qd-4v for 61592@debbugs.gnu.org; Thu, 23 Feb 2023 01:37:46 -0500 Received: by mail-pl1-f180.google.com with SMTP id z2so11785426plf.12 for <61592@debbugs.gnu.org>; Wed, 22 Feb 2023 22:37:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=zgYTfEnIWdmEsh2jwFoYu7nFFD1ooM0ldDHa5t+TjkA=; b=dsJ9yXwofett8Yg6WO07UY+9Wt8IHKOYCDvcMLMgje9z0tvMeh8u9yyXYkIlYhtXhu wWW95/uFSeT6QH7A9AKxC3v+3rTMj5HjvXIt3kJm6faFEp2kNB7GYDRQadXjhDVkd51u 07vQRHuECBuaLGcQg5O90xNng6AcVaYRFYVvG4mCTb4aa6wTppGy1AhnbHKQvq7EEsd7 g+OagQkVxNWFYLAe/AzJBKh9GTWTWKdKv4qyHB4hJqMmoV1UEXd0wbenRGkSZXccDcIt R4jMMEuNU5tEEGTjEbRI5raV8Uf4S3R152niMjvJ/+Ohgl1meUdz2QyDBtYephLv2UGH UPDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=zgYTfEnIWdmEsh2jwFoYu7nFFD1ooM0ldDHa5t+TjkA=; b=ppEbMQC75CPZYNbgb+PAvY15X7EYZz1zuodvoQ9tqa/YuLKrPwC4A2bmuIyo15V+Nb /G3Pwyj2/dDu6muKr9iMjG7UfYNqpbu9fEjZdJKiEylK8nspl/WYtoQOXAgpjYYdrwi6 vnaZGjtIfZX5dntVrhWI/JshVzlVSmgxonux5p319V9XZo7dbM+Dyl831sfQ7OyBinC7 CRRju2BKszdbSB2mQuJQytv4b8Y12Z+y4zeTm2rB1NHHWRuBphG2K4FNKNXFz9Am3vmX Cjb62JnOTFWydxJKJPzGbDbNftD8Nx3ZkydFwwRLcCZ2FTHinZpcOS1r9q1fsafrXFmB fQDQ== X-Gm-Message-State: AO0yUKXjGpOGU5iQUXUEoSxvq4QJrIg0A7uxez5u87JJmIq+TcF1bdQU +BW16SvishWjMHysekNxIJI= X-Google-Smtp-Source: AK7set+Mrz2q2zHvatTdx6Wlt6VqLmYvfAj3SvzaiETravPxdNnUx7E8MWlGPgKs1bnsNCA00iK9eA== X-Received: by 2002:a05:6a20:914a:b0:c7:166d:7d0 with SMTP id x10-20020a056a20914a00b000c7166d07d0mr13806359pzc.23.1677134260364; Wed, 22 Feb 2023 22:37:40 -0800 (PST) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id c9-20020aa78e09000000b005a8c90fa306sm3262656pfr.83.2023.02.22.22.37.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 22:37:39 -0800 (PST) From: Andy Tai To: liliana.prikler@gmail.com, 61592@debbugs.gnu.org Subject: [PATCH v2 2/2] gnu: meld: Use new style inputs and gexps. Date: Wed, 22 Feb 2023 22:37:36 -0800 Message-Id: <20230223063736.5631-1-atai@atai.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 61592 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/patchutils.scm (meld): Use new style and gexps. [inputs]: Use new style [native-inputs]: Use new style --- gnu/packages/patchutils.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index d093391ce5..04761d5ef7 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -232,22 +232,22 @@ (define-public meld (base32 "03f4j27amyi28flkks8i9bhqzd6xhm6d3c6jzxc57rzniv4hgh9z")))) (build-system meson-build-system) (native-inputs - `(("desktop-file-utils" ,desktop-file-utils) - ("intltool" ,intltool) - ("itstool" ,itstool) - ("xmllint" ,libxml2) - ("glib-compile-schemas" ,glib "bin") - ("gtk-update-icon-cache" ,gtk+ "bin") - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("python" ,python))) + (list desktop-file-utils + intltool + itstool + libxml2 + `(,glib "bin") ; for glib-compile-schemas + `(,gtk+ "bin") ; for gtk-update-icon-cache + gobject-introspection + pkg-config + python)) (inputs - `(("bash-minimal" ,bash-minimal) - ("python" ,python) - ("python-cairo" ,python-pycairo) - ("python-gobject" ,python-pygobject) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtksourceview" ,gtksourceview-4))) + (list bash-minimal + python + python-pycairo + python-pygobject + gsettings-desktop-schemas + gtksourceview-4)) (propagated-inputs (list dconf)) (arguments -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 24 12:41:36 2023 Received: (at 61592) by debbugs.gnu.org; 24 Feb 2023 17:41:36 +0000 Received: from localhost ([127.0.0.1]:38193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVc4e-0004x1-D8 for submit@debbugs.gnu.org; Fri, 24 Feb 2023 12:41:36 -0500 Received: from mail-ed1-f65.google.com ([209.85.208.65]:33571) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVc4c-0004wj-Kk for 61592@debbugs.gnu.org; Fri, 24 Feb 2023 12:41:35 -0500 Received: by mail-ed1-f65.google.com with SMTP id ck15so587057edb.0 for <61592@debbugs.gnu.org>; Fri, 24 Feb 2023 09:41:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=o7VrsvQshQR//Wie+r55TKi3ILbmGhqwN95LHI96zgQ=; b=d1DzPFRoI2/8G3e3FiiriMSMTMfSvB0L3oldps1s6clv6SyGRROEBr5huIbBOVhjjH CZSA9C6qEb9m46rxZWIB+7vy1ZmeD83lLOW7WovRR20t4gB2v1gsvnwo1Qr5X8TFrl0X M/90hzSFmX25pCHUGz+bOgg3M9iTsFLfAxTziRamS9Ne4nCemdlJykKxmXZrKHpVHG3p Re4Xn63WooaK3jsuy2zGHqBQyWpxSHIdd0QgOuHp4X2UWyoOM58RpixrWVRZa8wFJf9s mp4Y/4E+1apxrbW4inNHzt67nd8bJdMvZ19lEP7EYRKZ3Cm9wjSYguR5xLTN3Ht8OHpj Obtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=o7VrsvQshQR//Wie+r55TKi3ILbmGhqwN95LHI96zgQ=; b=lyE1wVXkJGoTtibMYqTmGGgIh+zmuo7oN2b+F5jeKtMU2bIMe3JZvdWwL4tBuPQeTJ pytsaCYHenb+91XbUAiunmZnaoilIEuvNiXO0ymZ5uu/x93P470axn/AjUgCMwKZm8id yS/xa8KmOHf+yF/fyrQSufQZto78qkRPOYAlEJMLrx2UaAvrBIpo5KaZ2cdudnPwNHJf oiC4ygfJydA/MKcHrS/NwpUZLayscdileiNwyDhOdYZCKyeDn8R/1SDu86rIUHWmFmIo 9RWX7SQWk5TBAKFmYFN2b8ovxIH80SPCVRDESUSGoNaac1rHFJWvUnQvUaeykuh3HK2U rIdg== X-Gm-Message-State: AO0yUKVWoPtzoxOWtY/4CmfveU9s8yw3pN4Bu4WakOizkkQzcJao3PA4 Qbxeh71eToop4/7ViBFGIohvJ0LFjGnq1Q== X-Google-Smtp-Source: AK7set+InI5HyjWTVRZcu6u9aglFGLg4k3p7Pc5Rqpl4uop0DID9fcgweRVTr+R/GdO+/8HwLRmwVg== X-Received: by 2002:a17:907:97c3:b0:8af:ef00:b853 with SMTP id js3-20020a17090797c300b008afef00b853mr31218541ejc.73.1677260488850; Fri, 24 Feb 2023 09:41:28 -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 fi9-20020a170906da0900b008b26f3d45fbsm9925821ejb.143.2023.02.24.09.41.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 09:41:28 -0800 (PST) From: Andy Tai X-Google-Original-From: Andy Tai Date: Wed, 22 Feb 2023 22:37:36 -0800 Subject: [PATCH v3 2/2] gnu: meld: Use new package style. to: 61592@debbugs.gnu.org Message-ID: <11e9f8f61b36762d05655ea2aafd6542cbb1bdd4.camel@atai.org> MIME-Version: 1.0 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 61592 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * gnu/packages/patchutils.scm (meld)[arguments]: Convert to list of G-Expressions. <#:phases>: Drop trailing #t. [inputs, native-inputs]: Drop labels. Signed-off-by: Liliana Marie Prikler --- gnu/packages/patchutils.scm | 74 ++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index fd1ba83b3c..05a9a62dbf 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -232,50 +232,50 @@ (define-public meld (base32 "03f4j27amyi28flkks8i9bhqzd6xhm6d3c6jzxc57rzniv4hgh9z")))) (build-system meson-build-system) (native-inputs - `(("desktop-file-utils" ,desktop-file-utils) - ("intltool" ,intltool) - ("itstool" ,itstool) - ("xmllint" ,libxml2) - ("glib-compile-schemas" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("python" ,python))) + (list desktop-file-utils + intltool + itstool + libxml2 + `(,glib "bin") ; for glib-compile-schemas + gobject-introspection + pkg-config + python)) (inputs - `(("bash-minimal" ,bash-minimal) - ("python" ,python) - ("python-cairo" ,python-pycairo) - ("python-gobject" ,python-pygobject) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtksourceview" ,gtksourceview-4))) + (list bash-minimal + python + python-pycairo + python-pygobject + gsettings-desktop-schemas + gtksourceview-4)) (propagated-inputs (list dconf)) (arguments - `(#:glib-or-gtk? #t - #:imported-modules (,@%meson-build-system-modules + (list + #:glib-or-gtk? #t + #:imported-modules `(,@%meson-build-system-modules (guix build python-build-system)) - #:modules ((guix build meson-build-system) + #:modules '((guix build meson-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-gtk-update-icon-cache - ;; Don't create 'icon-theme.cache'. - (lambda _ - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") (which "true"))))) - (add-after 'install 'copy-styles - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((styles "/share/gtksourceview-4/styles")) - (copy-recursively - (string-append (assoc-ref inputs "gtksourceview") styles) - (string-append (assoc-ref outputs "out") styles)) - #t))) - (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (search-input-file outputs "bin/meld") - `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") - ,(python:site-packages inputs outputs))) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") (which "true"))))) + (add-after 'install 'copy-styles + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((styles "/share/gtksourceview-4/styles")) + (copy-recursively + (string-append (assoc-ref inputs "gtksourceview") styles) + (string-append (assoc-ref outputs "out") styles))))) + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/meld") + `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") + ,(python:site-packages inputs outputs))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) (home-page "https://meldmerge.org/") (synopsis "Compare files, directories and working copies") (description "Meld is a visual diff and merge tool targeted at -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 24 12:41:37 2023 Received: (at 61592) by debbugs.gnu.org; 24 Feb 2023 17:41:37 +0000 Received: from localhost ([127.0.0.1]:38195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVc4e-0004x4-S5 for submit@debbugs.gnu.org; Fri, 24 Feb 2023 12:41:37 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:36435) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVc4c-0004wi-FG for 61592@debbugs.gnu.org; Fri, 24 Feb 2023 12:41:35 -0500 Received: by mail-ed1-f67.google.com with SMTP id da10so398721edb.3 for <61592@debbugs.gnu.org>; Fri, 24 Feb 2023 09:41:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=GZVfVZREhnfUEgcTKziIrJPq6+bI8gqS/bblSRjNqoY=; b=AtoLtp68imVBpV8PJSk2ZKW32SnMEQsRZlOU2EAARf+QokzzW2oe/0CapVb18/908O 6L6Adp9L3d5fTkZZlUZwEadSRKwR9XZFX+rmiWJez2CQFPKypTjcB7GZPP8WJYEKMTbY ihL6qCkee9A36FjC6MMo64WknL4P2OyGOgyzEp2xnNGx1RYoPnyWtL6DScFep2A7m9Lv dFggmmNt+qRVxH4540/FUaamZgcXyd/T+0pv0nAEg91f+iCjp3LUzMXkuhsmD3P5ZKrO qmmN/zzjArDGFfiAy9pt9xJzOqsjBdR2YUqeOTA/D90j2orjrM+Ur9N1A74mb6xn+BYQ 2uGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=GZVfVZREhnfUEgcTKziIrJPq6+bI8gqS/bblSRjNqoY=; b=bPwLK/hWt+/Z3Q9tjHzYRDMzZRlSsfkYCbkKSViJl3BTgr3b7jgazqo7d5VUveqtHS uDlQ6dS/hMb4IQNXsNi4aLostz/4C8Ma19YNSY/lujAMzklBFeWtic8V/LqazmU6x3lg oy7mQR6yOhd6hR6ZZQbWYvj5Vhf4Up804LodToRy2bdW7NLuL3C9RJBZBJKb0PoDRx2h FFrUCoAAF7P20ZRwhh6qn0PI0gl5M8CKdI2h1A2L3Lj0V7XKDIqiTapN+/DBZfQ6zMIH HM4hjFyAQ2bV5QYi/6dzwCRC6Stt14QoBzLI6RzWjWZxQKHCbwcMMTIrAM692Oijz81S stgQ== X-Gm-Message-State: AO0yUKWbb2+oaCt/8UrEOldMoClnyKPlZo0QQhRGlGGukzTu0vMeykxt Vv6esWcm6LJzSSJyqW0SkHoIjZKO9zhMYQ== X-Google-Smtp-Source: AK7set8Dcq4raOkrh6s8s067Dj6Vbgz5v6Vl1RZbqvrl5DsGnUo7bjbVYqo/zjGishAVoE+nRnvgtg== X-Received: by 2002:a17:907:c004:b0:8ae:ea17:bae4 with SMTP id ss4-20020a170907c00400b008aeea17bae4mr377186ejc.30.1677260488182; Fri, 24 Feb 2023 09:41:28 -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 fi9-20020a170906da0900b008b26f3d45fbsm9925821ejb.143.2023.02.24.09.41.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 09:41:27 -0800 (PST) From: Andy Tai X-Google-Original-From: Andy Tai Date: Wed, 22 Feb 2023 22:37:02 -0800 Subject: [PATCH v3 1/2] gnu: meld: Update to 3.22.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 61592@debbugs.gnu.org Message-ID: X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 61592 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * gnu/packages/patchutils.scm (meld): Update to 3.22.0 [build-system]: Switch to meson-build-system. [native-inputs]: Add desktop-file-utils, itstool, gobject-introspection, pkg-config, and python. [inputs]: Add bash-minimal, python, and python-pycairo. Replace gtksourceview-3 with gtksourceview-4. [arguments]: Add #:glib-or-gtk?, #:imported-modules, and #:modules. <#:phases>: Remove custom ‘install’ and ‘check’. Add ‘skip-gtk-update-icon-cache’. Adjust ‘copy-styles’ to gtksourceview-4. Replace ‘wrap-typelib’ with ‘python-and-gi-wrap’. Signed-off-by: Liliana Marie Prikler --- Hi Andy, this patch and the following one are the split I intended. I also fixed up some other issues like the unnecessary gtk+:bin input. Following standard procedure, I intend to leave this up for a little over a week to get some proper review by others. Cheers, Liliana gnu/packages/patchutils.scm | 78 +++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 42 deletions(-) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index dd5e6bae9a..fd1ba83b3c 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019 Christopher Baines ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2022 jgart +;;; Copyright © 2023 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +30,8 @@ (define-module (gnu packages patchutils) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages ed) @@ -37,6 +40,7 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages check) #:use-module (gnu packages databases) #:use-module (gnu packages django) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages file) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) @@ -47,8 +51,11 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages less) #:use-module (gnu packages mail) #:use-module (gnu packages ncurses) + #:use-module (gnu packages package-management) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages version-control) #:use-module (gnu packages xml)) @@ -214,7 +221,7 @@ (define-public vbindiff (define-public meld (package (name "meld") - (version "3.20.4") + (version "3.22.0") (source (origin (method url-fetch) @@ -222,66 +229,53 @@ (define-public meld (version-major+minor version) "/meld-" version ".tar.xz")) (sha256 - (base32 "04vx2mdbcdin0g3w8x910czfch5vyrl8drv1f2l8gxh6qvp113pl")))) - (build-system python-build-system) + (base32 "03f4j27amyi28flkks8i9bhqzd6xhm6d3c6jzxc57rzniv4hgh9z")))) + (build-system meson-build-system) (native-inputs - `(("intltool" ,intltool) + `(("desktop-file-utils" ,desktop-file-utils) + ("intltool" ,intltool) + ("itstool" ,itstool) ("xmllint" ,libxml2) ("glib-compile-schemas" ,glib "bin") - ("python-pytest" ,python-pytest))) + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) + ("python" ,python))) (inputs - `(("python-cairo" ,python-pycairo) + `(("bash-minimal" ,bash-minimal) + ("python" ,python) + ("python-cairo" ,python-pycairo) ("python-gobject" ,python-pygobject) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtksourceview" ,gtksourceview-3))) + ("gtksourceview" ,gtksourceview-4))) (propagated-inputs (list dconf)) (arguments - `(#:imported-modules ((guix build glib-or-gtk-build-system) - ,@%python-build-system-modules) - #:modules ((guix build python-build-system) - ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + `(#:glib-or-gtk? #t + #:imported-modules (,@%meson-build-system-modules + (guix build python-build-system)) + #:modules ((guix build meson-build-system) + ((guix build python-build-system) #:prefix python:) (guix build utils)) #:phases (modify-phases %standard-phases - ;; This setup.py script does not support one of the Python build - ;; system's default flags, "--single-version-externally-managed". - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "python" "setup.py" - ;; This setup.py runs gtk-update-icon-cache which we don't want. - "--no-update-icon-cache" - ;; "--no-compile-schemas" - "install" - (string-append "--prefix=" (assoc-ref outputs "out")) - "--root=/"))) - ;; The tests need to be run after installation. - (delete 'check) - (add-after 'install 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Tests look for installed package - (add-installed-pythonpath inputs outputs) - ;; The tests fail when HOME=/homeless-shelter. - (setenv "HOME" "/tmp") - (invoke "py.test" "-v" "-k" - ;; TODO: Those tests fail, why? - "not test_classify_change_actions"))) + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") (which "true"))))) (add-after 'install 'copy-styles (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((styles "/share/gtksourceview-3.0/styles")) + (let ((styles "/share/gtksourceview-4/styles")) (copy-recursively (string-append (assoc-ref inputs "gtksourceview") styles) (string-append (assoc-ref outputs "out") styles)) #t))) - (add-after 'wrap 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) - (add-after 'wrap 'wrap-typelib + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/meld") - `("GI_TYPELIB_PATH" prefix - ,(search-path-as-string->list (getenv "GI_TYPELIB_PATH")))) - #t)))))) + (wrap-program (search-input-file outputs "bin/meld") + `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") + ,(python:site-packages inputs outputs))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) (home-page "https://meldmerge.org/") (synopsis "Compare files, directories and working copies") (description "Meld is a visual diff and merge tool targeted at -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 04 12:38:06 2023 Received: (at 61592) by debbugs.gnu.org; 4 Mar 2023 17:38:06 +0000 Received: from localhost ([127.0.0.1]:37661 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYVpe-000786-AQ for submit@debbugs.gnu.org; Sat, 04 Mar 2023 12:38:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYVpc-00077d-Ik for 61592@debbugs.gnu.org; Sat, 04 Mar 2023 12:38:04 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pYVpX-0004kE-5T; Sat, 04 Mar 2023 12:37:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=DSna2ImhHs2XY/L58z9lzhJce+gp6n/9KlCw0DnPnhs=; b=p9EhoAZwg7eNORnTNtX8 9EBbLRuEUONyTRwd80yjHi3Xw5qVqpR5L3E5AE2hEq6K+uqUiU7etANGhIMC2br3B5+pUk9rX3cRc RiSDi45Il2c9nv46MTSFnr1viAwPX7LQRfPNSoPD/PvV6NxZ3/IQe5jErtgMtF3pcmREj4ce4hSxZ N6MTtSX3Qaa2au9sIroN0TL6T1/+LElv5YuYpgBjIloLqxxrfJCKX0nXFsd4lxWPXZShcdrKO+y+3 ng9G3gTru4JFGSwW3TMDUt4DxiteKtvL+yX82bMxInZqPcG5ogmciY/921bVTFOCgkBcnyd+/r2bM 6wyDkGZ/YIvqSQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pYVpW-0007ru-JY; Sat, 04 Mar 2023 12:37:58 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Andy Tai Subject: Re: bug#61592: [PATCH] gnu: meld: Update to 3.22.0 References: <20230218021218.10783-1-atai@atai.org> Date: Sat, 04 Mar 2023 18:37:55 +0100 In-Reply-To: (Andy Tai's message of "Wed, 22 Feb 2023 22:37:02 -0800") Message-ID: <87356kqux8.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 61592 Cc: 61592@debbugs.gnu.org, Liliana Marie Prikler , Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Liliana, Andy Tai skribis: > Hi Andy, > > this patch and the following one are the split I intended. > I also fixed up some other issues like the unnecessary gtk+:bin input. > Following standard procedure, I intend to leave this up for a little > over a week to get some proper review by others. LGTM, please push! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 05 17:44:36 2023 Received: (at control) by debbugs.gnu.org; 5 Mar 2023 22:44:36 +0000 Received: from localhost ([127.0.0.1]:40927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYx5o-0000dS-9c for submit@debbugs.gnu.org; Sun, 05 Mar 2023 17:44:36 -0500 Received: from mail-qk1-f175.google.com ([209.85.222.175]:40811) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYx5n-0000dF-4s for control@debbugs.gnu.org; Sun, 05 Mar 2023 17:44:35 -0500 Received: by mail-qk1-f175.google.com with SMTP id g20so2491341qkm.7 for ; Sun, 05 Mar 2023 14:44:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678056269; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=1VUOQ11fCds6H05vfZfMHPng/8prwJSkJWK72wMDeNo=; b=aTq+wfyw6knm/0mhyBQ6v0zy4HTRknbUncS83tWjZjLUXDEGC1AVUOGlE8ULXCuPYt 3a7SmecKgRzXJ1QAD1iiUgtsLmQEhhqOPHSSrbKg5EDyCjBCRg50ntoOAhce8w6fKWHj JzAVJVbqjYMK+8gH8Z7G8jmBAs4aEFeTEiMQqiiIAZgZPJdtE8ks1yJYeM90mEK+kU9H 4I8ukVGtWRIcXVtPjaPtOvdh0csrXCBQhZLWQvHeozm+pA5BxzuX9L1cZTt0w4tgcOiF fzheeRXChuZiLYCOYlJXLLHzLi7zYiqUoPrKoWb1qgUEAw6CHiCfnkqLkjp7j5LHc7IM Gn9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678056269; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=1VUOQ11fCds6H05vfZfMHPng/8prwJSkJWK72wMDeNo=; b=FkcDnvnEASYFplwdZ3sx+PJabus4BqPsyd3yPyB3+x0XaMJNLJp+WTBoCWssgYgj85 X6zHgmTYRMou+HpzGjldnIyEP9kMwI5FUxCPVMc4otYouAJknCo1ZdLWwWDHE9uAdudF kOJYQu7Zi21MeeCvQ0mlYDpB6x8Yt9rHpQzI2LzhdR5d4ukwlxkRdhN5CuBwQf6gib3Q E+Z6iSJV5R+S5DF6tEFC5b55VJ0Wwz9mFAiW/RO96RZoEvsOgjXPH/FpMepsCLz9b0Cc 23iaCHpUXoGkoNi2GfZuWSQuaggwGE+NEqhv6jLFOi49to82PNHY4FTugjxPStadpYK6 kkzA== X-Gm-Message-State: AO0yUKWp8GFqrRltRomotkpwsKMWIPMDkzRMkmV8v1Eh2UpnTbAin2yq x254jXT2idxcHUOPF5ukxjHF3b2tTyIH5ihjGMeRa8J1lC4= X-Google-Smtp-Source: AK7set8SUI8zFJhVZz+bbJglaBqV/v4ydUYwV17DtDZdWxsBgKrIm8TkbztRdWNz8ry+ZO8qw2I4YOG4BtV0W7KOwUM= X-Received: by 2002:a37:e10f:0:b0:742:839d:72e8 with SMTP id c15-20020a37e10f000000b00742839d72e8mr2451054qkm.5.1678056269549; Sun, 05 Mar 2023 14:44:29 -0800 (PST) MIME-Version: 1.0 From: Andy Tai Date: Sun, 5 Mar 2023 14:43:53 -0800 Message-ID: Subject: To: control@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: close 61592 thanks Liliana pushed in the changes Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lichengtai[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.222.175 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.222.175 listed in wl.mailspike.net] 2.0 BLANK_SUBJECT Subject is present but empty X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) close 61592 thanks Liliana pushed in the changes From unknown Wed Jun 18 23:00:01 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 03 Apr 2023 11:24:11 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator