From 8a20f58420ff62cf2e9daeaf88d8ec1dfecb81b4 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Thu, 11 Jul 2024 15:18:51 -0400
Subject: gnu: Boost: Fix a bug that breaks libetonyek.

This fixes <https://issues.guix.gnu.org/72040>.

* gnu/packages/patches/boost-fix-duplicate-definitions-bug.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/boost.scm (boost)[source]: Use it.
(boost-for-source-highlight): New variable, not using the patch.
* gnu/packages/pretty-print.scm (source-highlight)[inputs]: Replace BOOST with
BOOST-FOR-SOURCE-HIGHLIGHT.

Change-Id: I5fbc9eb5000aefd7d3a14cc7a0482741032b5400
---
 gnu/packages/boost.scm | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/boost.scm')

diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index 70774617f08..2fdea808967 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -74,9 +74,11 @@
                                   version "/source/boost_"
                                   (version-with-underscores version) ".tar.bz2"))
               (patches
-               (list (boost-patch
-                      "0001-unordered-fix-copy-assign.patch" version
-                      "09j61m5xh7099k5na9i43x5rra51znf7vm2nyh89yqpizcll9q66")))
+                (append
+                 (search-patches "boost-fix-duplicate-definitions-bug.patch")
+                 (list (boost-patch
+                        "0001-unordered-fix-copy-assign.patch" version
+                        "09j61m5xh7099k5na9i43x5rra51znf7vm2nyh89yqpizcll9q66"))))
               (patch-flags '("-p2"))
               (sha256
                (base32
@@ -204,6 +206,24 @@ across a broad spectrum of applications.")
     (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt"
                                 "Some components have other similar licences."))))
 
+(define-public boost-for-source-highlight
+  (hidden-package (package (inherit boost)
+    (name "boost")
+    (version "1.83.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://boostorg.jfrog.io/artifactory/main/release/"
+                                  version "/source/boost_"
+                                  (version-with-underscores version) ".tar.bz2"))
+              (patches
+                 (list (boost-patch
+                        "0001-unordered-fix-copy-assign.patch" version
+                        "09j61m5xh7099k5na9i43x5rra51znf7vm2nyh89yqpizcll9q66")))
+              (patch-flags '("-p2"))
+              (sha256
+               (base32
+                "13iviiwk1srpw9dmiwabkxv56v0pl0zggjp8zxy1419k5zzfsy34")))))))
+
 ;; Sadly, this is needed for irods.  It won't link with 1.69 or later.
 (define-public boost-for-irods
   (package
-- 
cgit v1.3