rpms/boost
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert previous commit and un-bump %release

Browse Source 
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.
This commit is contained in:
Jonathan Wakely 2021-03-03 12:14:40 +00:00
parent 394a768911
commit aa5af673c5
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boost-1.73-locale-empty-vector.patch
View File

@ -28,7 +28,7 @@ index 7f1ea6a..dc59e8c 100644
tmp.resize(str.length()); tmp.resize(str.length());
icu::Collator *collate = get_collator(level); icu::Collator *collate = get_collator(level);
- int len = collate->getSortKey(str,&tmp[0],tmp.size()); - 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())) { if(len > int(tmp.size())) {
tmp.resize(len); tmp.resize(len);
collate->getSortKey(str,&tmp[0],tmp.size()); collate->getSortKey(str,&tmp[0],tmp.size());

5
boost.spec
View File

@ -42,7 +42,7 @@ Name: boost
%global real_name boost %global real_name boost
Summary: The free peer-reviewed portable C++ source libraries Summary: The free peer-reviewed portable C++ source libraries
Version: 1.75.0 Version: 1.75.0
Release: 4%{?dist} Release: 3%{?dist}
License: Boost and MIT and Python License: Boost and MIT and Python
# Replace each . with _ in %%{version} # Replace each . with _ in %%{version}
@ -1278,9 +1278,6 @@ fi
%{_mandir}/man1/b2.1* %{_mandir}/man1/b2.1*
%changelog %changelog
* Wed Mar 03 2021 Jonathan Wakely <jwakely@redhat.com> - 1.75.0-4
- Adjust Boost.Locale patch to use NULL instead of nullptr
* Tue Feb 02 2021 Thomas Rodgers <trodgers@redhat.com> - 1.75.0-3 * Tue Feb 02 2021 Thomas Rodgers <trodgers@redhat.com> - 1.75.0-3
- Patch Boost.Build to find boost-build.jam (#1923740) - Patch Boost.Build to find boost-build.jam (#1923740)