From 27ff9a9cfc0ce4f24f3f12edd8bf8d1e7649b4cf Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 5 Jun 2018 14:21:44 -0400 Subject: [PATCH] fix epel fonts --- .gitignore | 14 ++++++++++++++ chromium.spec | 51 +++++++++++++++++++++++++++++++++++++++++++++------ sources | 14 ++++++++++++++ 3 files changed, 73 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index adc3998..bf98cac 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,17 @@ /chromium-67.0.3396.62-clean.tar.xz /gelasio.zip /MuktiNarrow-0.94.tar.bz2 +/NotoSansCJKjp-hinted.zip +/lohit-gurmukhi-ttf-2.91.2.tar.gz +/Arimo-BoldItalic.ttf +/Arimo-Bold.ttf +/Arimo-Italic.ttf +/Arimo-Regular.ttf +/Cousine-BoldItalic.ttf +/Cousine-Bold.ttf +/Cousine-Italic.ttf +/Cousine-Regular.ttf +/Tinos-BoldItalic.ttf +/Tinos-Bold.ttf +/Tinos-Italic.ttf +/Tinos-Regular.ttf diff --git a/chromium.spec b/chromium.spec index 3de1213..0a596a9 100644 --- a/chromium.spec +++ b/chromium.spec @@ -443,16 +443,34 @@ BuildRequires: pkgconfig(gnome-keyring-1) # remote desktop needs this BuildRequires: pam-devel BuildRequires: systemd +# for third_party/test_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 +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-croscore-arimo-fonts BuildRequires: google-croscore-cousine-fonts +BuildRequires: google-croscore-tinos-fonts +BuildRequires: google-noto-sans-cjk-jp-fonts +BuildRequires: lohit-gurmukhi-fonts +%endif BuildRequires: dejavu-sans-fonts BuildRequires: thai-scalable-garuda-fonts BuildRequires: lohit-devanagari-fonts -BuildRequires: lohit-gurmukhi-fonts BuildRequires: lohit-tamil-fonts -BuildRequires: google-noto-sans-cjk-jp-fonts BuildRequires: google-noto-sans-khmer-fonts -BuildRequires: google-croscore-tinos-fonts # using the built from source version on aarch64 BuildRequires: ninja-build @@ -872,13 +890,34 @@ unzip %{SOURCE14} tar xf %{SOURCE15} mv MuktiNarrow0.94/MuktiNarrow.ttf . rm -rf MuktiNarrow0.94 +%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} . +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/google-croscore/Arimo-*.ttf . cp -a /usr/share/fonts/google-croscore/Cousine-*.ttf . +cp -a /usr/share/fonts/google-croscore/Tinos-*.ttf . +cp -a /usr/share/fonts/lohit-gurmukhi/Lohit-Gurmukhi.ttf . +cp -a /usr/share/fonts/google-noto-cjk/NotoSansCJKjp-Regular.otf . +%endif cp -a /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf . cp -a /usr/share/fonts/thai-scalable/Garuda.ttf . -cp -a /usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf /usr/share/fonts/lohit-gurmukhi/Lohit-Gurmukhi.ttf /usr/share/fonts/lohit-tamil/Lohit-Tamil.ttf . -cp -a /usr/share/fonts/google-noto-cjk/NotoSansCJKjp-Regular.otf /usr/share/fonts/google-noto/NotoSansKhmer-Regular.ttf . -cp -a /usr/share/fonts/google-croscore/Tinos-*.ttf . +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 . popd # Core defines are flags that are true for both the browser and headless. diff --git a/sources b/sources index ac757ae..68e84f7 100644 --- a/sources +++ b/sources @@ -2,3 +2,17 @@ SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b180 SHA512 (chromium-67.0.3396.62-clean.tar.xz) = 5c7784a70eca7e5cfc9442190c7addc2f14b6038431135062eed9e5bf0df684b37eb691316b889f801be69cf3837810de7bf8330cf1411b5c22b0722c806f7da 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