[chromium-freeworld] Add patch for harfbuzz
by Leigh Scott
commit 7673a3de3d037b4e18a104a38f33464dd026f887
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Oct 23 00:56:53 2021 +0100
Add patch for harfbuzz
chromium-95-harfbuzz-3.patch | 31 +++++++++++++++++++++++++++++++
chromium-freeworld.spec | 5 +++++
2 files changed, 36 insertions(+)
---
diff --git a/chromium-95-harfbuzz-3.patch b/chromium-95-harfbuzz-3.patch
new file mode 100644
index 0000000..33fe955
--- /dev/null
+++ b/chromium-95-harfbuzz-3.patch
@@ -0,0 +1,31 @@
+From 9e00e702633c47c590a869bc66b5c2ceec09da50 Mon Sep 17 00:00:00 2001
+From: Dominik Röttsches <drott(a)chromium.org>
+Date: Tue, 28 Sep 2021 15:31:50 +0000
+Subject: [PATCH] Roll src/third_party/harfbuzz-ng/src/ 6602cbb70..a52c6df38 (80 commits)
+
+Fixed: 1252284
+Change-Id: Ie2ff99da5e41ca97b8881e1bd3e158881f4d5a8e
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3190252
+Commit-Queue: Dominik Röttsches <drott(a)chromium.org>
+Commit-Queue: Calder Kitagawa <ckitagawa(a)chromium.org>
+Auto-Submit: Dominik Röttsches <drott(a)chromium.org>
+Reviewed-by: Calder Kitagawa <ckitagawa(a)chromium.org>
+Reviewed-by: Anders Hartvoll Ruud <andruud(a)chromium.org>
+Cr-Commit-Position: refs/heads/main@{#925776}
+
+(only components/paint_preview/common/subset_font.cc)
+---
+
+diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc
+index 45daea7b1..43a448e 100644
+--- a/components/paint_preview/common/subset_font.cc
++++ b/components/paint_preview/common/subset_font.cc
+@@ -79,7 +79,7 @@
+ // Retain all variation information for OpenType variation fonts. See:
+ // https://docs.microsoft.com/en-us/typography/opentype/spec/otvaroverview
+ hb_set_t* skip_subset =
+- hb_subset_input_no_subset_tables_set(input.get()); // Owned by |input|.
++ hb_subset_input_set(input.get(), HB_SUBSET_SETS_NO_SUBSET_TABLE_TAG);
+ hb_set_add(skip_subset, HB_TAG('a', 'v', 'a', 'r'));
+ hb_set_add(skip_subset, HB_TAG('c', 'v', 'a', 'r'));
+ hb_set_add(skip_subset, HB_TAG('f', 'v', 'a', 'r'));
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index db4c490..6fff740 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -166,6 +166,7 @@ ExclusiveArch: x86_64 aarch64
# Gentoo patches:
Patch201: chromium-93-EnumTable-crash.patch
Patch202: chromium-95-maldoca-zlib.patch
+Patch1212: chromium-95-harfbuzz-3.patch
# Arch Linux patches:
Patch226: chromium-93-ffmpeg-4.4.patch
@@ -220,6 +221,10 @@ Patch1406: chromium-rpm-fusion-brand.patch
%autopatch -M1000 -p1
# Manually apply patches that need an ifdef
+%if %{system_harfbuzz}
+%patch1212 -p1
+%endif
+
%patch1227 -Rp1
%if 0%{?fedora} < 35
2 years, 6 months
[rfpkg-minimal] Update to 0.4.2
by Leigh Scott
commit 5ad0bcf4f2add66cbe603c1e7eb6213b9e50ef9b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Oct 22 18:17:53 2021 +0100
Update to 0.4.2
add-fedpkg-base-to-rfpkg-minimal.patch | 77 ----------------------------------
rfpkg-minimal.spec | 8 ++--
sources | 2 +-
3 files changed, 6 insertions(+), 81 deletions(-)
---
diff --git a/rfpkg-minimal.spec b/rfpkg-minimal.spec
index a0875be..4913e60 100644
--- a/rfpkg-minimal.spec
+++ b/rfpkg-minimal.spec
@@ -1,6 +1,6 @@
Name: rfpkg-minimal
-Version: 0.4.1
-Release: 4%{?dist}
+Version: 0.4.2
+Release: 1%{?dist}
Summary: Fork of fedpkg-minimal for RPM Fusion
# Licensing is unclear; LICENSE is the GPLv2 but bin/fedpkg (upstream)
@@ -10,7 +10,6 @@ License: GPLv2
URL: https://github.com/rpmfusion-infra/rfpkg-minimal
Source0: %{url}/archive/%{version}/rfpkg-minimal-%{version}.tar.gz
-Patch0: %{url}/pull/2.patch#/add-fedpkg-base-to-rfpkg-minimal.patch
BuildArch: noarch
@@ -43,6 +42,9 @@ install -pm 755 bin/rfpkg-minimal %{buildroot}%{_bindir}/rfpkg-minimal
%license LICENSE
%changelog
+* Fri Oct 22 2021 Leigh Scott <leigh123linux(a)gmail.com> - 0.4.2-1
+- Update to 0.4.2
+
* Fri Oct 22 2021 Leigh Scott <leigh123linux(a)gmail.com> - 0.4.1-4
- Increase timeout to 900 seconds
diff --git a/sources b/sources
index 1881ccd..e0ebd9d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7525b36e04e94103bac88c07de923f6b rfpkg-minimal-0.4.1.tar.gz
+SHA512 (rfpkg-minimal-0.4.2.tar.gz) = 776314ef37b862f6329aa36071fd9b4ffa88d79190bd2ae4905c217d50dd1f0ca1b141d665cb602aeb6560695386101114491dc5710911f0b8c163e977648507
2 years, 6 months