* [bug#66735] [PATCH core-updates 0/2] Update boost.
@ 2023-10-24 19:32 Greg Hogan
2023-10-24 19:33 ` [bug#66735] [PATCH core-updates 1/2] gnu: boost: Update to 1.83.0 Greg Hogan
0 siblings, 1 reply; 4+ messages in thread
From: Greg Hogan @ 2023-10-24 19:32 UTC (permalink / raw)
To: 66735; +Cc: Greg Hogan
Greg Hogan (2):
gnu: boost: Update to 1.83.0.
gnu: python-graph-tool: Update to 2.58.
gnu/local.mk | 1 +
gnu/packages/boost.scm | 31 +++----------------
gnu/packages/graph.scm | 5 +--
.../patches/python-graph-tool-boost-fix.patch | 16 ++++++++++
4 files changed, 25 insertions(+), 28 deletions(-)
create mode 100644 gnu/packages/patches/python-graph-tool-boost-fix.patch
--
2.41.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#66735] [PATCH core-updates 1/2] gnu: boost: Update to 1.83.0.
2023-10-24 19:32 [bug#66735] [PATCH core-updates 0/2] Update boost Greg Hogan
@ 2023-10-24 19:33 ` Greg Hogan
2023-10-24 19:33 ` [bug#66735] [PATCH core-updates 2/2] gnu: python-graph-tool: Update to 2.58 Greg Hogan
2024-01-20 19:18 ` bug#66735: [PATCH core-updates 1/2] gnu: boost: Update to 1.83.0 Maxim Cournoyer
0 siblings, 2 replies; 4+ messages in thread
From: Greg Hogan @ 2023-10-24 19:33 UTC (permalink / raw)
To: 66735; +Cc: Greg Hogan
* 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
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#66735] [PATCH core-updates 2/2] gnu: python-graph-tool: Update to 2.58.
2023-10-24 19:33 ` [bug#66735] [PATCH core-updates 1/2] gnu: boost: Update to 1.83.0 Greg Hogan
@ 2023-10-24 19:33 ` Greg Hogan
2024-01-20 19:18 ` bug#66735: [PATCH core-updates 1/2] gnu: boost: Update to 1.83.0 Maxim Cournoyer
1 sibling, 0 replies; 4+ messages in thread
From: Greg Hogan @ 2023-10-24 19:33 UTC (permalink / raw)
To: 66735; +Cc: Greg Hogan
* 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 <boost/variant/recursive_variant.hpp>
+ #include <boost/variant/get.hpp>
+ #include <boost/spirit/include/support_istream_iterator.hpp>
++#include <boost/regex/v5/unicode_iterator.hpp>
+
+ #include <boost/algorithm/string/replace.hpp>
+
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#66735: [PATCH core-updates 1/2] gnu: boost: Update to 1.83.0.
2023-10-24 19:33 ` [bug#66735] [PATCH core-updates 1/2] gnu: boost: Update to 1.83.0 Greg Hogan
2023-10-24 19:33 ` [bug#66735] [PATCH core-updates 2/2] gnu: python-graph-tool: Update to 2.58 Greg Hogan
@ 2024-01-20 19:18 ` Maxim Cournoyer
1 sibling, 0 replies; 4+ messages in thread
From: Maxim Cournoyer @ 2024-01-20 19:18 UTC (permalink / raw)
To: Greg Hogan; +Cc: 66735-done
Hi,
Greg Hogan <code@greghogan.com> writes:
> * 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.
Applied. The second patch was already applied.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-01-20 19:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-24 19:32 [bug#66735] [PATCH core-updates 0/2] Update boost Greg Hogan
2023-10-24 19:33 ` [bug#66735] [PATCH core-updates 1/2] gnu: boost: Update to 1.83.0 Greg Hogan
2023-10-24 19:33 ` [bug#66735] [PATCH core-updates 2/2] gnu: python-graph-tool: Update to 2.58 Greg Hogan
2024-01-20 19:18 ` bug#66735: [PATCH core-updates 1/2] gnu: boost: Update to 1.83.0 Maxim Cournoyer
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).