From patchwork Tue Oct 24 19:33:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 55336 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 BE5EB170E8; Tue, 24 Oct 2023 20:34:47 +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 C457316F2C for ; Tue, 24 Oct 2023 20:34:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvNAk-0003U0-KN; Tue, 24 Oct 2023 15:34: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 1qvNAe-0003Rd-Hl for guix-patches@gnu.org; Tue, 24 Oct 2023 15:34:32 -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 1qvNAd-0004CJ-Vq for guix-patches@gnu.org; Tue, 24 Oct 2023 15:34:32 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvNB7-0004kM-M9 for guix-patches@gnu.org; Tue, 24 Oct 2023 15:35:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66735] [PATCH core-updates 1/2] gnu: boost: Update to 1.83.0. References: <20231024193253.248783-1-code@greghogan.com> In-Reply-To: <20231024193253.248783-1-code@greghogan.com> Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 19:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66735 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66735@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 66735-submit@debbugs.gnu.org id=B66735.169817608518212 (code B ref 66735); Tue, 24 Oct 2023 19:35:01 +0000 Received: (at 66735) by debbugs.gnu.org; 24 Oct 2023 19:34:45 +0000 Received: from localhost ([127.0.0.1]:56676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvNAq-0004jf-RD for submit@debbugs.gnu.org; Tue, 24 Oct 2023 15:34:45 -0400 Received: from mail-qv1-xf33.google.com ([2607:f8b0:4864:20::f33]:57843) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvNAo-0004jL-U9 for 66735@debbugs.gnu.org; Tue, 24 Oct 2023 15:34:43 -0400 Received: by mail-qv1-xf33.google.com with SMTP id 6a1803df08f44-66d1ef93284so29679606d6.3 for <66735@debbugs.gnu.org>; Tue, 24 Oct 2023 12:34:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1698176047; x=1698780847; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Scp0UCKKjXFnJSGeT4WBM4KRczEE9OXB4dpZvS0TCFA=; b=UHR1qSe+Sr5vuxoS1RAzDT7LxMfwYqwUFygNIz59RTUWx1K+xng0PoRBj+EyZjWHMY iTDCLxkc4YI9OQZpBmXAS1CZBiF9RNLl6+LMNAznQsWROMExSg7g+xRrs9NSaU918/8Z QfNL5lGlAoSBlZbDrMgtFKozrldyAgMHH1g+Ke8r2482IluvLZ/XCoTXBkvicbtSyFJf WdvJMktM8aXZ7aN9j/eWlQqc44f5FvMOqlg5X2Wz3hsz+1taGB3plvXlCe1IGX3YmAsv VWP1aNA8tRDkZnVYwE2wz/zBi4xe+nA4mOjZCbmOYVQB0UuMTxPaGDJekzvPkpjn0NdV QKHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698176047; x=1698780847; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Scp0UCKKjXFnJSGeT4WBM4KRczEE9OXB4dpZvS0TCFA=; b=Fzq8KXotgTSuUqmN6344FrHWfhyuHQiPXxWgp88WhUusH5LgclAIngEh9PGXh0n46c QclMKCitfiqr0zwFMAekA5BSSlcpfvBy+oQ+vCdt4XbD6DRWdWqTUa9VOr4WXxzmteVV +m5y/59Jzk5YCIUSGFy4ujoZM7tHz5I+BafSMsI+x4MW2dTQiKJCQJ0hZd8EWwsZ4Yy2 fhWokI48PzkFkwiXpC3vjfme4x6zivVda62gXAuADJI/1fSoAk02w711qQLlW4pvIaqt kNRk93ZtpSJOOVdMkTNYRMSNqrij8a+JOKGc7h4+JVcGaOLA2KzklATwbBTiUcl2LYod 33lA== X-Gm-Message-State: AOJu0YzGRnpZNYDRt9UtXSjlAJzOAs7a7huH4xpXIQHRm2s514aigRye p+0wBoT7AOOxG67M9hvzrS6u5LinhjR67EdYzZM= X-Google-Smtp-Source: AGHT+IE5J4sVAIKHIvKbSmhydSqKSCSV4oZiqSBZHLXlSHtqzR40KU/nGX/DHf80t0TB58H07ljrqg== X-Received: by 2002:a05:6214:21ab:b0:66d:a40:13a7 with SMTP id t11-20020a05621421ab00b0066d0a4013a7mr13623947qvc.47.1698176047397; Tue, 24 Oct 2023 12:34:07 -0700 (PDT) Received: from ip-172-31-19-221.us-east-2.compute.internal (ec2-18-223-188-34.us-east-2.compute.amazonaws.com. [18.223.188.34]) by smtp.gmail.com with ESMTPSA id qh17-20020a0562144c1100b0064c1b27bf2dsm3785387qvb.140.2023.10.24.12.34.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 12:34:07 -0700 (PDT) From: Greg Hogan Date: Tue, 24 Oct 2023 19:33:54 +0000 Message-ID: <20231024193404.249783-1-code@greghogan.com> X-Mailer: git-send-email 2.41.0 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/boost.scm (boost): Update to 1.83.0. [source](patches): Add new and remove old upstream patches. (patch-flags): Strip prefix to match source directory structure. --- gnu/packages/boost.scm | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 98dccf7f16..27ec6d9e32 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -66,7 +66,7 @@ (define (boost-patch name version hash) (define-public boost (package (name "boost") - (version "1.80.0") + (version "1.83.0") (source (origin (method url-fetch) (uri (string-append "https://boostorg.jfrog.io/artifactory/main/release/" @@ -74,33 +74,12 @@ (define-public boost (version-with-underscores version) ".tar.bz2")) (patches (list (boost-patch - ;; Boost.Filesystem directory iterators may fail to - ;; construct for a network share on Windows prior to 10: - ;; https://github.com/boostorg/filesystem/pull/246, - ;; https://github.com/boostorg/filesystem/issues/245 - "0001-filesystem-win-fix-dir-it-net-share.patch" version - "067hhylqkzzdbqzc1hkbpaqmvz248lxqrdhb2yi6iq9qabsik3lk") - (boost-patch - ;; In Boost.Filesystem on Windows, weakly_canonical fails - ;; to process paths that start with the "\\?\" prefix: - ;; https://github.com/boostorg/filesystem/issues/247 - "0002-filesystem-fix-weakly-canonical-long-paths.patch" version - "00w3albf8527glclx85p5b2ml3vr06xpwwmfyzg005v1cp8avcpi") - (boost-patch - ;; Boost.Unordered containers are not in a valid state - ;; after moving: - ;; https://github.com/boostorg/unordered/issues/139 - "0003-unordered-valid-after-move.patch" version - "0dw839w22cawqawfpsx7j7v9y0x2vn66m732iidpxvdxbjn2kzva") - (boost-patch - ;; Fixed a missing include on POSIX systems that don't - ;; support *at APIs: - ;; https://github.com/boostorg/filesystem/issues/250 - "0004-filesystem-posix-fix-no-at-apis-missing-include.patch" version - "09k8k3b1306jkjls12wfghj820n828j6aaxzmcr0wpnjhp8fzi1v"))) + "0001-unordered-fix-copy-assign.patch" version + "09j61m5xh7099k5na9i43x5rra51znf7vm2nyh89yqpizcll9q66"))) + (patch-flags '("-p2")) (sha256 (base32 - "1h00qp4z5k6lfz310xjwsmqs8fwxi6ngas51169cafz4h9fmc68y")))) + "13iviiwk1srpw9dmiwabkxv56v0pl0zggjp8zxy1419k5zzfsy34")))) (build-system gnu-build-system) (inputs (append From patchwork Tue Oct 24 19:33:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 55337 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 501B316FFB; Tue, 24 Oct 2023 20:34:59 +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=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 8722F16985 for ; Tue, 24 Oct 2023 20:34:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvNAn-0003UC-QA; Tue, 24 Oct 2023 15:34:41 -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 1qvNAe-0003Rh-Mi for guix-patches@gnu.org; Tue, 24 Oct 2023 15:34:32 -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 1qvNAe-0004CK-EU for guix-patches@gnu.org; Tue, 24 Oct 2023 15:34:32 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvNB8-0004kT-2C for guix-patches@gnu.org; Tue, 24 Oct 2023 15:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66735] [PATCH core-updates 2/2] gnu: python-graph-tool: Update to 2.58. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 19:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66735 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66735@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 66735-submit@debbugs.gnu.org id=B66735.169817608518219 (code B ref 66735); Tue, 24 Oct 2023 19:35:02 +0000 Received: (at 66735) by debbugs.gnu.org; 24 Oct 2023 19:34:45 +0000 Received: from localhost ([127.0.0.1]:56678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvNAr-0004jh-71 for submit@debbugs.gnu.org; Tue, 24 Oct 2023 15:34:45 -0400 Received: from mail-qv1-xf2f.google.com ([2607:f8b0:4864:20::f2f]:57458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvNAp-0004jN-Fh for 66735@debbugs.gnu.org; Tue, 24 Oct 2023 15:34:44 -0400 Received: by mail-qv1-xf2f.google.com with SMTP id 6a1803df08f44-66cfd874520so29747306d6.2 for <66735@debbugs.gnu.org>; Tue, 24 Oct 2023 12:34:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1698176048; x=1698780848; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4HPjB5CEFJrEdUg5LHeIXIhIU49cp2Fd4PxBQUDV1cw=; b=vwcORcKqm4lD3XkPmMNulp1bJ9m71mKTZVKETpCcYd56vbTI4IaioN0L/Pl7DjUAtp 6PGJnqt5dMZZihdu7KU2OhGOwUT7FsDs0kUI5Z2rfnA4vS78EIlqIhaSgaujaLvaerov FIvNwPxb9DZtX/4o4ASQOzo5Z9ggavFArRP1giadHfAxyERSjEX4PBSOlDt7zuCA1tzT gyJeldApTQ8Qt+c0/I3pF0mDd2WzHUS4wpCJ5+05LKBe36oxREW0oeXDzpzd39nFS9KK YCuo0fbMkl1ppZ/YHMTw/fC8vXLOGRRG9AB2egfoX6PSb8NYYI4HNEJ6z3IC+SJTunnW 66yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698176048; x=1698780848; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4HPjB5CEFJrEdUg5LHeIXIhIU49cp2Fd4PxBQUDV1cw=; b=sKgyrPGcWJPm5PiHTBFeiv683DHOLyLiCWFkuQLBReAqijYcqGbQna3H1w5C9mjs7/ RIZHoCgCaulZmSTvOALnzTjbOSy7y42zt8bVXHrp3Aik5FinR+oHGLVApJaiCQi+HMH+ g6dwvuf/uCQ/T9x3e2tztv0jmVWNI4MBTB5iS5oJKqqwgi1A975ZAM/a+NDXJCI0K/83 h+OQD7bsbKNn4JeeEF+5nyQ0cmvs3VZ/wx9OuIkeRAXxF5YpsGGcljmqv/AIRdGngs6/ EHJ7LkhByZ8LGsfTw+3/sx60tTZZYj+eOOwAZrOOIaDamDxDUXZMUJd9JhTgdpIEdTkr ro4w== X-Gm-Message-State: AOJu0YwyOaYL1ik5CJiCEavviqbuLY7OQhNp1wh+1Vx6Y2RiXXfvjrOf IkD2gaS8EVmfMp49nwbIgnc4a5qf6vVCRSM7saU= X-Google-Smtp-Source: AGHT+IHsJB5pifHp1L+sMZmgqhEHOSEQYTB5FfeKmNdefLTXM8+ifXPU5lGmznBnFZpa5q//WooSFA== X-Received: by 2002:ad4:5966:0:b0:66d:1927:4e6b with SMTP id eq6-20020ad45966000000b0066d19274e6bmr15110285qvb.56.1698176047965; Tue, 24 Oct 2023 12:34:07 -0700 (PDT) Received: from ip-172-31-19-221.us-east-2.compute.internal (ec2-18-223-188-34.us-east-2.compute.amazonaws.com. [18.223.188.34]) by smtp.gmail.com with ESMTPSA id qh17-20020a0562144c1100b0064c1b27bf2dsm3785387qvb.140.2023.10.24.12.34.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 12:34:07 -0700 (PDT) From: Greg Hogan Date: Tue, 24 Oct 2023 19:33:55 +0000 Message-ID: <20231024193404.249783-2-code@greghogan.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231024193404.249783-1-code@greghogan.com> References: <20231024193404.249783-1-code@greghogan.com> 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/graph.scm (python-graph-tool): Update to 2.58. [source](patches): Fix for Boost 1.83 compatibility. * gnu/packages/patches/python-graph-tool-boost-fix.patch: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/graph.scm | 5 +++-- .../patches/python-graph-tool-boost-fix.patch | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/python-graph-tool-boost-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index b4d588fdc6..ae8af63557 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1752,6 +1752,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-chai-drop-python2.patch \ %D%/packages/patches/python-docrepr-fix-tests.patch \ %D%/packages/patches/python-feedparser-missing-import.patch \ + %D%/packages/patches/python-graph-tool-boost-fix.patch \ %D%/packages/patches/python-louvain-fix-test.patch \ %D%/packages/patches/python-random2-getrandbits-test.patch \ %D%/packages/patches/python-poppler-qt5-fix-build.patch \ diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 881033047d..9ba5f5bc53 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -631,15 +631,16 @@ (define-public mscgen (define-public python-graph-tool (package (name "python-graph-tool") - (version "2.57") + (version "2.58") (source (origin (method url-fetch) (uri (string-append "https://downloads.skewed.de/graph-tool/graph-tool-" version ".tar.bz2")) + (patches (search-patches "python-graph-tool-boost-fix.patch")) (sha256 (base32 - "0wmvzx509lvigja6cfxh45r4b7wns64vmik0x4rz4y4fnxrhw2m2")))) + "05vsk2600wn790hk7gr2f0609bzcslyhhv9x157n43vxy4y6r8vj")))) (build-system gnu-build-system) (arguments `(#:imported-modules (,@%gnu-build-system-modules diff --git a/gnu/packages/patches/python-graph-tool-boost-fix.patch b/gnu/packages/patches/python-graph-tool-boost-fix.patch new file mode 100644 index 0000000000..19ece783ee --- /dev/null +++ b/gnu/packages/patches/python-graph-tool-boost-fix.patch @@ -0,0 +1,16 @@ +https://git.skewed.de/count0/graph-tool/-/commit/0a837b40538df619f43706d50efe0c7afde755a9.diff + +Scheduled for inclusion in next release after version 2.58. + +diff --git a/src/graph/gml.hh b/src/graph/gml.hh +index 7bea0ca362305a1eba7bfba69813064363809ea0..62027809dab5885f47da3a01fbf3fcf057b8e02e 100644 +--- a/src/graph/gml.hh ++++ b/src/graph/gml.hh +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #include +