From patchwork Wed Jun 14 06:04:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 50884 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 5F3D827BBE9; Wed, 14 Jun 2023 07:05:39 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 A918D27BBE2 for ; Wed, 14 Jun 2023 07:05:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q9Jd2-00060O-II; Wed, 14 Jun 2023 02:05:12 -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 1q9Jcs-0005rZ-TR for guix-patches@gnu.org; Wed, 14 Jun 2023 02:05:05 -0400 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 1q9Jcs-0004mU-F6 for guix-patches@gnu.org; Wed, 14 Jun 2023 02:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q9Jcs-00041V-9M for guix-patches@gnu.org; Wed, 14 Jun 2023 02:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64012] [PATCH v4 1/3] gnu: libxml2: Add version 2.11.4 References: <6996b9b078528ad04b159a83f29ecd8adf7f79c4.1686556929.git.atai@atai.org> In-Reply-To: <6996b9b078528ad04b159a83f29ecd8adf7f79c4.1686556929.git.atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Jun 2023 06:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64012 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64012@debbugs.gnu.org Cc: Andy Tai Received: via spool by 64012-submit@debbugs.gnu.org id=B64012.168672266515373 (code B ref 64012); Wed, 14 Jun 2023 06:05:02 +0000 Received: (at 64012) by debbugs.gnu.org; 14 Jun 2023 06:04:25 +0000 Received: from localhost ([127.0.0.1]:43488 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9JcG-0003zn-TU for submit@debbugs.gnu.org; Wed, 14 Jun 2023 02:04:25 -0400 Received: from mail-pl1-f173.google.com ([209.85.214.173]:61746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9JcE-0003zU-79 for 64012@debbugs.gnu.org; Wed, 14 Jun 2023 02:04:23 -0400 Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1b3a6fc8067so25419765ad.3 for <64012@debbugs.gnu.org>; Tue, 13 Jun 2023 23:04:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686722655; x=1689314655; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=SQZTQS36aLrkssf3Scmj7nO3cx8DB1huRY607yRV5xg=; b=gPyf1fUbx5/4vH81PTed+iJjNT0xV+ds94ostnYuwuA96BkBqqQxOXp4wCRfgyky/l v75s9TjO4ok8w6w9QWs5Yq4rW8VWH8suyR0HuZYzT7PYhE5Kj83uQOOo/hdL12JDOiBI N4aJKnCRlpjIU61A6AeEpyDmN8b3GQ7zRE1HU1o6n4fDmmxO8pBVb4BrRAwVk/DGb+jF tUQgjxXjhZhv+1g6iqu53RvE0Ky7/JLAL4ScLUN8qT4yoU2ZKC8WQcwzApOxhgVvFhQj Rx+ME4+6HQWNYlrcuD1iP1UIZi51+YDp34a819qgkxsIMUf/jFRYrLvjYWuXAUu0NQFM GmZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686722655; x=1689314655; 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=SQZTQS36aLrkssf3Scmj7nO3cx8DB1huRY607yRV5xg=; b=Ebpsqx60X3rS2SpQ4V7BlQqLp1U4+PqF2H7dcsdShtHi953PhewGyRBPx196OMy5ip eHzp5T/0Hcq49C1+C0Pb1TrU4Bxzc09oq4YoeKFrkIpeSSUSFOUorn5BekkDuFtORDYX exrG6ribWYZ+a5q49VS+cAaoudSxX3Xb9XU5Ye3/vxqHmnjD1aos6UFeAEQ/Ueholl7i ooKHeyZvQpGo8H3zRSNExr52xuE8OwjH4Sy3PVmVVuwmUvg97E724GY9RYJh9PBkY1Fh 0Cx1vWbIzjbtGEZa1jZLFrvJkLXwxB2NS5cIUGVhAKLRTALrFpMvFbfq+qjQPlfvJ2Dk XKuA== X-Gm-Message-State: AC+VfDwixT44usmycQGPza7tzgb5ItZfnPbjg4wJX7xw+6LHDe9V9MIM yBsalsrAeFBYqS8t+7s+a3nsPnyNGLg= X-Google-Smtp-Source: ACHHUZ7wXhkPjzKLnDDUC1qdsHhLJcfFa/+OJkr4HJFzP+jwiRHfHAAX9e7akV6FzmW9YCUcLUBnSA== X-Received: by 2002:a17:902:6bc3:b0:1b1:9272:55f3 with SMTP id m3-20020a1709026bc300b001b1927255f3mr9331707plt.66.1686722655326; Tue, 13 Jun 2023 23:04:15 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id jd13-20020a170903260d00b001b3c33e575fsm5789245plb.95.2023.06.13.23.04.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jun 2023 23:04:14 -0700 (PDT) From: Andy Tai Date: Tue, 13 Jun 2023 23:04:09 -0700 Message-Id: <3afe9802dd9c7006c4164c28169feb983c43be42.1686722470.git.atai@atai.org> X-Mailer: git-send-email 2.40.1 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: 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/xml.scm (libxml2-next): Version 2.11.4 as new variable --- gnu/packages/xml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) base-commit: 6fe9a004dba2d4ddf69ff6f1714af15ffaa7e62a diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 8d9974b825..eaaa93fe14 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -191,6 +191,9 @@ (define-public libxml2 (sha256 (base32 "1vnzk33wfms348lgz9pvkq9li7jm44pvm73lbr3w1khwgljlmmv0")))) + ;; TODO: remove once migrated to libxml2-next as upstream has + ;; proper fix in libxml2 2.11.4 + ;; defined as libxml2-next below for now (build-system gnu-build-system) (outputs '("out" "static" "doc")) (arguments @@ -249,6 +252,25 @@ (define-public libxml2-xpath0 provides an @code{--xpath0} option to @command{xmllint} that enables it to output XPath results with a null delimiter."))) + +;; libxml2-next contains upstream fix for itstool crash on UTF-8 data +;; https://gitlab.gnome.org/GNOME/libxml2/-/commit/76c6da420923f2721a2e16adfcef8707a2454a1b +;; so we need to being in the new libxml2 version +;; for itstool to depend on to avoid crash +(define-public libxml2-next + (package/inherit libxml2 + (version "2.11.4") + (source (origin + (method url-fetch) + (uri (string-append + "https://download.gnome.org/sources/libxml2/" + (version-major+minor version) "/libxml2-" version + ".tar.xz")) + (sha256 (base32 + "1xspgyswllk26g7jg95pnkfk1gqpzna28fm1kir3kwdki9ziszkk")))) + (native-inputs (list perl python-minimal-wrapper pkg-config)))) + + (define-public python-libxml2 (package/inherit libxml2 (name "python-libxml2")