CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 23 20:56:00 UTC 2025

Modified Files:
        pkgsrc/devel/boost-headers: Makefile
        pkgsrc/meta-pkgs/boost: distinfo
Added Files:
        pkgsrc/meta-pkgs/boost/patches:
            patch-boost_smart__ptr_intrusive__ptr.hpp
            patch-boost_smart__ptr_shared__ptr.hpp

Log Message:
boost-headers: pull upstream fix

Fixes:
"operator<< template incompatible with non-char ostreams since 1.87.0"

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/devel/boost-headers/Makefile
cvs rdiff -u -r1.153 -r1.154 pkgsrc/meta-pkgs/boost/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/meta-pkgs/boost/patches/patch-boost_smart__ptr_intrusive__ptr.hpp \
    pkgsrc/meta-pkgs/boost/patches/patch-boost_smart__ptr_shared__ptr.hpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/boost-headers/Makefile
diff -u pkgsrc/devel/boost-headers/Makefile:1.66 pkgsrc/devel/boost-headers/Makefile:1.67
--- pkgsrc/devel/boost-headers/Makefile:1.66    Fri Oct  4 03:28:40 2024
+++ pkgsrc/devel/boost-headers/Makefile Thu Jan 23 20:56:00 2025
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.66 2024/10/04 03:28:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.67 2025/01/23 20:56:00 wiz Exp $
 
 BOOST_PACKAGE=         headers
 BOOST_COMMENT=         (build-time headers)
 BOOST_CONFIG=          generate
 
+PKGREVISION=           1
+
 .include "../../meta-pkgs/boost/Makefile.common"
 
 BJAM_ARGS+=            --without-\*

Index: pkgsrc/meta-pkgs/boost/distinfo
diff -u pkgsrc/meta-pkgs/boost/distinfo:1.153 pkgsrc/meta-pkgs/boost/distinfo:1.154
--- pkgsrc/meta-pkgs/boost/distinfo:1.153       Sun Dec 29 14:53:13 2024
+++ pkgsrc/meta-pkgs/boost/distinfo     Thu Jan 23 20:56:00 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.153 2024/12/29 14:53:13 adam Exp $
+$NetBSD: distinfo,v 1.154 2025/01/23 20:56:00 wiz Exp $
 
 BLAKE2s (boost_1_87_0.tar.bz2) = 20ba7a87b1e20b1bc54f46c4d23a4866aa47983cf6e3674f229933184a95b1d4
 SHA512 (boost_1_87_0.tar.bz2) = a2d5007953f67b816169efe0cf11675cd63fc6bae63f87ee1372515e57913ef6cf6ae8c3f2c400fef8ce63a035a02a0cad0da5acc29e977a85d458625b2a719c
@@ -19,6 +19,8 @@ SHA1 (patch-boost_math_tools_config.hpp)
 SHA1 (patch-boost_math_tools_promotion.hpp) = d1079940594f7ffe7e70db6f61bba633b8fb31e5
 SHA1 (patch-boost_numeric_ublas_storage.hpp) = 282b5a3b5d09216ded14fae166169d64db72590e
 SHA1 (patch-boost_property__tree_detail_xml__parser__read__rapidxml.hpp) = 3499fcc37e72396d23a9fce0f1c97891adf12a9f
+SHA1 (patch-boost_smart__ptr_intrusive__ptr.hpp) = 530340ba1b5aaadb02e6a2767185975a81992fdb
+SHA1 (patch-boost_smart__ptr_shared__ptr.hpp) = 1e9aacc4db883fa28d763cdbe2715e81b6171310
 SHA1 (patch-boost_stacktrace_detail_collect__unwind.ipp) = a5922dffd929f596b6e7d71b11f32d17e0bbd806
 SHA1 (patch-boost_test_impl_execution__monitor.ipp) = ffd449576d00b7e6ea3081421e3e70decf5d7de8
 SHA1 (patch-boost_thread_pthread_thread__data.hpp) = d048867f0ed98720cc375e949e5c92b92f3ce1ac

Added files:

Index: pkgsrc/meta-pkgs/boost/patches/patch-boost_smart__ptr_intrusive__ptr.hpp
diff -u /dev/null pkgsrc/meta-pkgs/boost/patches/patch-boost_smart__ptr_intrusive__ptr.hpp:1.1
--- /dev/null   Thu Jan 23 20:56:00 2025
+++ pkgsrc/meta-pkgs/boost/patches/patch-boost_smart__ptr_intrusive__ptr.hpp    Thu Jan 23 20:56:00 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-boost_smart__ptr_intrusive__ptr.hpp,v 1.1 2025/01/23 20:56:00 wiz Exp $
+
+Fix operator<< for shared_ptr and intrusive_ptr.
+https://github.com/boostorg/smart_ptr/commit/e7433ba54596da97cb7859455cd37ca140305a9c
+
+--- boost/smart_ptr/intrusive_ptr.hpp.orig     2024-12-05 00:53:36.000000000 +0000
++++ boost/smart_ptr/intrusive_ptr.hpp
+@@ -285,7 +285,7 @@ template<class T, class U> intrusive_ptr
+ 
+ // operator<<
+ 
+-template<class Y> std::ostream & operator<< (std::ostream & os, intrusive_ptr<Y> const & p)
++template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, intrusive_ptr<Y> const & p)
+ {
+     os << p.get();
+     return os;
Index: pkgsrc/meta-pkgs/boost/patches/patch-boost_smart__ptr_shared__ptr.hpp
diff -u /dev/null pkgsrc/meta-pkgs/boost/patches/patch-boost_smart__ptr_shared__ptr.hpp:1.1
--- /dev/null   Thu Jan 23 20:56:00 2025
+++ pkgsrc/meta-pkgs/boost/patches/patch-boost_smart__ptr_shared__ptr.hpp       Thu Jan 23 20:56:00 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-boost_smart__ptr_shared__ptr.hpp,v 1.1 2025/01/23 20:56:00 wiz Exp $
+
+Fix operator<< for shared_ptr and intrusive_ptr.
+https://github.com/boostorg/smart_ptr/commit/e7433ba54596da97cb7859455cd37ca140305a9c
+
+--- boost/smart_ptr/shared_ptr.hpp.orig        2024-12-05 00:53:36.000000000 +0000
++++ boost/smart_ptr/shared_ptr.hpp
+@@ -775,7 +775,7 @@ template<class T> inline typename shared
+ 
+ // operator<<
+ 
+-template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> const & p)
++template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, shared_ptr<Y> const & p)
+ {
+     os << p.get();
+     return os;