From bcdf02956188f80a50d34e835f183b92aa742dc3 Mon Sep 17 00:00:00 2001 From: jk Date: Sat, 5 Dec 2020 23:34:59 -0500 Subject: upgpkg: ungoogled-chromium 87.0.4280.88-1 upstream release --- .SRCINFO | 17 ++--- PKGBUILD | 21 +++--- chromium-skia-harmony.patch | 14 ---- chromium.install | 16 ---- subpixel-anti-aliasing-in-FreeType-2.8.1.patch | 100 +++++++++++++++++++++++++ 5 files changed, 117 insertions(+), 51 deletions(-) delete mode 100644 chromium-skia-harmony.patch delete mode 100644 chromium.install create mode 100644 subpixel-anti-aliasing-in-FreeType-2.8.1.patch diff --git a/.SRCINFO b/.SRCINFO index 02e742c..836766b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,8 @@ pkgbase = ungoogled-chromium pkgdesc = A lightweight approach to removing Google web service dependency - pkgver = 87.0.4280.66 + pkgver = 87.0.4280.88 pkgrel = 1 url = https://github.com/Eloston/ungoogled-chromium - install = chromium.install arch = x86_64 license = BSD makedepends = python @@ -58,20 +57,20 @@ pkgbase = ungoogled-chromium optdepends = kwallet: for storing passwords in KWallet on KDE desktops provides = chromium conflicts = chromium - source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-87.0.4280.66.tar.xz - source = ungoogled-chromium-87.0.4280.67-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/87.0.4280.67-1.tar.gz - source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-87.0.4280.88.tar.xz + source = ungoogled-chromium-87.0.4280.88-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/87.0.4280.88-1.tar.gz + source = https://github.com/foutrelis/chromium-launcher/archive/v6/chromium-launcher-6.tar.gz source = chromium-drirc-disable-10bpc-color-configs.conf source = https://github.com/stha09/chromium-patches/releases/download/chromium-87-patchset-9/chromium-87-patchset-9.tar.xz source = wayland-egl.patch - source = chromium-skia-harmony.patch - sha256sums = 29a8e4ea82edec2fdcf34ece68323bec7ab90f3d5669e6b77f58cff9c278f741 - sha256sums = 158d1210be8d0f72ec09724a22907b5a737c3a25b19632d2eb93ebdfbe3f1ac9 + source = subpixel-anti-aliasing-in-FreeType-2.8.1.patch + sha256sums = 3e4645328735ef60db78d1a313efb3770a3edeaede90d076414df52f567a09c0 + sha256sums = 79fad3ac0f247732e4326992698e4cf2c643a53b7e101b3b62768c461195fba2 sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1 sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb sha256sums = c99934bcd2f3ae8ea9620f5f59a94338b2cf739647f04c28c8a551d9083fa7e9 sha256sums = bf86923eaee5529ab9fb6148bd6c33a73c8746ab1b4ade0cd3b761109bc55826 - sha256sums = 771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1 + sha256sums = 1e2913e21c491d546e05f9b4edf5a6c7a22d89ed0b36ef692ca6272bcd5faec6 pkgname = ungoogled-chromium diff --git a/PKGBUILD b/PKGBUILD index 5577622..6c872d7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,16 +9,16 @@ # Contributor: Daniel J Griffiths pkgname=ungoogled-chromium -pkgver=87.0.4280.66 +pkgver=87.0.4280.88 pkgrel=1 _launcher_ver=6 _gcc_patchset=9 _pkgname=$(echo $pkgname | cut -d\- -f1-2) _pkgver=$(echo $pkgver | cut -d\. -f1-4) # ungoogled chromium variables -_uc_ver=87.0.4280.67-1 +_uc_ver=$pkgver-1 _uc_usr=Eloston -_uc_sum='158d1210be8d0f72ec09724a22907b5a737c3a25b19632d2eb93ebdfbe3f1ac9' +_uc_sum='79fad3ac0f247732e4326992698e4cf2c643a53b7e101b3b62768c461195fba2' _uc_url="$_pkgname-$_uc_ver.tar.gz::https://github.com/$_uc_usr/ungoogled-chromium/archive/$_uc_ver.tar.gz" pkgdesc="A lightweight approach to removing Google web service dependency" arch=('x86_64') @@ -38,21 +38,20 @@ optdepends=('pepper-flash: support for Flash content' 'kwallet: for storing passwords in KWallet on KDE desktops') provides=('chromium') conflicts=('chromium') -install=chromium.install source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_pkgver.tar.xz $_uc_url - chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz + https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz chromium-drirc-disable-10bpc-color-configs.conf https://github.com/stha09/chromium-patches/releases/download/chromium-${pkgver%%.*}-patchset-$_gcc_patchset/chromium-${pkgver%%.*}-patchset-$_gcc_patchset.tar.xz wayland-egl.patch - chromium-skia-harmony.patch) -sha256sums=('29a8e4ea82edec2fdcf34ece68323bec7ab90f3d5669e6b77f58cff9c278f741' + subpixel-anti-aliasing-in-FreeType-2.8.1.patch) +sha256sums=('3e4645328735ef60db78d1a313efb3770a3edeaede90d076414df52f567a09c0' $_uc_sum '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1' 'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb' 'c99934bcd2f3ae8ea9620f5f59a94338b2cf739647f04c28c8a551d9083fa7e9' 'bf86923eaee5529ab9fb6148bd6c33a73c8746ab1b4ade0cd3b761109bc55826' - '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1') + '1e2913e21c491d546e05f9b4edf5a6c7a22d89ed0b36ef692ca6272bcd5faec6') # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py # Keys are the names in the above script; values are the dependencies in Arch @@ -94,14 +93,12 @@ prepare() { third_party/libxml/chromium/*.cc # Upstream fixes + patch -Np1 -d third_party/skia <../subpixel-anti-aliasing-in-FreeType-2.8.1.patch # Fixes for building with libstdc++ instead of libc++ patch -Np1 -i ../patches/chromium-87-ServiceWorkerContainerHost-crash.patch patch -Np1 -i ../patches/chromium-87-openscreen-include.patch - # https://crbug.com/skia/6663#c10 - patch -Np0 -i ../chromium-skia-harmony.patch - # Wayland/EGL regression (crbug #1071528 #1071550) patch -Np1 -i ../wayland-egl.patch @@ -191,7 +188,7 @@ build() { CXXFLAGS+=' -Wno-unknown-warning-option' msg2 'Configuring Chromium' - gn gen out/Release --args="${_flags[*]}" --script-executable=/usr/bin/python2 + gn gen out/Release --args="${_flags[*]}" --script-executable=python2 msg2 'Building Chromium' ninja -C out/Release chrome chrome_sandbox chromedriver } diff --git a/chromium-skia-harmony.patch b/chromium-skia-harmony.patch deleted file mode 100644 index c96d07e..0000000 --- a/chromium-skia-harmony.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-07-19 11:08:34.770972665 +0000 -+++ third_party/skia/src/ports/SkFontHost_FreeType.cpp 2019-07-19 11:08:44.274442065 +0000 -@@ -128,9 +128,9 @@ public: - : fGetVarDesignCoordinates(nullptr) - , fGetVarAxisFlags(nullptr) - , fLibrary(nullptr) -- , fIsLCDSupported(false) -+ , fIsLCDSupported(true) - , fLightHintingIsYOnly(false) -- , fLCDExtra(0) -+ , fLCDExtra(2) - { - if (FT_New_Library(&gFTMemory, &fLibrary)) { - return; diff --git a/chromium.install b/chromium.install deleted file mode 100644 index c2b5000..0000000 --- a/chromium.install +++ /dev/null @@ -1,16 +0,0 @@ -post_upgrade() { - if (($(vercmp $2 42.0.2311.90-1) < 0)); then - echo ':: This Chromium package no longer supports custom flags passed via the' - echo ' /etc/chromium/default file (or any other files under /etc/chromium/).' - echo - echo ' The new /usr/bin/chromium launcher script will automatically detect' - echo ' Pepper Flash (if installed) and pass the correct flags to Chromium.' - echo - echo ' If you need to pass extra command-line arguments to Chromium, you' - echo ' can put them in a "chromium-flags.conf" file under $HOME/.config/' - echo ' (or $XDG_CONFIG_HOME). Arguments are split on whitespace and shell' - echo ' quoting rules apply but no further parsing is performed.' - fi -} - -# vim:set ts=2 sw=2 et: diff --git a/subpixel-anti-aliasing-in-FreeType-2.8.1.patch b/subpixel-anti-aliasing-in-FreeType-2.8.1.patch new file mode 100644 index 0000000..c11b512 --- /dev/null +++ b/subpixel-anti-aliasing-in-FreeType-2.8.1.patch @@ -0,0 +1,100 @@ +From f25787b72c20e97cdeb74e037dc1ff56a88b45c6 Mon Sep 17 00:00:00 2001 +From: Ben Wagner +Date: Tue, 1 Dec 2020 20:22:00 -0500 +Subject: [PATCH] Subpixel anti-aliasing in FreeType 2.8.1+ + +FreeType 2.8.1 and later always provide some form of subpixel +anti-aliasing. + +Bug: skia:10950,skia:6663 +Change-Id: I666cc942e73b73073cdabf900c25faa10d9aaf0f +Reviewed-on: https://skia-review.googlesource.com/c/skia/+/339861 +Reviewed-by: Herb Derby +Commit-Queue: Ben Wagner +--- + src/ports/SkFontHost_FreeType.cpp | 33 ++++++++++++++++++++----------- + 1 file changed, 22 insertions(+), 11 deletions(-) + +diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp +index 990eff4f5e..c0aeb792da 100644 +--- a/src/ports/SkFontHost_FreeType.cpp ++++ b/src/ports/SkFontHost_FreeType.cpp +@@ -32,6 +32,7 @@ + #include "src/utils/SkMatrix22.h" + + #include ++#include + + #include + #include FT_ADVANCES_H +@@ -147,13 +148,16 @@ public: + // *reinterpret_cast(&procPtr) = dlsym(self, "proc"); + // because clang has not implemented DR573. See http://clang.llvm.org/cxx_dr_status.html . + +- FT_Int major, minor, patch; +- FT_Library_Version(fLibrary, &major, &minor, &patch); ++ using Version = std::tuple; ++ Version version; ++ FT_Library_Version(fLibrary, &std::get<0>(version), ++ &std::get<1>(version), ++ &std::get<2>(version)); + + #if SK_FREETYPE_MINIMUM_RUNTIME_VERSION >= 0x02070100 + fGetVarDesignCoordinates = FT_Get_Var_Design_Coordinates; + #elif SK_FREETYPE_MINIMUM_RUNTIME_VERSION & SK_FREETYPE_DLOPEN +- if (major > 2 || ((major == 2 && minor > 7) || (major == 2 && minor == 7 && patch >= 0))) { ++ if (Version(2,7,0) <= version) { + //The FreeType library is already loaded, so symbols are available in process. + void* self = dlopen(nullptr, RTLD_LAZY); + if (self) { +@@ -166,7 +170,7 @@ public: + #if SK_FREETYPE_MINIMUM_RUNTIME_VERSION >= 0x02070200 + FT_Set_Default_Properties(fLibrary); + #elif SK_FREETYPE_MINIMUM_RUNTIME_VERSION & SK_FREETYPE_DLOPEN +- if (major > 2 || ((major == 2 && minor > 7) || (major == 2 && minor == 7 && patch >= 1))) { ++ if (Version(2,7,1) <= version) { + //The FreeType library is already loaded, so symbols are available in process. + void* self = dlopen(nullptr, RTLD_LAZY); + if (self) { +@@ -185,7 +189,7 @@ public: + #if SK_FREETYPE_MINIMUM_RUNTIME_VERSION >= 0x02080000 + fLightHintingIsYOnly = true; + #else +- if (major > 2 || ((major == 2 && minor > 8) || (major == 2 && minor == 8 && patch >= 0))) { ++ if (Version(2,8,0) <= version) { + fLightHintingIsYOnly = true; + } + #endif +@@ -194,7 +198,7 @@ public: + #if SK_FREETYPE_MINIMUM_RUNTIME_VERSION >= 0x02080100 + fGetVarAxisFlags = FT_Get_Var_Axis_Flags; + #elif SK_FREETYPE_MINIMUM_RUNTIME_VERSION & SK_FREETYPE_DLOPEN +- if (major > 2 || ((major == 2 && minor > 7) || (major == 2 && minor == 7 && patch >= 0))) { ++ if (Version(2,7,0) <= version) { + //The FreeType library is already loaded, so symbols are available in process. + void* self = dlopen(nullptr, RTLD_LAZY); + if (self) { +@@ -204,11 +208,18 @@ public: + } + #endif + +- // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs. +- // The default has changed over time, so this doesn't mean the same thing to all users. +- if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) { +- fIsLCDSupported = true; +- fLCDExtra = 2; //Using a filter adds one full pixel to each side. ++ fIsLCDSupported = ++ // Subpixel anti-aliasing may be unfiltered until the LCD filter is set. ++ // Newer versions may still need this, so this test with side effects must come first. ++ // The default has changed over time, so this doesn't mean the same thing to all users. ++ (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) || ++ ++ // In 2.8.1 and later FreeType always provides some form of subpixel anti-aliasing. ++ ((SK_FREETYPE_MINIMUM_RUNTIME_VERSION) >= 0x02080100) || ++ (Version(2,8,1) <= version); ++ ++ if (fIsLCDSupported) { ++ fLCDExtra = 2; // Using a filter may require up to one full pixel to each side. + } + } + ~FreeTypeLibrary() { -- cgit v1.2.3