public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/libunibreak] rawhide: Update to v8.0 (rhbz#2457260)
@ 2026-09-22 21:32 Artur Frenszek-Iwicki
0 siblings, 0 replies; only message in thread
From: Artur Frenszek-Iwicki @ 2026-09-22 21:32 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/libunibreak
Branch : rawhide
Commit : 4f65e5dbee53f61edca35e0eb104aae3dc9bc4f4
Author : Artur Frenszek-Iwicki <fedora@svgames.pl>
Date : 2026-09-21T17:03:16+02:00
Stats : +121/-247 in 8 file(s)
URL : https://src.fedoraproject.org/rpms/libunibreak/c/4f65e5dbee53f61edca35e0eb104aae3dc9bc4f4?branch=rawhide
Log:
Update to v8.0 (rhbz#2457260)
---
diff --git a/0000-offline-files.patch b/0000-offline-files.patch
new file mode 100644
index 0000000..f73adce
--- /dev/null
+++ b/0000-offline-files.patch
@@ -0,0 +1,74 @@
+--- libunibreak-libunibreak_8_0--orig/src/Makefile.am 2026-09-15 09:10:38.000000000 +0200
++++ libunibreak-libunibreak_8_0/src/Makefile.am 2026-09-21 16:59:23.666829110 +0200
+@@ -58,63 +58,36 @@
+ distclean-local:
+ rm -f LineBreak.txt WordBreakData.txt GraphemeBreakData.txt DerivedCoreProperties.txt DerivedGeneralCategory.txt EastAsianWidth.txt emoji-data.txt
+
+
+-LineBreak.txt:
+- wget http://unicode.org/Public/UNIDATA/LineBreak.txt
+-
+-WordBreakProperty.txt:
+- wget http://www.unicode.org/Public/UNIDATA/auxiliary/WordBreakProperty.txt
+-
+-GraphemeBreakProperty.txt:
+- wget http://www.unicode.org/Public/UNIDATA/auxiliary/GraphemeBreakProperty.txt
+-
+-DerivedCoreProperties.txt:
+- wget https://www.unicode.org/Public/UNIDATA/DerivedCoreProperties.txt
+-
+-DerivedGeneralCategory.txt:
+- wget https://www.unicode.org/Public/UNIDATA/extracted/DerivedGeneralCategory.txt
+-
+-EastAsianWidth.txt:
+- wget https://www.unicode.org/Public/UNIDATA/EastAsianWidth.txt
+-
+-emoji-data.txt:
+- wget https://www.unicode.org/Public/UNIDATA/emoji/emoji-data.txt
+-
+-
+-linebreakdata: LineBreak.txt
++linebreakdata:
+ sed -E -n -f ${srcdir}/extract_data.sed LineBreak.txt | \
+ sed -E -f ${srcdir}/expand_single.sed | \
+ ${srcdir}/generate_linebreakdata.py > tmp.c
+ head -2 LineBreak.txt > tmp.txt
+ cat ${srcdir}/linebreakdata1.tmpl tmp.txt tmp.c > ${srcdir}/linebreakdata.c
+ rm tmp.txt tmp.c
+
+-linebreakauxdata: DerivedGeneralCategory.txt LineBreak.txt emoji-data.txt
++linebreakauxdata:
+ ${srcdir}/generate_linebreak_aux.py > ${srcdir}/linebreakauxdata.c
+
+-wordbreakdata: WordBreakProperty.txt
++wordbreakdata:
+ ${srcdir}/generate_word_break.py > ${srcdir}/wordbreakdata.c
+
+-graphemebreakdata: GraphemeBreakProperty.txt
++graphemebreakdata:
+ ${srcdir}/generate_grapheme_break.py > ${srcdir}/graphemebreakdata.c
+
+-eastasianwidthdata: EastAsianWidth.txt LineBreak.txt
++eastasianwidthdata:
+ ${srcdir}/generate_east_asian_width.py > ${srcdir}/eastasianwidthdata.c
+
+-indicconjunctbreakdata: DerivedCoreProperties.txt
++indicconjunctbreakdata:
+ ${srcdir}/generate_indic_conjunct_break.py > ${srcdir}/indicconjunctbreakdata.c
+
+-emojidata: emoji-data.txt
++emojidata:
+ ${srcdir}/generate_extended_pictographic.py > ${srcdir}/emojidata.c
+
+ update-test:
+- rm -f LineBreakTest.txt WordBreakTest.txt GraphemeBreakTest.txt
+- rm -f ${srcdir}/LineBreakTest.txt ${srcdir}/WordBreakTest.txt ${srcdir}/GraphemeBreakTest.txt
+- wget http://www.unicode.org/Public/UNIDATA/auxiliary/LineBreakTest.txt
+- wget http://www.unicode.org/Public/UNIDATA/auxiliary/WordBreakTest.txt
+- wget http://www.unicode.org/Public/UNIDATA/auxiliary/GraphemeBreakTest.txt
+- [ -f ${srcdir}/LineBreakTest.txt ] || mv -f LineBreakTest.txt WordBreakTest.txt GraphemeBreakTest.txt ${srcdir}
++ [ -f ${srcdir}/LineBreakText.txt && -f ${srcdir}/WordBreakTest.txt && -f ${srcdir}/GraphemeBreakTest.txt ] || exit 42
+
+
+ # Tests
+
diff --git a/0001-remove-unused-variable.patch b/0001-remove-unused-variable.patch
new file mode 100644
index 0000000..93a70dc
--- /dev/null
+++ b/0001-remove-unused-variable.patch
@@ -0,0 +1,40 @@
+diff -rU4 libunibreak-libunibreak_8_0--orig/src/tests.c libunibreak-libunibreak_7_0/src/tests.c
+--- libunibreak-libunibreak_8_0--orig/src/tests.c 2026-04-10 09:33:13.000000000 +0200
++++ libunibreak-libunibreak_8_0/src/tests.c 2026-09-21 17:01:01.010101010 +0200
+@@ -56,9 +56,9 @@
+ Test_Type testType;
+ clock_t t1;
+ clock_t t2;
+
+- char noBreak, mustBreak, insideChar;
++ char noBreak, mustBreak;
+ const unsigned int *testSkips; /* Zero terminated array of line numbers
+ to skip in the test. */
+
+ if (argc != 2)
+@@ -72,25 +72,22 @@
+ filename = "LineBreakTest.txt";
+ testType = TEST_TYPE_LINE;
+ noBreak = LINEBREAK_NOBREAK;
+ mustBreak = LINEBREAK_MUSTBREAK;
+- insideChar = LINEBREAK_INSIDEACHAR;
+ testSkips = testSkipsLine;
+ break;
+ case 'w':
+ filename = "WordBreakTest.txt";
+ testType = TEST_TYPE_WORD;
+ noBreak = WORDBREAK_NOBREAK;
+ mustBreak = WORDBREAK_BREAK;
+- insideChar = WORDBREAK_INSIDEACHAR;
+ testSkips = testSkipsWord;
+ break;
+ case 'g':
+ filename = "GraphemeBreakTest.txt";
+ testType = TEST_TYPE_GRAPHEME;
+ noBreak = GRAPHEMEBREAK_NOBREAK;
+ mustBreak = GRAPHEMEBREAK_BREAK;
+- insideChar = GRAPHEMEBREAK_INSIDEACHAR;
+ testSkips = testSkipsGrapheme;
+ break;
+ default:
+ return 1;
diff --git a/disable_broken_tests.patch b/disable_broken_tests.patch
deleted file mode 100644
index 7eb33d2..0000000
--- a/disable_broken_tests.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff --git a/src/test_skips.h b/src/test_skips.h
-index 0e0df44..7fc0bbc 100644
---- a/src/test_skips.h
-+++ b/src/test_skips.h
-@@ -1,40 +1,101 @@
- static const unsigned int testSkipsWord[] = {
-- 0
-+ 0
- };
-
- static const unsigned int testSkipsGrapheme[] = {
-- 0
-+ 275,
-+ 638,
-+ 640,
-+ 642,
-+ 644,
-+ 645,
-+ 646,
-+ 648,
-+ 650,
-+ 651,
-+ 652,
-+ 654,
-+ 656,
-+ 658,
-+ 660,
-+ 662,
-+ 664,
-+ 665,
-+ 666, /* Oh, boy! Don't tempt the devil! */
-+ 667,
-+ 668,
-+ 670,
-+ 672,
-+ 0
- };
-
- static const unsigned int testSkipsLine[] = {
- 125, /* Unable to tell LB30 East Asian symbols */
- 127, /* Unable to tell LB30 East Asian symbols */
-+ 261,
-+ 263,
-+ 429,
-+ 431,
- 815, /* Unable to tell LB30 East Asian symbols */
-+ 1101,
-+ 1103,
-+ 1141,
-+ 1143,
-+ 1145,
-+ 1147,
- 1161, /* Use LB25: no regex tailoring as in Example 7 */
- 1163, /* Use LB25: no regex tailoring as in Example 7 */
- 1165, /* Use LB25: no regex tailoring as in Example 7 */
- 1167, /* Use LB25: no regex tailoring as in Example 7 */
-+ 1269,
-+ 1271,
-+ 1309,
-+ 1311,
-+ 1313,
-+ 1315,
- 1331, /* Unable to tell LB30 East Asian symbols */
- 2189, /* Unable to tell LB30 East Asian symbols */
- 2191, /* Unable to tell LB30 East Asian symbols */
-+ 2445,
-+ 2447,
- 2873, /* Use LB25: no regex tailoring as in Example 7 */
- 2875, /* Use LB25: no regex tailoring as in Example 7 */
-+ 2949,
-+ 2951,
-+ 2981,
-+ 2983,
- 3567, /* Unable to tell LB30 East Asian symbols */
- 3739, /* Unable to tell LB30 East Asian symbols */
-+ 3957,
-+ 3959,
- 4081, /* Unable to tell LB30 East Asian symbols */
- 4083, /* Unable to tell LB30 East Asian symbols */
- 4425, /* Unable to tell LB30 East Asian symbols */
- 4427, /* Unable to tell LB30 East Asian symbols */
-+ 4461,
-+ 4463,
- 4473, /* Use LB25: no regex tailoring as in Example 7 */
- 4475, /* Use LB25: no regex tailoring as in Example 7 */
-+ 4497,
-+ 4499,
- 4597, /* Unable to tell LB30 East Asian symbols */
- 4599, /* Unable to tell LB30 East Asian symbols */
-+ 4629,
-+ 4631,
- 4645, /* Unable to tell LB30 East Asian symbols */
- 4647, /* Unable to tell LB30 East Asian symbols */
-+ 4665,
-+ 4667,
- 4943, /* Unable to tell LB30 East Asian symbols */
- 5109, /* Use LB25: no regex tailoring as in Example 7 */
- 5111, /* Use LB25: no regex tailoring as in Example 7 */
-+ 5133,
-+ 5135,
-+ 5165,
-+ 5167,
- 5459, /* Unable to tell LB30 East Asian symbols */
-+ 5637,
-+ 5639,
- 6149, /* Use LB25: no regex tailoring as in Example 7 */
- 6151, /* Use LB25: no regex tailoring as in Example 7 */
- 6153, /* Use LB25: no regex tailoring as in Example 7 */
-@@ -44,10 +105,30 @@ static const unsigned int testSkipsLine[] = {
- 6663, /* Unable to tell LB30 East Asian symbols */
- 6833, /* Unable to tell LB30 East Asian symbols */
- 6835, /* Unable to tell LB30 East Asian symbols */
-+ 6981,
-+ 6983,
- 7005, /* Unable to tell LB30 East Asian symbols */
- 7007, /* Unable to tell LB30 East Asian symbols */
-+ 7137,
-+ 7146,
-+ 7151,
-+ 7153,
-+ 7154,
-+ 7155,
-+ 7156,
- 7177, /* Unable to tell LB30 East Asian symbols */
- 7179, /* Unable to tell LB30 East Asian symbols */
-+ 7236,
-+ 7237,
-+ 7238,
-+ 7239,
-+ 7240,
-+ 7241,
-+ 7243,
-+ 7244,
-+ 7245,
-+ 7246,
-+ 7247,
- 7477, /* Use LB25: no regex tailoring as in Example 7 */
- 7486, /* Use LB25: no regex tailoring as in Example 7 */
- 7491, /* Use LB25: no regex tailoring as in Example 7 */
diff --git a/download_sources_for_offline_build.sh b/download_sources_for_offline_build.sh
index 916c987..e607f75 100755
--- a/download_sources_for_offline_build.sh
+++ b/download_sources_for_offline_build.sh
@@ -22,9 +22,11 @@ wget -Nc https://www.unicode.org/Public/UNIDATA/LineBreak.txt
wget -Nc https://www.unicode.org/Public/UNIDATA/auxiliary/WordBreakProperty.txt
wget -Nc https://www.unicode.org/Public/UNIDATA/auxiliary/GraphemeBreakProperty.txt
wget -Nc https://www.unicode.org/Public/UNIDATA/DerivedCoreProperties.txt
+wget -Nc https://www.unicode.org/Public/UNIDATA/DerivedGeneralCategory.txt
wget -Nc https://www.unicode.org/Public/UNIDATA/EastAsianWidth.txt
wget -Nc https://www.unicode.org/Public/UNIDATA/emoji/emoji-data.txt
+
# These are needed for the tests.
# Upstream provides them, but also provides means of updating them, by means
# of fresh downloads from the Unicode website.
diff --git a/libunibreak.spec b/libunibreak.spec
index a1a8461..83f2837 100644
--- a/libunibreak.spec
+++ b/libunibreak.spec
@@ -1,7 +1,7 @@
%global forgeurl https://github.com/adah1972/libunibreak
Name: libunibreak
-Version: 6.1
+Version: 8.0
Release: %autorelease
Summary: A Unicode line-breaking library
# Upstream uses tags of the form `libunibreak_X_Y`
@@ -16,9 +16,9 @@ Source0: %forgesource
Source1: libunibreak-test-data.tar.gz
# don't download test data
-Patch: offline_files.patch
+Patch0: 0000-offline-files.patch
# remove unused var and other build fixes
-Patch: remove_unused_var.patch
+Patch1: 0001-remove-unused-variable.patch
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
diff --git a/offline_files.patch b/offline_files.patch
deleted file mode 100644
index 5f16391..0000000
--- a/offline_files.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9a2b420..604180b 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -57,26 +57,7 @@ distclean-local:
- rm -f LineBreak.txt WordBreakData.txt GraphemeBreakData.txt DerivedCoreProperties.txt EastAsianWidth.txt emoji-data.txt
-
-
--LineBreak.txt:
-- wget http://unicode.org/Public/UNIDATA/LineBreak.txt
--
--WordBreakProperty.txt:
-- wget http://www.unicode.org/Public/UNIDATA/auxiliary/WordBreakProperty.txt
--
--GraphemeBreakProperty.txt:
-- wget http://www.unicode.org/Public/UNIDATA/auxiliary/GraphemeBreakProperty.txt
--
--DerivedCoreProperties.txt:
-- wget https://www.unicode.org/Public/UNIDATA/DerivedCoreProperties.txt
--
--EastAsianWidth.txt:
-- wget https://www.unicode.org/Public/UNIDATA/EastAsianWidth.txt
--
--emoji-data.txt:
-- wget https://www.unicode.org/Public/UNIDATA/emoji/emoji-data.txt
--
--
--linebreakdata: LineBreak.txt
-+linebreakdata:
- sed -E -n -f ${srcdir}/extract_data.sed LineBreak.txt | \
- sed -E -f ${srcdir}/expand_single.sed | \
- ${srcdir}/generate_linebreakdata.py > tmp.c
-@@ -84,27 +65,23 @@ linebreakdata: LineBreak.txt
- cat ${srcdir}/linebreakdata1.tmpl tmp.txt tmp.c > ${srcdir}/linebreakdata.c
- rm tmp.txt tmp.c
-
--wordbreakdata: WordBreakProperty.txt
-+wordbreakdata:
- ${srcdir}/generate_word_break.py > ${srcdir}/wordbreakdata.c
-
--graphemebreakdata: GraphemeBreakProperty.txt
-+graphemebreakdata:
- ${srcdir}/generate_grapheme_break.py > ${srcdir}/graphemebreakdata.c
-
--eastasianwidthdata: EastAsianWidth.txt
-+eastasianwidthdata:
- ${srcdir}/generate_east_asian_width.py > ${srcdir}/eastasianwidthdata.c
-
--indicconjunctbreakdata: DerivedCoreProperties.txt
-+indicconjunctbreakdata:
- ${srcdir}/generate_indic_conjunct_break.py > ${srcdir}/indicconjunctbreakdata.c
-
--emojidata: emoji-data.txt
-+emojidata:
- ${srcdir}/generate_extended_pictographic.py > ${srcdir}/emojidata.c
-
- update-test:
-- rm -f WordBreakTest.txt GraphemeBreakTest.txt
-- rm -f ${srcdir}/WordBreakTest.txt ${srcdir}/GraphemeBreakTest.txt
-- wget http://www.unicode.org/Public/UNIDATA/auxiliary/WordBreakTest.txt
-- wget http://www.unicode.org/Public/UNIDATA/auxiliary/GraphemeBreakTest.txt
-- [ -f ${srcdir}/WordBreakTest.txt ] || mv -f WordBreakTest.txt GraphemeBreakTest.txt ${srcdir}
-+ [ -f ${srcdir}/WordBreakTest.txt && -f ${srcdir}/GraphemeBreakTest.txt ] || exit 42
-
-
- # Tests
diff --git a/remove_unused_var.patch b/remove_unused_var.patch
deleted file mode 100644
index b86b29f..0000000
--- a/remove_unused_var.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/src/tests.c b/src/tests.c
-index 2135144..658c919 100644
---- a/src/tests.c
-+++ b/src/tests.c
-@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
- clock_t t1;
- clock_t t2;
-
-- char noBreak, mustBreak, insideChar;
-+ char noBreak, mustBreak;
- const unsigned int *testSkips; /* Zero terminated array of line numbers to skip in the test. */
-
- if (argc != 2)
-@@ -72,7 +72,6 @@ int main(int argc, char *argv[])
- testType = TEST_TYPE_LINE;
- noBreak = LINEBREAK_NOBREAK;
- mustBreak = LINEBREAK_MUSTBREAK;
-- insideChar = LINEBREAK_INSIDEACHAR;
- testSkips = testSkipsLine;
- break;
- case 'w':
-@@ -80,7 +79,6 @@ int main(int argc, char *argv[])
- testType = TEST_TYPE_WORD;
- noBreak = WORDBREAK_NOBREAK;
- mustBreak = WORDBREAK_BREAK;
-- insideChar = WORDBREAK_INSIDEACHAR;
- testSkips = testSkipsWord;
- break;
- case 'g':
-@@ -88,7 +86,6 @@ int main(int argc, char *argv[])
- testType = TEST_TYPE_GRAPHEME;
- noBreak = GRAPHEMEBREAK_NOBREAK;
- mustBreak = GRAPHEMEBREAK_BREAK;
-- insideChar = GRAPHEMEBREAK_INSIDEACHAR;
- testSkips = testSkipsGrapheme;
- break;
- default:
diff --git a/sources b/sources
index c904f1f..c36813b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libunibreak-libunibreak_6_1.tar.gz) = a85333d59c78b67b1c05d33ab99c069ba493780d6a98ad5ab00e33235c454b8b33515cac4e815de35533f235be7cf5473550b3a6389f7581ba2f6216d42d38e1
-SHA512 (libunibreak-test-data.tar.gz) = bc842208a1184f301350b9ff0ab86e721fc98e6580635063861c1292403eb0a0905e52df12e4f13dc9a32883219261ef95a327beced842c0095d633024cc0cf9
+SHA512 (libunibreak-libunibreak_8_0.tar.gz) = 5813b54458fd442def3d8b831147dada549f88f9a7831e72f4b608571d78c057fa05732d3b0d69dae365adf346825a89a1d7fdf74fa3b5465495019648820fdf
+SHA512 (libunibreak-test-data.tar.gz) = c8497099d3d6de8150284a1979655d50db638a0880d9f6d4fdeb28606e3ea7720fd39cebe3ad732a7348af59653765641375d51336946ce3316d82a8af2e53bb
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-22 21:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-22 21:32 [rpms/libunibreak] rawhide: Update to v8.0 (rhbz#2457260) Artur Frenszek-Iwicki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox