From patchwork Sat Feb 18 02:12:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 47090 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 BC24816977; Sat, 18 Feb 2023 02:13:42 +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,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 C6AEE168B2 for ; Sat, 18 Feb 2023 02:13:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pTCir-0000M9-5b; Fri, 17 Feb 2023 21:13:09 -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 1pTCil-0000Ky-1g for guix-patches@gnu.org; Fri, 17 Feb 2023 21:13:05 -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 1pTCik-0005Sm-PU for guix-patches@gnu.org; Fri, 17 Feb 2023 21:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pTCik-00020j-AR for guix-patches@gnu.org; Fri, 17 Feb 2023 21:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61592] [PATCH] gnu: meld: Update to 3.22.0 Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Feb 2023 02:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61592 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61592@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16766863547688 (code B ref -1); Sat, 18 Feb 2023 02:13:02 +0000 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 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 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-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: , 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 * gnu/packages/patchutils.scm (meld): Update to 3.22.0 --- gnu/packages/patchutils.scm | 87 +++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 48 deletions(-) base-commit: c1303a914c172dc80166be22389e7032c5ea5e09 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