diff --git a/GardinerModBug.ttf b/GardinerModBug.ttf deleted file mode 100644 index 09f4c3e..0000000 Binary files a/GardinerModBug.ttf and /dev/null differ diff --git a/GardinerModCat.ttf b/GardinerModCat.ttf deleted file mode 100644 index 6f6e560..0000000 Binary files a/GardinerModCat.ttf and /dev/null differ diff --git a/chromium-disable-font-tests.patch b/chromium-disable-font-tests.patch new file mode 100644 index 0000000..ae38a8a --- /dev/null +++ b/chromium-disable-font-tests.patch @@ -0,0 +1,26 @@ +description: disable building font tests +author: Michael Gilbert + +--- a/skia/BUILD.gn ++++ b/skia/BUILD.gn +@@ -860,7 +860,7 @@ group("test_fonts_resources") { + if (is_apple) { + deps += [ ":test_fonts_bundle_data" ] + data_deps += [ ":test_fonts_bundle_data" ] +- } else { ++ } else if (false) { + deps += [ "//third_party/test_fonts" ] + data_deps += [ "//third_party/test_fonts" ] + } +--- a/third_party/test_fonts/fontconfig/BUILD.gn ++++ b/third_party/test_fonts/fontconfig/BUILD.gn +@@ -8,9 +8,7 @@ if (is_linux || is_chromeos) { + group("test_support") { + testonly = true + public_deps = [ ":fontconfig_util_linux" ] +- data_deps = [ "//third_party/test_fonts" ] + if (current_toolchain == host_toolchain) { +- data_deps += [ ":do_generate_fontconfig_caches" ] + } + } + diff --git a/chromium.spec b/chromium.spec index d7d4fe9..135bf4f 100644 --- a/chromium.spec +++ b/chromium.spec @@ -265,6 +265,9 @@ Patch11: chromium-93.0.4577.63-py3-bootstrap.patch # Add "Fedora" to the user agent string Patch12: chromium-101.0.4951.41-fedora-user-agent.patch +# debian patch, disable font-test +Patch20: chromium-disable-font-tests.patch + # Needs to be submitted.. Patch51: chromium-96.0.4664.45-gcc-remoting-constexpr.patch @@ -411,13 +414,6 @@ Source19: https://nodejs.org/dist/latest-v16.x/node-%{nodejs_version}-linux-x64. Source21: https://nodejs.org/dist/latest-v16.x/node-%{nodejs_version}-linux-arm64.tar.xz %endif -# Unpackaged fonts -Source14: https://fontlibrary.org/assets/downloads/gelasio/4d610887ff4d445cbc639aae7828d139/gelasio.zip -Source15: http://download.savannah.nongnu.org/releases/freebangfont/MuktiNarrow-0.94.tar.bz2 -Source16: https://github.com/web-platform-tests/wpt/raw/master/fonts/Ahem.ttf -Source17: GardinerModBug.ttf -Source18: GardinerModCat.ttf - %if %{clang} %if 0%{?rhel} == 7 BuildRequires: llvm-toolset-%{llvm_toolset_version} @@ -664,51 +660,6 @@ BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pam-devel BuildRequires: systemd -# fonts -BuildRequires: dejavu-sans-fonts -BuildRequires: thai-scalable-garuda-fonts -BuildRequires: lohit-devanagari-fonts -BuildRequires: lohit-tamil-fonts -BuildRequires: google-noto-sans-khmer-fonts -BuildRequires: google-noto-emoji-color-fonts - -%if 0%{?rhel} >= 7 -Source100: https://github.com/google/fonts/blob/master/apache/arimo/Arimo-Bold.ttf -Source101: https://github.com/google/fonts/blob/master/apache/arimo/Arimo-BoldItalic.ttf -Source102: https://github.com/google/fonts/blob/master/apache/arimo/Arimo-Italic.ttf -Source103: https://github.com/google/fonts/blob/master/apache/arimo/Arimo-Regular.ttf -Source104: https://github.com/google/fonts/blob/master/apache/cousine/Cousine-Bold.ttf -Source105: https://github.com/google/fonts/blob/master/apache/cousine/Cousine-BoldItalic.ttf -Source106: https://github.com/google/fonts/blob/master/apache/cousine/Cousine-Italic.ttf -Source107: https://github.com/google/fonts/blob/master/apache/cousine/Cousine-Regular.ttf -Source108: https://github.com/google/fonts/blob/master/apache/tinos/Tinos-Bold.ttf -Source109: https://github.com/google/fonts/blob/master/apache/tinos/Tinos-BoldItalic.ttf -Source110: https://github.com/google/fonts/blob/master/apache/tinos/Tinos-Italic.ttf -Source111: https://github.com/google/fonts/blob/master/apache/tinos/Tinos-Regular.ttf -%else -BuildRequires: google-croscore-arimo-fonts -BuildRequires: google-croscore-cousine-fonts -BuildRequires: google-croscore-tinos-fonts -%endif - -%if 0%{?rhel} == 7 -Source112: https://releases.pagure.org/lohit/lohit-gurmukhi-ttf-2.91.2.tar.gz -Source113:https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKjp-hinted.zip -%else -BuildRequires: google-noto-sans-cjk-jp-fonts -BuildRequires: lohit-gurmukhi-fonts -%endif - -%if 0%{?fedora} >= 30 -BuildRequires: google-noto-sans-symbols2-fonts -%else -Source114: https://github.com/googlefonts/noto-fonts/blob/master/unhinted/NotoSansSymbols2/NotoSansSymbols2-Regular.ttf -%endif - -# There used to be a copy of this font file here, but it looks like NotoSansTibetan is no more. -# And yet, the chromium code still wants it. -Source115: https://github.com/googlefonts/noto-fonts/blob/master/hinted/NotoSansTibetan/NotoSansTibetan-Regular.ttf - # using the built from source version on aarch64 BuildRequires: ninja-build @@ -957,6 +908,8 @@ udev. %patch9 -p1 -b .widevine-no-download %patch11 -p1 -b .py3 +%patch20 -p1 -b .disable-font-test + # Short term fixes (usually gcc and backports) %patch51 -p1 -b .gcc-remoting-constexpr @@ -1057,78 +1010,6 @@ udev. find -type f \( -iname "*.py" \) -exec sed -i '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python3}=' {} + -# Unpack fonts -pushd third_party/test_fonts -mkdir test_fonts -cd test_fonts -unzip %{SOURCE14} -tar xf %{SOURCE15} -mv MuktiNarrow0.94/MuktiNarrow.ttf . -rm -rf MuktiNarrow0.94 -cp %{SOURCE16} . -cp %{SOURCE17} . -cp %{SOURCE18} . -%if 0%{?rhel} >= 7 -cp %{SOURCE100} . -cp %{SOURCE101} . -cp %{SOURCE102} . -cp %{SOURCE103} . -cp %{SOURCE104} . -cp %{SOURCE105} . -cp %{SOURCE106} . -cp %{SOURCE107} . -cp %{SOURCE108} . -cp %{SOURCE109} . -cp %{SOURCE110} . -cp %{SOURCE111} . -%else -%if 0%{?fedora} >= 33 -cp -a /usr/share/fonts/google-arimo-fonts/Arimo-*.ttf . -cp -a /usr/share/fonts/google-cousine-fonts/Cousine-*.ttf . -cp -a /usr/share/fonts/google-tinos-fonts/Tinos-*.ttf . -%else -cp -a /usr/share/fonts/google-croscore/Arimo-*.ttf . -cp -a /usr/share/fonts/google-croscore/Cousine-*.ttf . -cp -a /usr/share/fonts/google-croscore/Tinos-*.ttf . -%endif -%endif - -%if 0%{?rhel} == 7 -tar xf %{SOURCE112} -mv lohit-gurmukhi-ttf-2.91.2/Lohit-Gurmukhi.ttf . -rm -rf lohit-gurmukhi-ttf-2.91.2 -unzip %{SOURCE113} -%else -cp -a /usr/share/fonts/lohit-gurmukhi/Lohit-Gurmukhi.ttf . -cp -a /usr/share/fonts/google-noto-cjk/NotoSansCJKjp-Regular.otf . -%endif - -%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 -cp -a /usr/share/fonts/dejavu-sans-fonts/DejaVuSans.ttf /usr/share/fonts/dejavu-sans-fonts/DejaVuSans-Bold.ttf . -%else -cp -a /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf . -%endif - -%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 -cp -a /usr/share/fonts/thai-scalable/Garuda.otf . -sed -i 's|Garuda.ttf|Garuda.otf|g' ../BUILD.gn -%else -cp -a /usr/share/fonts/thai-scalable/Garuda.ttf . -%endif - -cp -a /usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf /usr/share/fonts/lohit-tamil/Lohit-Tamil.ttf . -cp -a /usr/share/fonts/google-noto/NotoSansKhmer-Regular.ttf . -cp -a /usr/share/fonts/google-noto-emoji/NotoColorEmoji.ttf . - -%if 0%{?fedora} >= 30 -cp -a /usr/share/fonts/google-noto/NotoSansSymbols2-Regular.ttf . -%else -cp -a %{SOURCE114} . -%endif - -cp -a %{SOURCE115} . -popd - %if 0%{?rhel} == 8 pushd third_party/node/linux %ifarch x86_64 diff --git a/sources b/sources index 4166069..1ebeaa9 100644 --- a/sources +++ b/sources @@ -1,22 +1,3 @@ -SHA512 (gelasio.zip) = 0a22def3eca8848161ee72453dc5f97cc52ed09ffe21834152f2535d3a71f404cdf1f6e1809564bacb86aae75278cbcb96cae52b537d3ccdc299b60d6d0bc53e -SHA512 (MuktiNarrow-0.94.tar.bz2) = f7abd429e2591eaa047d1ac982d97fa67dc1480c42e55b2a97861abd90918704dce90b6bb27dec7b6d696f188017a74de54a7b7f45281f0515923b90300959d1 -SHA512 (NotoSansCJKjp-hinted.zip) = e7bcbc53a10b8ec3679dcade5a8a94cea7e1f60875ab38f2193b4fa8e33968e1f0abc8184a3df1e5210f6f5c731f96c727c6aa8f519423a29707d2dee5ada193 -SHA512 (lohit-gurmukhi-ttf-2.91.2.tar.gz) = 714ed72d201e7f8956d24e9d9f1526207beb91a604e88c02a8b0d145f19d9bfe1408ca290d1665ebef462ab3854365dcd9850529803277738e2585addf3e280a -SHA512 (Arimo-BoldItalic.ttf) = cb1f411f2630f2754dfb0244b3c56fde43650d603512d47c143bc0f24028da4d7ca2b35a633226ef9c502b97c63cfbd5a6d696934b3e60b2a98ad879b113a4c4 -SHA512 (Arimo-Bold.ttf) = 2853e5f41e6899baf226db2578aba09f2f88085eaea02da024621492d21e1af8bdefdefd354ea23dc4d5de5cb0d554085040a0108820f213e86dd532986fdb41 -SHA512 (Arimo-Italic.ttf) = 56ef918e5811dcd375e6cd8d79dc69f4db75d544639c0f6ac3a0343b3b4ef94b7dee5a6066f1558d8747a32bbee074256be68b943ff31cfbd2f5f32acfa7c1c5 -SHA512 (Arimo-Regular.ttf) = 05e6aa6b785b0038a8e0e0a8a618a1b8e907a700be302148eaebc91cfac3c9e2d9acf90b9d077ff3b9ff54bd5f8a9c522a039cff6103cdeee54be29b6a0b355f -SHA512 (Cousine-BoldItalic.ttf) = 2125aa9f5db4ae4a3725d308b6afbfbce5957f3c96a3c5fcba8ebf5cd167017d9c7023391e947ed68d12fa97e2cba3f156a3acca276d9f5ed50df7d78c07f918 -SHA512 (Cousine-Bold.ttf) = 1759fd23419ae0e1bfc9be92abb9cb0c74084ce85e7f53c055d86ec3d62da83169d0d67ed96fd4e496b28acf382933d63448459108b109d8202db7f18f05caab -SHA512 (Cousine-Italic.ttf) = ec3fc9d940b748dbbc64aa66184413a78ae2b085181eed563449df044b891e951e8feebd865be5be42f0cd001acf5bdce9084a006f9b5be32f096f7df0dc7700 -SHA512 (Cousine-Regular.ttf) = a665a6a4a5583079eb87509e2da7d6bd06965e6a7655217302b088caef942ae9ad63e6cffda18d0001fc9ab2284836766843e46bfdacd188b54f39d7855f36a0 -SHA512 (Tinos-BoldItalic.ttf) = 2574de2add94ef976b731fac688951fab49574c9b0ccd259ba647ea3598ca026bcfb88e2ea3f19effb3af71fdc0eb5fa9973f0b6e996c22185c5f2aab5a23fdd -SHA512 (Tinos-Bold.ttf) = 54aeca804c06a4d5c57ade596e73df91a6a1c4401c4aadba55d987b3fb73045d35f3df02678b59abb77c4914ec741755536c0adf808c931e4b77848c52c229c4 -SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0e22a16414278217f37497b904a18540273c0e2d79d4f1faabde3b0eb5446283b318c73bafb38 -SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f -SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd -SHA512 (NotoSansSymbols2-Regular.ttf) = 2644b42c3fdccfe12395f9b61553aced169a0f1dc09f5a0fd7898e9d0a372ee4422b6b1cdab3c86ecc91db437e9ae8a951e64e85edc3ac9e9fca428852dbb2ad -SHA512 (NotoSansTibetan-Regular.ttf) = fb5a48fcaea80eebe7d692f6fcf00d59d47658a358d0ec8e046fc559873f88bd595b2da474d2826abd9e9305f3741c69058d867b1e6048f37fe7d71b5d3af36a SHA512 (node-v16.17.0-linux-x64.tar.xz) = aedfeeb71420a7fbcb07fbc4c5d2ba74ffe4f88c15998809346a84148132ec866dbae4e848531a2a77ca41413f442e1046f981d4f188bdf667faf88069aa28cd SHA512 (node-v16.17.0-linux-arm64.tar.xz) = ae4aabc2389779c9e1b4a15622cae3ba50e0c313ca3d7a1dc7b2344df06ade1f303d6a75b941d37e2a0ef368cf047c862a822a893684494f55446afd6ab0610e SHA512 (chromium-110.0.5481.77-clean.tar.xz) = 67ebefa3ccbb9c03dbf78cd7818f2b80b2c1df4632b8ba9116dc4a6d7b78f30b3dbaa4fa4c09726b4c192aab5fab8ceaae026f65d6f2d2784c0027645cc76007