[rpms/boost] rawhide: Replace outdated "fixes" for character sets and line endings

[rpms/boost] rawhide: Replace outdated "fixes" for character sets and line endings

[Jonathan Wakely]

            A new commit has been pushed.

            Repo   : rpms/boost
            Branch : rawhide
            Commit : 796de58f53cffaa15c220cc48076a3ad9ebc37fc
            Author : Jonathan Wakely <jwakely@fedoraproject.org>
            Date   : 2026-06-19T17:42:27+01:00
            Stats  : +82/-13 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/boost/c/796de58f53cffaa15c220cc48076a3ad9ebc37fc?branch=rawhide

            Log:
            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.

---
diff --git a/boost-1.90.0-bloom-utf8.patch b/boost-1.90.0-bloom-utf8.patch
new file mode 100644
index 0000000..e934d1b
--- /dev/null
+++ b/boost-1.90.0-bloom-utf8.patch
@@ -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)

diff --git a/boost-1.90.0-multi_index-utf8.patch b/boost-1.90.0-multi_index-utf8.patch
new file mode 100644
index 0000000..7d81ecd
--- /dev/null
+++ b/boost-1.90.0-multi_index-utf8.patch
@@ -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 */
+ 

diff --git a/boost.rpmlintrc b/boost.rpmlintrc
index c8a2596..f028d25 100644
--- a/boost.rpmlintrc
+++ b/boost.rpmlintrc
@@ -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")

diff --git a/boost.spec b/boost.spec
index 409de0e..3d0b381 100644
--- a/boost.spec
+++ b/boost.spec
@@ -52,7 +52,7 @@ Name: boost
 %global real_name boost
 Summary: The free peer-reviewed portable C++ source libraries
 Version: 1.90.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: BSL-1.0 AND MIT AND Python-2.0.1
 
 # Replace each . with _ in %%{version}
@@ -165,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
 
@@ -965,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}' \
@@ -982,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
@@ -1370,6 +1367,10 @@ fi
 %{_mandir}/man1/b2.1*
 
 %changelog
+* 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