Compare commits

...
Sign in to create a new pull request.

8 commits

Author SHA1 Message Date
Python Maint
65b7ff3043 Rebuilt for Python 3.15.0b4 ABI change 2026-07-22 16:31:24 +02:00
Fedora Release Engineering
1d636bc2b1 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-15 20:19:29 +00:00
796de58f53 Replace outdated "fixes" for character sets and line endings
Some of these files were already converted to UTF-8 upstream and so
we're now turning them into mojibake. For the remaining two:
- fix multi_index/example/hashed.cpp using a patch instead of iconv, so
  that when my upstream patch for that file lands in Fedora we can drop
  the patch and won't silently turn that file into mojibake.
- add an rpmlint filter for serialization/example/demo_output.txt
  because that needs to be ISO-8859-1 encoded to match the output of the
  serialization/example/demo.cpp program.

There's also a new file that's not UTF-8 which wasn't being fixed by the
spec file.  I've submitted a pull request to fix that upstream, so add a
patch for that one too.

Add another rpmlint filter for some other warnings about boost-examples.

Also include SVG files in the boost-doc subpackage.
2026-06-19 17:42:27 +01:00
72b3629677 Remove BuildRequires: bison
This was shown by the unbreq plugin to be not used.

It was added in 378d8d7e42 but I don't
remember what it was for.
2026-06-19 17:41:55 +01:00
7c1a7f99ba Remove BuildRequires: m4
This was shown by the unbreq plugin to be not used.

It was added in cb253a3d3f for use when
creating the libboost_thread.so linker script. That linker script was
dropped in ec7383f6bd when rebasing to
1.90.0 which removed the libboost_system.so shared lib.
2026-06-19 17:41:55 +01:00
František Zatloukal
f0aed09c52 Rebuilt for icu 78.3 2026-06-07 23:21:21 +02:00
Python Maint
f4425c131e Rebuilt for Python 3.15 2026-06-04 00:08:22 +02:00
František Zatloukal
6e2fef050b Rebuilt for icu 78.3 2026-05-27 09:08:06 +02:00
4 changed files with 97 additions and 15 deletions

View file

@ -0,0 +1,16 @@
commit 708607d14eeca939320278e949303451670c26e8
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Thu Jun 18 13:28:59 2026 +0100
Convert example/Jamfile.v2 to UTF-8
diff --git a/example/Jamfile.v2 b/example/Jamfile.v2
index ee0f1c6..c840764 100644
--- a/libs/bloom/example/Jamfile.v2
+++ b/libs/bloom/example/Jamfile.v2
@@ -1,4 +1,4 @@
-# Copyright 2025 Joaquín M López Muñoz.
+# Copyright 2025 Joaquín M López Muñoz.
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

View file

@ -0,0 +1,49 @@
commit 0356be0f6f06b5f88a2f1d363a4a569fc5718b53
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Thu Jun 18 08:31:35 2026 +0100
Convert example/hashed.cpp to UTF-8 (#98)
This makes the file slightly larger, but that seems preferable because
almost all other Boost source files are encoded as UTF-8 these days.
diff --git a/example/hashed.cpp b/example/hashed.cpp
index 0bfac21..e3edbd9 100644
--- a/libs/multi_index/example/hashed.cpp
+++ b/libs/multi_index/example/hashed.cpp
@@ -66,23 +66,23 @@ int main()
std::string text=
"En un lugar de la Mancha, de cuyo nombre no quiero acordarme, no ha "
- "mucho tiempo que vivía un hidalgo de los de lanza en astillero, adarga "
- "antigua, rocín flaco y galgo corredor. Una olla de algo más vaca que "
- "carnero, salpicón las más noches, duelos y quebrantos los sábados, "
- "lantejas los viernes, algún palomino de añadidura los domingos, "
- "consumían las tres partes de su hacienda. El resto della concluían sayo "
+ "mucho tiempo que vivía un hidalgo de los de lanza en astillero, adarga "
+ "antigua, rocín flaco y galgo corredor. Una olla de algo más vaca que "
+ "carnero, salpicón las más noches, duelos y quebrantos los sábados, "
+ "lantejas los viernes, algún palomino de añadidura los domingos, "
+ "consumían las tres partes de su hacienda. El resto della concluían sayo "
"de velarte, calzas de velludo para las fiestas, con sus pantuflos de lo "
- "mesmo, y los días de entresemana se honraba con su vellorí de lo más "
- "fino. Tenía en su casa una ama que pasaba de los cuarenta, y una "
+ "mesmo, y los días de entresemana se honraba con su vellorí de lo más "
+ "fino. Tenía en su casa una ama que pasaba de los cuarenta, y una "
"sobrina que no llegaba a los veinte, y un mozo de campo y plaza, que "
- "así ensillaba el rocín como tomaba la podadera. Frisaba la edad de "
- "nuestro hidalgo con los cincuenta años; era de complexión recia, seco "
+ "así ensillaba el rocín como tomaba la podadera. Frisaba la edad de "
+ "nuestro hidalgo con los cincuenta años; era de complexión recia, seco "
"de carnes, enjuto de rostro, gran madrugador y amigo de la caza. "
- "Quieren decir que tenía el sobrenombre de Quijada, o Quesada, que en "
+ "Quieren decir que tenía el sobrenombre de Quijada, o Quesada, que en "
"esto hay alguna diferencia en los autores que deste caso escriben; "
- "aunque, por conjeturas verosímiles, se deja entender que se llamaba "
+ "aunque, por conjeturas verosímiles, se deja entender que se llamaba "
"Quejana. Pero esto importa poco a nuestro cuento; basta que en la "
- "narración dél no se salga un punto de la verdad.";
+ "narración dél no se salga un punto de la verdad.";
/* feed the text into the container */

View file

@ -17,8 +17,11 @@ addFilter("boost.*: W: spelling-error Summary(en_US) numpy ")
# The example code is useless without the headers
addFilter("boost-examples.x86_64: E: devel-dependency boost-devel")
addFilter("boost-examples.x86_64: E: no-binary")
# These libs are statically linked
addFilter("boost-date-time.x86_64: E: shared-lib-without-dependency-information /usr/lib64/libboost_date_time.so.*")
addFilter("boost-system.x86_64: E: shared-lib-without-dependency-information /usr/lib64/libboost_system.so.*")
addFilter("boost-stacktrace.x86_64: E: shared-lib-without-dependency-information /usr/lib64/libboost_stacktrace_noop.so.*")
addFilter("file-not-utf8 /usr/share/doc/boost-examples/libs/serialization/example/demo_output.txt")

View file

@ -52,7 +52,7 @@ Name: boost
%global real_name boost
Summary: The free peer-reviewed portable C++ source libraries
Version: 1.90.0
Release: 7%{?dist}
Release: 13%{?dist}
License: BSL-1.0 AND MIT AND Python-2.0.1
# Replace each . with _ in %%{version}
@ -126,7 +126,6 @@ Recommends: (boost-numpy3 if python3-numpy)
%endif
BuildRequires: gcc-c++
BuildRequires: m4
BuildRequires: libstdc++-devel
BuildRequires: bzip2-devel
BuildRequires: zlib-devel
@ -139,7 +138,6 @@ BuildRequires: libicu-devel
%if %{with quadmath}
BuildRequires: libquadmath-devel
%endif
BuildRequires: bison
BuildRequires: libzstd-devel
BuildRequires: which
@ -167,6 +165,14 @@ Patch6: boost-1.90-system.patch
# https://github.com/boostorg/range/pull/157
Patch7: boost-1.90.0-range.patch
# https://github.com/boostorg/multi_index/pull/98
# This should not be needed for boost-1.92.0 or later.
Patch8: boost-1.90.0-multi_index-utf8.patch
# https://github.com/boostorg/bloom/pull/46
# This should not be needed for boost-1.92.0 or later.
Patch9: boost-1.90.0-bloom-utf8.patch
%bcond_with tests
%bcond_with docs_generated
@ -967,7 +973,7 @@ echo ============================= install documentation ==================
# Prepare the place to temporarily store the generated documentation
rm -rf %{boost_docdir} && %{__mkdir_p} %{boost_docdir}/html
DOCPATH=%{boost_docdir}
DOCREGEX='.*\.\(html?\|css\|png\|gif\)'
DOCREGEX='.*\.\(html?\|css\|png\|gif\|svg\)'
find libs doc more -type f -regex $DOCREGEX \
| sed -n '/\//{s,/[^/]*$,,;p}' \
@ -984,17 +990,6 @@ rm -f tmp-doc-directories
%{__install} -p -m 644 -t $DOCPATH LICENSE_1_0.txt index.htm index.html boost.png rst.css boost.css
echo ============================= install examples ==================
# Fix a few non-standard issues (DOS and/or non-UTF8 files)
sed -i -e 's/\r//g' libs/geometry/example/ml02_distance_strategy.cpp
for tmp_doc_file in flyweight/example/Jamfile.v2 \
format/example/sample_new_features.cpp multi_index/example/Jamfile.v2 \
multi_index/example/hashed.cpp serialization/example/demo_output.txt
do
mv libs/${tmp_doc_file} libs/${tmp_doc_file}.iso8859
iconv -f ISO8859-1 -t UTF8 < libs/${tmp_doc_file}.iso8859 > libs/${tmp_doc_file}
touch -r libs/${tmp_doc_file}.iso8859 libs/${tmp_doc_file}
rm -f libs/${tmp_doc_file}.iso8859
done
# Prepare the place to temporarily store the examples
rm -rf %{boost_examplesdir} && mkdir -p %{boost_examplesdir}/html
@ -1372,6 +1367,25 @@ fi
%{_mandir}/man1/b2.1*
%changelog
* Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 1.90.0-13
- Rebuilt for Python 3.15.0b4 ABI change
* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.90.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Thu Jun 18 2026 Jonathan Wakely <jwakely@fedoraproject.org> - 1.90.0-11
- Replace outdated "fixes" for character sets and line endings
- Include SVG files in the boost-doc subpackage
* Sun Jun 07 2026 František Zatloukal <fzatlouk@redhat.com> - 1.90.0-10
- Rebuilt for icu 78.3
* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 1.90.0-9
- Rebuilt for Python 3.15
* Wed May 27 2026 František Zatloukal <fzatlouk@redhat.com> - 1.90.0-8
- Rebuilt for icu 78.3
* Thu Mar 19 2026 Jonathan Wakely <jwakely@fedoraproject.org> - 1.90.0-7
- Add workaround for failing regex tests (#2430541)
- Add BR:which as needed by the bootstrap.sh script