From 0ca643db2b68d7618ec0ff0cd632f6ac9ddad092 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:52:44 +0000 Subject: [PATCH 01/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- woff2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index 9670610..f6aef0b 100644 --- a/woff2.spec +++ b/woff2.spec @@ -1,6 +1,6 @@ Name: woff2 Version: 1.0.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -56,6 +56,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.0.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 1.0.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 57c40ea5c434ae4cf6d6f2f26e7dcbdcffb832ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20G=C4=85sior?= Date: Sat, 8 Feb 2020 22:18:32 +0100 Subject: [PATCH 02/27] Add woff2-tools package --- woff2.spec | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/woff2.spec b/woff2.spec index f6aef0b..03570c0 100644 --- a/woff2.spec +++ b/woff2.spec @@ -17,6 +17,14 @@ improved compression that is achieved by using the Brotli algorithm. The primary purpose of the WOFF2 format is to efficiently package fonts linked to Web documents by means of CSS @font-face rules. +%package tools +Summary: Web Open Font Format 2.0 tools +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tools +Tools for compressing TTF files to WOFF2 format, decompressing WOFF2 +files back to TTF files and dumping WOFF2 file information. + %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -39,6 +47,12 @@ make %{?_smp_mflags} -C %{_target_platform} %install %make_install -C %{_target_platform} +pushd %{_target_platform} +mkdir -p %{buildroot}%{_bindir}/ +install -m 755 woff2_decompress %{buildroot}%{_bindir}/ +install -m 755 woff2_compress %{buildroot}%{_bindir}/ +install -m 755 woff2_info %{buildroot}%{_bindir}/ +popd %files %license LICENSE @@ -46,6 +60,11 @@ make %{?_smp_mflags} -C %{_target_platform} %{_libdir}/libwoff2dec.so.* %{_libdir}/libwoff2enc.so.* +%files tools +%attr(755, root, root) %{_bindir}/woff2_compress +%attr(755, root, root) %{_bindir}/woff2_decompress +%attr(755, root, root) %{_bindir}/woff2_info + %files devel %{_includedir}/woff2 %{_libdir}/libwoff2common.so From 4f2cb4575c6fabae689e7368d52d09f520547ccc Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 6 Apr 2020 12:40:22 +0200 Subject: [PATCH 03/27] Package woff2_decompress, woff2_compress and woff2_info in a tools subpackage. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to Tomasz Gąsior --- woff2.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index 03570c0..f4e4ace 100644 --- a/woff2.spec +++ b/woff2.spec @@ -1,6 +1,6 @@ Name: woff2 Version: 1.0.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -75,6 +75,10 @@ popd %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Mon April 06 2020 Tomas Popela - 1.0.2-8 +- Package woff2_decompress, woff2_compress and woff2_info in a tools subpackage. + Thanks to Tomasz Gąsior + * Fri Jan 31 2020 Fedora Release Engineering - 1.0.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From d3d2dacc23cbb089d0e033266754a2b5284cad08 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 6 Apr 2020 12:44:11 +0200 Subject: [PATCH 04/27] Fix the month in changelog --- woff2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index f4e4ace..e5a8147 100644 --- a/woff2.spec +++ b/woff2.spec @@ -75,7 +75,7 @@ popd %{_libdir}/pkgconfig/libwoff2enc.pc %changelog -* Mon April 06 2020 Tomas Popela - 1.0.2-8 +* Mon Apr 06 2020 Tomas Popela - 1.0.2-8 - Package woff2_decompress, woff2_compress and woff2_info in a tools subpackage. Thanks to Tomasz Gąsior From afbed0d1dcd10d460f7c01e769e33698a8e73a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20G=C4=85sior?= Date: Sat, 8 Feb 2020 22:18:32 +0100 Subject: [PATCH 05/27] Add woff2-tools package --- woff2.spec | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/woff2.spec b/woff2.spec index 9670610..427027d 100644 --- a/woff2.spec +++ b/woff2.spec @@ -17,6 +17,14 @@ improved compression that is achieved by using the Brotli algorithm. The primary purpose of the WOFF2 format is to efficiently package fonts linked to Web documents by means of CSS @font-face rules. +%package tools +Summary: Web Open Font Format 2.0 tools +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tools +Tools for compressing TTF files to WOFF2 format, decompressing WOFF2 +files back to TTF files and dumping WOFF2 file information. + %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -39,6 +47,12 @@ make %{?_smp_mflags} -C %{_target_platform} %install %make_install -C %{_target_platform} +pushd %{_target_platform} +mkdir -p %{buildroot}%{_bindir}/ +install -m 755 woff2_decompress %{buildroot}%{_bindir}/ +install -m 755 woff2_compress %{buildroot}%{_bindir}/ +install -m 755 woff2_info %{buildroot}%{_bindir}/ +popd %files %license LICENSE @@ -46,6 +60,11 @@ make %{?_smp_mflags} -C %{_target_platform} %{_libdir}/libwoff2dec.so.* %{_libdir}/libwoff2enc.so.* +%files tools +%attr(755, root, root) %{_bindir}/woff2_compress +%attr(755, root, root) %{_bindir}/woff2_decompress +%attr(755, root, root) %{_bindir}/woff2_info + %files devel %{_includedir}/woff2 %{_libdir}/libwoff2common.so From cf27a2313ae5a6c5cf36d456407c544645e9a25d Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 6 Apr 2020 12:40:22 +0200 Subject: [PATCH 06/27] Package woff2_decompress, woff2_compress and woff2_info in a tools subpackage. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to Tomasz Gąsior --- woff2.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index 427027d..461e663 100644 --- a/woff2.spec +++ b/woff2.spec @@ -1,6 +1,6 @@ Name: woff2 Version: 1.0.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -75,6 +75,10 @@ popd %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Mon April 06 2020 Tomas Popela - 1.0.2-7 +- Package woff2_decompress, woff2_compress and woff2_info in a tools subpackage. + Thanks to Tomasz Gąsior + * Sat Jul 27 2019 Fedora Release Engineering - 1.0.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 4bd63a2f515e1e166241147e8fdcf2bbf3bfdd4b Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 6 Apr 2020 12:44:11 +0200 Subject: [PATCH 07/27] Fix the month in changelog --- woff2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index 461e663..6b14b66 100644 --- a/woff2.spec +++ b/woff2.spec @@ -75,7 +75,7 @@ popd %{_libdir}/pkgconfig/libwoff2enc.pc %changelog -* Mon April 06 2020 Tomas Popela - 1.0.2-7 +* Mon Apr 06 2020 Tomas Popela - 1.0.2-7 - Package woff2_decompress, woff2_compress and woff2_info in a tools subpackage. Thanks to Tomasz Gąsior From d2d961533c7c258d4f32568eec6bfe345461374b Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sun, 5 Jul 2020 20:59:05 +0200 Subject: [PATCH 08/27] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- woff2.spec | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/woff2.spec b/woff2.spec index e5a8147..99a0905 100644 --- a/woff2.spec +++ b/woff2.spec @@ -1,3 +1,5 @@ +%undefine __cmake_in_source_build + Name: woff2 Version: 1.0.2 Release: 8%{?dist} @@ -36,23 +38,20 @@ Development files and utils for %{name} %autosetup -n %{name}-%{version} %build -mkdir -p %{_target_platform} -pushd %{_target_platform} -%cmake .. \ +%cmake \ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ -DCMAKE_INSTALL_LIBDIR="%{_libdir}" -popd - -make %{?_smp_mflags} -C %{_target_platform} +%cmake_build %install -%make_install -C %{_target_platform} -pushd %{_target_platform} -mkdir -p %{buildroot}%{_bindir}/ +%cmake_install +mkdir -p %{buildroot}%{_bindir}/ + +cd %{_target_platform} install -m 755 woff2_decompress %{buildroot}%{_bindir}/ install -m 755 woff2_compress %{buildroot}%{_bindir}/ install -m 755 woff2_info %{buildroot}%{_bindir}/ -popd +cd - %files %license LICENSE From e68005e568a4bb1b82f296d1093caac2e0ebbb1c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:16:48 +0000 Subject: [PATCH 09/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- woff2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index 99a0905..d160747 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,7 +2,7 @@ Name: woff2 Version: 1.0.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -74,6 +74,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.0.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Apr 06 2020 Tomas Popela - 1.0.2-8 - Package woff2_decompress, woff2_compress and woff2_info in a tools subpackage. Thanks to Tomasz Gąsior From 12307fb967141cc0d77603637025b90ec2b7e309 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:37:40 +0000 Subject: [PATCH 10/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- woff2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index d160747..d3348ec 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,7 +2,7 @@ Name: woff2 Version: 1.0.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -74,6 +74,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.0.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.0.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 4a6ffd733927857012321cb96e370fd98cc7f8be Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Mon, 19 Apr 2021 19:06:24 +0200 Subject: [PATCH 11/27] Get rid of all things RPATH See https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling --- woff2.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/woff2.spec b/woff2.spec index d3348ec..a3f3120 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,7 +2,7 @@ Name: woff2 Version: 1.0.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -40,7 +40,8 @@ Development files and utils for %{name} %build %cmake \ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ - -DCMAKE_INSTALL_LIBDIR="%{_libdir}" + -DCMAKE_INSTALL_LIBDIR="%{_libdir}" \ + -DCMAKE_SKIP_RPATH=TRUE %cmake_build %install @@ -74,6 +75,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Mon Apr 19 2021 Eike Rathke - 1.0.2-11 +- Get rid of all things RPATH + * Wed Jan 27 2021 Fedora Release Engineering - 1.0.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 0f1685dffea82b87025c1ca7976efb8723525728 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Thu, 10 Jun 2021 22:01:19 +0200 Subject: [PATCH 12/27] Add Coverity Scan fixes patch --- covscan.patch | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++ woff2.spec | 10 ++- 2 files changed, 172 insertions(+), 2 deletions(-) create mode 100644 covscan.patch diff --git a/covscan.patch b/covscan.patch new file mode 100644 index 0000000..41b7e1f --- /dev/null +++ b/covscan.patch @@ -0,0 +1,164 @@ +diff --git a/src/font.cc b/src/font.cc +index a45153e..0e9f5bf 100644 +--- a/src/font.cc ++++ b/src/font.cc +@@ -66,7 +66,7 @@ bool ReadTrueTypeFont(Buffer* file, const uint8_t* data, size_t len, + + std::map intervals; + for (uint16_t i = 0; i < font->num_tables; ++i) { +- Font::Table table; ++ Font::Table table = {}; + table.flag_byte = 0; + table.reuse_of = NULL; + if (!file->ReadU32(&table.tag) || +@@ -326,7 +326,7 @@ int NumGlyphs(const Font& font) { + return 0; + } + int index_fmt = IndexFormat(font); +- int loca_record_size = (index_fmt == 0 ? 2 : 4); ++ uint32_t loca_record_size = (index_fmt == 0 ? 2 : 4); + if (loca_table->length < loca_record_size) { + return 0; + } +diff --git a/src/glyph.h b/src/glyph.h +index f24056f..e870188 100644 +--- a/src/glyph.h ++++ b/src/glyph.h +@@ -22,17 +22,17 @@ namespace woff2 { + // is around. + class Glyph { + public: +- Glyph() : instructions_size(0), composite_data_size(0) {} ++ Glyph() {} + + // Bounding box. +- int16_t x_min; +- int16_t x_max; +- int16_t y_min; +- int16_t y_max; ++ int16_t x_min = 0; ++ int16_t x_max = 0; ++ int16_t y_min = 0; ++ int16_t y_max = 0; + + // Instructions. +- uint16_t instructions_size; +- const uint8_t* instructions_data; ++ uint16_t instructions_size = 0; ++ const uint8_t* instructions_data = 0; + + // Data model for simple glyphs. + struct Point { +@@ -43,9 +43,9 @@ class Glyph { + std::vector > contours; + + // Data for composite glyphs. +- const uint8_t* composite_data; +- uint32_t composite_data_size; +- bool have_instructions; ++ const uint8_t* composite_data = 0; ++ uint32_t composite_data_size = 0; ++ bool have_instructions = false; + }; + + // Parses the glyph from the given data. Returns false on parsing failure or +diff --git a/src/normalize.cc b/src/normalize.cc +index 6685e08..a819074 100644 +--- a/src/normalize.cc ++++ b/src/normalize.cc +@@ -97,7 +97,7 @@ bool MakeEditableBuffer(Font* font, int tableTag) { + table->buffer.resize(sz); + uint8_t* buf = &table->buffer[0]; + memcpy(buf, table->data, table->length); +- if (PREDICT_FALSE(sz > table->length)) { ++ if (PREDICT_FALSE(static_cast(sz) > table->length)) { + memset(buf + table->length, 0, sz - table->length); + } + table->data = buf; +@@ -213,7 +213,6 @@ bool FixChecksums(Font* font) { + size_t offset = 8; + StoreU32(0, &offset, head_buf); + uint32_t file_checksum = 0; +- uint32_t head_checksum = 0; + for (auto& i : font->tables) { + Font::Table* table = &i.second; + if (table->IsReused()) { +@@ -221,10 +220,6 @@ bool FixChecksums(Font* font) { + } + table->checksum = ComputeULongSum(table->data, table->length); + file_checksum += table->checksum; +- +- if (table->tag == kHeadTableTag) { +- head_checksum = table->checksum; +- } + } + + file_checksum += ComputeHeaderChecksum(*font); +diff --git a/src/woff2_dec.cc b/src/woff2_dec.cc +index 25e18c6..442baa5 100644 +--- a/src/woff2_dec.cc ++++ b/src/woff2_dec.cc +@@ -316,7 +316,7 @@ void ComputeBbox(unsigned int n_points, const Point* points, uint8_t* dst) { + offset = Store16(dst, offset, x_min); + offset = Store16(dst, offset, y_min); + offset = Store16(dst, offset, x_max); +- offset = Store16(dst, offset, y_max); ++ Store16(dst, offset, y_max); + } + + +diff --git a/src/woff2_enc.cc b/src/woff2_enc.cc +index ec00878..c0598f8 100644 +--- a/src/woff2_enc.cc ++++ b/src/woff2_enc.cc +@@ -331,20 +331,17 @@ bool ConvertTTFToWOFF2(const uint8_t *data, size_t length, + return false; + } + +- Table table; ++ Table table = {}; + table.tag = src_table.tag; + table.flags = src_table.flag_byte; + table.src_length = src_table.length; + table.transform_length = src_table.length; +- const uint8_t* transformed_data = src_table.data; + const Font::Table* transformed_table = + font.FindTable(src_table.tag ^ 0x80808080); + if (transformed_table != NULL) { + table.flags = transformed_table->flag_byte; + table.flags |= kWoff2FlagsTransform; + table.transform_length = transformed_table->length; +- transformed_data = transformed_table->data; +- + } + tables.push_back(table); + } +@@ -423,8 +420,6 @@ bool ConvertTTFToWOFF2(const uint8_t *data, size_t length, + // for reused tables, only the original has an updated offset + uint32_t table_offset = + table.IsReused() ? table.reuse_of->offset : table.offset; +- uint32_t table_length = +- table.IsReused() ? table.reuse_of->length : table.length; + std::pair tag_offset(table.tag, table_offset); + if (index_by_tag_offset.find(tag_offset) == index_by_tag_offset.end()) { + #ifdef FONT_COMPRESSION_BIN +diff --git a/src/woff2_info.cc b/src/woff2_info.cc +index 2b51adc..8ec9d36 100644 +--- a/src/woff2_info.cc ++++ b/src/woff2_info.cc +@@ -122,13 +122,13 @@ int main(int argc, char **argv) { + if (!woff2::Read255UShort(&file, &numFonts)) return 1; + printf("CollectionHeader 0x%08x %d fonts\n", version, numFonts); + +- for (auto i = 0; i < numFonts; i++) { ++ for (auto i = 0u; i < numFonts; i++) { + uint32_t numTables, flavor; + if (!woff2::Read255UShort(&file, &numTables)) return 1; + if (!file.ReadU32(&flavor)) return 1; + printf("CollectionFontEntry %d flavor 0x%08x %d tables\n", i, flavor, + numTables); +- for (auto j = 0; j < numTables; j++) { ++ for (auto j = 0u; j < numTables; j++) { + uint32_t table_idx; + if (!woff2::Read255UShort(&file, &table_idx)) return 1; + if (table_idx >= table_tags.size()) return 1; diff --git a/woff2.spec b/woff2.spec index a3f3120..8b0c621 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,13 +2,16 @@ Name: woff2 Version: 1.0.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Web Open Font Format 2.0 library License: MIT URL: https://github.com/google/woff2 Source0: https://github.com/google/woff2/archive/v%{version}/%{name}-%{version}.tar.gz +# https://github.com/google/woff2/pull/121 +Patch0: covscan.patch + BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: brotli-devel >= 1.0 @@ -35,7 +38,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Development files and utils for %{name} %prep -%autosetup -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{version} %build %cmake \ @@ -75,6 +78,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Thu Jun 10 2021 Eike Rathke - 1.0.2-12 +- Add Coverity Scan fixes patch + * Mon Apr 19 2021 Eike Rathke - 1.0.2-11 - Get rid of all things RPATH From 77d26d7ecd6d7ceeb7e9f519093faa3b3ec96fbb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:05:36 +0000 Subject: [PATCH 13/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- woff2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index 8b0c621..9652349 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,7 +2,7 @@ Name: woff2 Version: 1.0.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -78,6 +78,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.0.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jun 10 2021 Eike Rathke - 1.0.2-12 - Add Coverity Scan fixes patch From 3e3d14c94135e25b87510ba94c9d3d54cd281d8d Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Fri, 30 Jul 2021 14:54:07 +0200 Subject: [PATCH 14/27] Resolves: rhbz#1988046 FTBFS, use _vpath_builddir instead of _target_platform --- woff2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index 9652349..5feff68 100644 --- a/woff2.spec +++ b/woff2.spec @@ -51,7 +51,7 @@ Development files and utils for %{name} %cmake_install mkdir -p %{buildroot}%{_bindir}/ -cd %{_target_platform} +cd %{_vpath_builddir} install -m 755 woff2_decompress %{buildroot}%{_bindir}/ install -m 755 woff2_compress %{buildroot}%{_bindir}/ install -m 755 woff2_info %{buildroot}%{_bindir}/ From 641b59bb220b4ebd8aaaf42a3a0b8d7686502786 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:37:31 +0000 Subject: [PATCH 15/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- woff2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index 5feff68..d198867 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,7 +2,7 @@ Name: woff2 Version: 1.0.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -78,6 +78,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.0.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.0.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 39d6f96bb2d1d38b378ea50a7189e6691838b48c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:34:53 +0000 Subject: [PATCH 16/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- woff2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index d198867..0fe27f7 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,7 +2,7 @@ Name: woff2 Version: 1.0.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -78,6 +78,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.0.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.0.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From ba3ca85f54615a44cc171a4915c0b27672f49314 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Fri, 20 Jan 2023 18:24:04 +0100 Subject: [PATCH 17/27] Migrate to SPDX license IDs Actually this MIT is MIT so no change, but have it in %changelog. --- woff2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index 0fe27f7..115a7f6 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,7 +2,7 @@ Name: woff2 Version: 1.0.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -78,6 +78,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Fri Jan 20 2023 Eike Rathke - 1.0.2-16 +- Migrated to SPDX license IDs + * Sat Jul 23 2022 Fedora Release Engineering - 1.0.2-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From c53a91ac11182567fba717df1a2f8b34a6acb6e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:57:00 +0000 Subject: [PATCH 18/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- woff2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index 115a7f6..4255a1f 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,7 +2,7 @@ Name: woff2 Version: 1.0.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -78,6 +78,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.0.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jan 20 2023 Eike Rathke - 1.0.2-16 - Migrated to SPDX license IDs From 087c98a1936f539f9c3f1c3d5c5930cf14768601 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:19:53 +0000 Subject: [PATCH 19/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- woff2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index 4255a1f..3384672 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,7 +2,7 @@ Name: woff2 Version: 1.0.2 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -78,6 +78,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.0.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.0.2-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 58f2e03325b445de532ae9665d6db0cb1b62daee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:02:29 +0000 Subject: [PATCH 20/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- woff2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index 3384672..f44bf19 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,7 +2,7 @@ Name: woff2 Version: 1.0.2 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -78,6 +78,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.0.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.0.2-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From a353d9fa2fbd371287f7adc5310c2d248c3d2e75 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:29:46 +0000 Subject: [PATCH 21/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- woff2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index f44bf19..ad971e2 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,7 +2,7 @@ Name: woff2 Version: 1.0.2 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -78,6 +78,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.0.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.0.2-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 21b76935d50779fc4910fc39e2f677b3e3260971 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:12:02 +0000 Subject: [PATCH 22/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- woff2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index ad971e2..4c4b16d 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,7 +2,7 @@ Name: woff2 Version: 1.0.2 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -78,6 +78,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.0.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 1.0.2-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 216068f040b54795d9a0afca6bea4ea566221cdc Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Wed, 29 Jan 2025 12:10:33 +0100 Subject: [PATCH 23/27] Resolves: rhbz#2341551 include --- include-cstdint.patch | 10 ++++++++++ woff2.spec | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 include-cstdint.patch diff --git a/include-cstdint.patch b/include-cstdint.patch new file mode 100644 index 0000000..621d386 --- /dev/null +++ b/include-cstdint.patch @@ -0,0 +1,10 @@ +--- woff2-1.0.2/include/woff2/output.h.include-cstdint 2017-11-13 19:31:28.000000000 +0100 ++++ woff2-1.0.2/include/woff2/output.h 2025-01-29 12:00:47.581485251 +0100 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + namespace woff2 { + diff --git a/woff2.spec b/woff2.spec index 4c4b16d..400a4cd 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,7 +2,7 @@ Name: woff2 Version: 1.0.2 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -11,6 +11,7 @@ Source0: https://github.com/google/woff2/archive/v%{version}/%{name}-%{ve # https://github.com/google/woff2/pull/121 Patch0: covscan.patch +Patch1: include-cstdint.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -78,6 +79,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Wed Jan 29 2025 Eike Rathke - 1.0.2-22 +- Resolves: rhbz#2341551 include + * Sun Jan 19 2025 Fedora Release Engineering - 1.0.2-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 17ca5c29471d056c87268647df318f498d40844a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:30:41 +0000 Subject: [PATCH 24/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- woff2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index 400a4cd..89d693a 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,7 +2,7 @@ Name: woff2 Version: 1.0.2 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -79,6 +79,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.0.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jan 29 2025 Eike Rathke - 1.0.2-22 - Resolves: rhbz#2341551 include From b3170a7f4b370c5fd073ed7f222f0444d0e81b92 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Thu, 4 Sep 2025 13:21:08 +0530 Subject: [PATCH 25/27] Update cmake_minimum_required variable for CMake4.0 Change proposal(#2381636) --- woff2.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index 89d693a..b3b961a 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,7 +2,7 @@ Name: woff2 Version: 1.0.2 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -40,6 +40,7 @@ Development files and utils for %{name} %prep %autosetup -p1 -n %{name}-%{version} +sed -i 's/VERSION 2.8.6/VERSION 3.5...4.0/g' CMakeLists.txt %build %cmake \ @@ -79,6 +80,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Thu Sep 04 2025 Parag Nemade - 1.0.2-24 +- Update cmake_minimum_required variable for CMake4.0 Change proposal(#2381636) + * Fri Jul 25 2025 Fedora Release Engineering - 1.0.2-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 248df48f31692204aa8933bcaca04ce87b133528 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:20:02 +0000 Subject: [PATCH 26/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- woff2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index b3b961a..d1b4527 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,7 +2,7 @@ Name: woff2 Version: 1.0.2 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -80,6 +80,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.0.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Thu Sep 04 2025 Parag Nemade - 1.0.2-24 - Update cmake_minimum_required variable for CMake4.0 Change proposal(#2381636) From feae4efade655b2b44f1aba7c545d77e47c81949 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:53:50 +0000 Subject: [PATCH 27/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- woff2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/woff2.spec b/woff2.spec index d1b4527..d39f689 100644 --- a/woff2.spec +++ b/woff2.spec @@ -2,7 +2,7 @@ Name: woff2 Version: 1.0.2 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Web Open Font Format 2.0 library License: MIT @@ -80,6 +80,9 @@ cd - %{_libdir}/pkgconfig/libwoff2enc.pc %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.0.2-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 1.0.2-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild