From patchwork Tue Jun 13 05:01:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 13872 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 6F81227BBEA; Tue, 13 Jun 2023 06:02:30 +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 A186427BBE2 for ; Tue, 13 Jun 2023 06:02:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8wAa-00027W-M3; Tue, 13 Jun 2023 01:02:16 -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 1q8wAW-000270-27 for guix-patches@gnu.org; Tue, 13 Jun 2023 01:02:12 -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 1q8wAM-0004gX-O5 for guix-patches@gnu.org; Tue, 13 Jun 2023 01:02:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q8wAM-0005Lp-02 for guix-patches@gnu.org; Tue, 13 Jun 2023 01:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64012] [PATCH v3] 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: Tue, 13 Jun 2023 05:02:01 +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, liliana.prikler@gmail.com Cc: Andy Tai Received: via spool by 64012-submit@debbugs.gnu.org id=B64012.168663247820513 (code B ref 64012); Tue, 13 Jun 2023 05:02:01 +0000 Received: (at 64012) by debbugs.gnu.org; 13 Jun 2023 05:01:18 +0000 Received: from localhost ([127.0.0.1]:41140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8w9c-0005Kl-7y for submit@debbugs.gnu.org; Tue, 13 Jun 2023 01:01:18 -0400 Received: from mail-ot1-f46.google.com ([209.85.210.46]:57778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8w9X-0005KS-BV for 64012@debbugs.gnu.org; Tue, 13 Jun 2023 01:01:15 -0400 Received: by mail-ot1-f46.google.com with SMTP id 46e09a7af769-6b280319df5so3387308a34.3 for <64012@debbugs.gnu.org>; Mon, 12 Jun 2023 22:01:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686632465; x=1689224465; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=+QsZC0iKt05kJ/q9fHvh6we/q6ZdjMeZCmFsHetA4Jc=; b=FIysk/7I0wZEtfYi42mIcRCrxhdxQLk5BU35y5X0gnqy85ByEu5N2BiT0FRIrCG6do gldG11OqyGsbthtxTxOkEVpPLYISR0JaIEYt0a/OSxog6bspreH86kcPdseX8DTypixD LYuvEdNXSFiqpVQN875o5IsyHToQqiQS+l/yOZ0TvaAEymq1FJsrMrQ3SjxntnhHCtZd Dcme7SRf1tcjdapOrMAHs8nJVHzYTYYDlVuUYhxjbA4DD+m4MnvA0xOsisGi9ha9zbWL tQxfAtL71PMgPwitBVseSuZjHN9fiVZl6Sz0WVqgmyTiCyH5vv46eln0hJNMK2GIClQ7 RQMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686632465; x=1689224465; 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=+QsZC0iKt05kJ/q9fHvh6we/q6ZdjMeZCmFsHetA4Jc=; b=MEmv/RgdDlgErHlJbZ/wgC1vVxzsFBC0RchXiT32fzIQtPswUJimB8o8awJ6RXJanG 3nlVT8c+6nw5pjDspuIKe9CzvIJzV/jZ1D8ak4PXvN+Zo0WfCYbkE7F799fZr7G5N6VH RU+DRazhrpZTfM48YPP0pWUnwKGSjDM05SVHwueuofLIQECy4wnEIvYIdr3w/J99ZNsI Dh2zFodMHSPk7a1bpt3K8J+XlF1JN1jo56aw6IZopNekrH1/gsRTXTZ3AsB2HUbZhQ7i B5EWJ2ktewNGsevvu/nD4yOy4uylQGaz51uAKfewgT4Ubbewqvqdsp9+2AYBqX249VEz ljzQ== X-Gm-Message-State: AC+VfDwmLTxol4hA4ZcSFYbSHKtx3gHMoByVwyT9Ar9YNrTarqNntb8C 9gawoFcM9+9uTPYOs9PfuI5TUCIMZvI= X-Google-Smtp-Source: ACHHUZ48k+ov3gYEiPhvo1wC1IJ1UlhMvc/uO6zfDQ7LW8T7A8/osIGEZ52GGiGdj7G+tpAB9eT2TA== X-Received: by 2002:a05:6359:639f:b0:123:26fe:3346 with SMTP id sg31-20020a056359639f00b0012326fe3346mr5701219rwb.2.1686632464729; Mon, 12 Jun 2023 22:01:04 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id q23-20020a62ae17000000b0065007825f51sm3332025pff.79.2023.06.12.22.01.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 22:01:04 -0700 (PDT) From: Andy Tai Date: Mon, 12 Jun 2023 22:01:00 -0700 Message-Id: <536cd0b0eb1ac6f618f1b03ea722432e267b7bbd.1686632370.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 (python-libxml2-next): Version 2.11.4 as new variable * gnu/packages/glib.scm (itstool) [inputs]: Switch to libxml2-next and python-libxml2-next --- gnu/packages/glib.scm | 5 +++- gnu/packages/xml.scm | 64 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) base-commit: 6fe9a004dba2d4ddf69ff6f1714af15ffaa7e62a diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index e988e8dc87..40dbd8f951 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -674,7 +674,10 @@ (define itstool "1jl7gsr7aclb9nvqazr039m86y7f7ivfhl2pixcrbfqjkb97r6kb")))) (build-system gnu-build-system) (inputs - (list libxml2 python-libxml2 python)) + (list libxml2-next python-libxml2-next python)) + ;; libxml2-next contains upstream fix for crash on UTF-8 data + ;; https://gitlab.gnome.org/GNOME/libxml2/-/commit/76c6da420923f2721a2e16adfcef8707a2454a1b + ;; so we change dependency to the new libxml2 version (arguments (list #:phases diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 8d9974b825..74976f7402 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") @@ -278,6 +300,48 @@ (define-public python-libxml2 (inputs (list libxml2)) (synopsis "Python bindings for the libxml2 library"))) +(define-public python-libxml2-next + (package/inherit python-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 pkg-config + autoconf-wrapper + automake + libtool + perl + python-minimal-wrapper)) + ;; needed to generate setup.py + + (arguments (list + ;; XXX: Tests are specified in 'Makefile.am', but not in 'setup.py'. + #:tests? #f + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'set-env + (lambda _ + (setenv "CONFIG_SHELL" + (which "sh")) #t)) + (add-before 'build 'configure + (lambda* (#:key inputs #:allow-other-keys) + (invoke "sh" "autogen.sh") + (chdir "python") + (let ((libxml2-headers (search-input-directory + inputs + "include/libxml2"))) + (substitute* "setup.py" + ;; The build system ignores C_INCLUDE_PATH & co, so + ;; provide the absolute directory name. + (("/opt/include") + (dirname libxml2-headers))))))))) + (inputs (list libxml2-next)))) + (define-public libxlsxwriter (package (name "libxlsxwriter")