From patchwork Thu Apr 3 08:18:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 41214 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 2EE4E27BBE9; Thu, 3 Apr 2025 09:19:50 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 E9ED127BBE2 for ; Thu, 3 Apr 2025 09:19:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u0FnL-0004Jc-5P; Thu, 03 Apr 2025 04:19:28 -0400 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 1u0Fmy-0004IT-4n for guix-patches@gnu.org; Thu, 03 Apr 2025 04:19:10 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0Fmw-0002ym-Rp for guix-patches@gnu.org; Thu, 03 Apr 2025 04:19:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=bLCZUBNM9hADDsMkw9IqOD10yCKsYgnwgxG3D88z4iY=; b=FvuupGFHaLDme5nmECLKSOSDlg+wtEqXX2TmLslOtWQtDzVQ8q+ftxEOzw17KUg4yCj0d50iiR8Xp4bUXpE76hz972+EYk0uxzJODtzMo3rBmyCx+TPe3pRdSlRhWaclfFAASpj0nG349WUjHILgZAL3IMnSxpYjFNpI6lr9GBnFfHO1GgIB7/gQl3/73PW8rFibiAYbReXg8D2m36JN4vBKnyXnA7oVYqfeY9ge5EtzgR1i19x6TI4s+Ly3ylRccHiD+qneovuJ46B6eLAS+MX5kHBEgnaHbwVkZFqUN0kJnEhp9KyIRsh2x1XRBqrfZLsApcdCjXVMoBjM3CGKMw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u0Fmw-0006dE-F9 for guix-patches@gnu.org; Thu, 03 Apr 2025 04:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77482] [PATCH] gnu: meld: Update to 3.23.0. Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Apr 2025 08:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77482 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77482@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174366832125459 (code B ref -1); Thu, 03 Apr 2025 08:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Apr 2025 08:18:41 +0000 Received: from localhost ([127.0.0.1]:60921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u0Fmb-0006cZ-Bl for submit@debbugs.gnu.org; Thu, 03 Apr 2025 04:18:41 -0400 Received: from lists.gnu.org ([2001:470:142::17]:33174) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u0FmX-0006cF-O8 for submit@debbugs.gnu.org; Thu, 03 Apr 2025 04:18:38 -0400 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 1u0FmR-0003le-A6 for guix-patches@gnu.org; Thu, 03 Apr 2025 04:18:31 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0FmO-0002ub-Uv for guix-patches@gnu.org; Thu, 03 Apr 2025 04:18:31 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-7394945d37eso508730b3a.3 for ; Thu, 03 Apr 2025 01:18:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743668305; x=1744273105; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=bLCZUBNM9hADDsMkw9IqOD10yCKsYgnwgxG3D88z4iY=; b=LcKpqCFIvmnSTfTkx1KKH2NY9XhQ4dGHENRUA8DqSGSpG01zRP0dZlFIZDOwCd6QHE XbPc9IiQgsyx0P7RM2jTpCXH0YF3s71Ri0+DeqvclrSMNL2FQbkZYRMQKJGl5ANwBzrE iWj8sCabsCFINdx+eFCBR0p1QGpftxYN0FtwcKQLYl3XL29w7Y1XSrXSnxsRoiNFLlNH mdxVZbsfj7a0zvgWdcLDK8ulIP7g8UiJ8SY8IQZwEUDDrTstmjxO5uawZhxqSh+Tdv3N jb4M+YVDQT7g5ceKZk2ZodwbhRHGcANSrJzWYUXVghOh3ONhBYh5BdaQSg7b5cR5K0m5 484Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743668305; x=1744273105; 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=bLCZUBNM9hADDsMkw9IqOD10yCKsYgnwgxG3D88z4iY=; b=gP/ycQihv2r4SpvHiAogipxjmOZMNI/b4gbjdMUhHf1AY7MIadtCLLAEqZ7AZGWFhQ RYKU88w0wfu1Hh/LEvDf6bgCqd8+ZOdHqeVv8QTph9JyZxNwuZdjsbsZ0UuoTPsYZEsA 2HCwc/DlXelBqmxNsJQSQgeoapt2KKCTH/rwwz6invaTo2D04vtWs16DllGNieSm/+Fc OcqJBuQbo/CzKhhsPyMGq2vU3qWXf9k8raUA0pHoTNtTJ7/lS6eIXF6qYLK6IZqz6OCF TOzhjqrzGSkY+aqlyu4slKO8zUdwM6PRFGq7wQDvgPz+G2LLIErozURslhwmL6TibUhx EPfg== X-Gm-Message-State: AOJu0YxkuVgiv/Jikr1jSF39iNlNacORID44khESWLx/qY/AMCNoihaG qaI8ramVELQc2p8fIzHMIHmOikU36FoZb2nnwuT8eh1iyioruYI7z5FYANd6+60= X-Gm-Gg: ASbGncuaoOeQzB82bnmz4o+zJDNob7p5H1Zk1jpjRX3GiKDJxW0hoL7BS5AUHC6jMnq VpIopFjsVI3KHkO+5vjd9Ov/Gde+sWLdeiJ5V95zq/ckxRaVTBtgAVzNDJUagJWUoqbWb5pl5/A kuKPDfysU0XnP5rV7g5miIpzXJfdp12QgjYaCIQcltpSv2oRubqRKmUwNpMNdjMmR6OlWa9FWVa mhtJSMn25ZXUMR6uK1cTZpiGYf7IEn2Nw757XxM5NF4/LpaH1UJLzpTm1n9ZDlydczFqMPiIgEh fmCHia791+nxqA07iGGwar7YSPA20JASuG3OM3BcfrF+ttYenfxGrb9fAOpOQw== X-Google-Smtp-Source: AGHT+IEJcag0yhWn7HtDy5cdBO4NWD3oIPMMn3IpnCej1KuU0lrEOg/rcKPPQkR8QpKPM0DOUHoVbg== X-Received: by 2002:a05:6a21:8cc2:b0:1f1:432:f4a3 with SMTP id adf61e73a8af0-200f7321179mr3060069637.23.1743668305064; Thu, 03 Apr 2025 01:18:25 -0700 (PDT) Received: from DEskMiniX300.taila8caa5.ts.net ([172.98.218.160]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af9bc41a65asm681408a12.69.2025.04.03.01.18.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Apr 2025 01:18:24 -0700 (PDT) From: Andy Tai Date: Thu, 3 Apr 2025 01:18:20 -0700 Message-ID: <6e8efdbe29418f262250f95503a50e8548d82f9b.1743668213.git.atai@atai.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=lichengtai@gmail.com; helo=mail-pf1-x42d.google.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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.23.0. [native-inputs]: Add gtk+ "bin". [arguments] <#:phases>: Delete phase 'skip-gtk-update-icon-cache. Change-Id: I65c5db4704784a825d87b8029608ead4b22fcf35 --- gnu/packages/patchutils.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) base-commit: 111aacf22fdc0314f41b737106ad70c1899a58e7 prerequisite-patch-id: a6177f57670ba1e9d303257e10aa60b1fde1bd21 diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 3cd3507b07f..da1364cbb57 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -301,7 +301,7 @@ (define-public vbindiff (define-public meld (package (name "meld") - (version "3.22.3") + (version "3.23.0") (source (origin (method url-fetch) @@ -309,10 +309,11 @@ (define-public meld (version-major+minor version) "/meld-" version ".tar.xz")) (sha256 - (base32 "114x97rcm4qr91nzw66hys4i1pjnqn1m9388id6yq3zzn6gg5xrp")))) + (base32 "19n273shqs8l5lrlic0hr5iv1mp9223ijf3pkh8a49g08112lg4q")))) (build-system meson-build-system) (native-inputs (list desktop-file-utils + (list gtk+ "bin") ;for gtk-update-icon-cache intltool itstool libxml2 @@ -339,11 +340,6 @@ (define-public meld (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"))