From aa5af673c5b55a7c1f005de3e444febd79dee61c Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 3 Mar 2021 12:14:40 +0000 Subject: [PATCH] Revert previous commit and un-bump %release The original patch to use nullptr was fine, because it's in a .cpp file which is built using a recent standard dialect, so nullptr is defined. --- boost-1.73-locale-empty-vector.patch | 2 +- boost.spec | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/boost-1.73-locale-empty-vector.patch b/boost-1.73-locale-empty-vector.patch index 77cc929..f5cc981 100644 --- a/boost-1.73-locale-empty-vector.patch +++ b/boost-1.73-locale-empty-vector.patch @@ -28,7 +28,7 @@ index 7f1ea6a..dc59e8c 100644 tmp.resize(str.length()); icu::Collator *collate = get_collator(level); - int len = collate->getSortKey(str,&tmp[0],tmp.size()); -+ int len = collate->getSortKey(str,tmp.empty()?NULL:&tmp[0],tmp.size()); ++ int len = collate->getSortKey(str,tmp.empty()?nullptr:&tmp[0],tmp.size()); if(len > int(tmp.size())) { tmp.resize(len); collate->getSortKey(str,&tmp[0],tmp.size()); diff --git a/boost.spec b/boost.spec index 381a27c..0722e5f 100644 --- a/boost.spec +++ b/boost.spec @@ -42,7 +42,7 @@ Name: boost %global real_name boost Summary: The free peer-reviewed portable C++ source libraries Version: 1.75.0 -Release: 4%{?dist} +Release: 3%{?dist} License: Boost and MIT and Python # Replace each . with _ in %%{version} @@ -1278,9 +1278,6 @@ fi %{_mandir}/man1/b2.1* %changelog -* Wed Mar 03 2021 Jonathan Wakely - 1.75.0-4 -- Adjust Boost.Locale patch to use NULL instead of nullptr - * Tue Feb 02 2021 Thomas Rodgers - 1.75.0-3 - Patch Boost.Build to find boost-build.jam (#1923740)