From patchwork Thu Feb 23 06:37:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 47276 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 4D85916BFB; Fri, 24 Feb 2023 17:42:23 +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=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CE48E16BF1 for ; Fri, 24 Feb 2023 17:42:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVc57-0000Uy-1V; Fri, 24 Feb 2023 12:42: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 1pVc55-0000Ua-I9 for guix-patches@gnu.org; Fri, 24 Feb 2023 12:42: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 1pVc54-0000sM-VC for guix-patches@gnu.org; Fri, 24 Feb 2023 12:42:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVc54-0004y3-RT for guix-patches@gnu.org; Fri, 24 Feb 2023 12:42:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61592] [PATCH v3 1/2] gnu: meld: Update to 3.22.0 References: <20230218021218.10783-1-atai@atai.org> In-Reply-To: <20230218021218.10783-1-atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Feb 2023 17:42: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: 61592@debbugs.gnu.org Cc: Andy Tai Received: via spool by 61592-submit@debbugs.gnu.org id=B61592.167726049719047 (code B ref 61592); Fri, 24 Feb 2023 17:42:02 +0000 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 MIME-Version: 1.0 Message-ID: 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 [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