[arch-commits] Commit in chromium/repos (3 files)

Evangelos Foutras foutrelis at archlinux.org
Wed Feb 3 12:15:46 UTC 2021


    Date: Wednesday, February 3, 2021 @ 12:15:46
  Author: foutrelis
Revision: 407142

archrelease: copy trunk to staging-x86_64

Added:
  chromium/repos/staging-x86_64/
  chromium/repos/staging-x86_64/PKGBUILD
    (from rev 407141, chromium/trunk/PKGBUILD)
  chromium/repos/staging-x86_64/subpixel-anti-aliasing-in-FreeType-2.8.1.patch
    (from rev 407141, chromium/trunk/subpixel-anti-aliasing-in-FreeType-2.8.1.patch)

------------------------------------------------+
 PKGBUILD                                       |  238 +++++++++++++++++++++++
 subpixel-anti-aliasing-in-FreeType-2.8.1.patch |  100 +++++++++
 2 files changed, 338 insertions(+)

Copied: chromium/repos/staging-x86_64/PKGBUILD (from rev 407141, chromium/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2021-02-03 12:15:46 UTC (rev 407142)
@@ -0,0 +1,238 @@
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=chromium
+pkgver=88.0.4324.146
+pkgrel=2
+_launcher_ver=7
+_gcc_patchset=3
+pkgdesc="A web browser built for speed, simplicity, and security"
+arch=('x86_64')
+url="https://www.chromium.org/Home"
+license=('BSD')
+depends=('gtk3' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libcups' 'libgcrypt'
+         'ttf-liberation' 'systemd' 'dbus' 'libpulse' 'pciutils'
+         'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('python' 'python2' 'gperf' 'mesa' 'ninja' 'nodejs' 'git' 'libva'
+             'libpipewire02' 'clang' 'lld' 'gn' 'java-runtime-headless'
+             'python2-setuptools')
+optdepends=('libpipewire02: WebRTC desktop sharing under Wayland'
+            'libva: hardware-accelerated video decode [experimental]'
+            'kdialog: needed for file dialogs in KDE'
+            'org.freedesktop.secrets: password storage backend on GNOME / Xfce'
+            'kwallet: for storing passwords in KWallet on KDE desktops')
+source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
+        https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz
+        https://github.com/stha09/chromium-patches/releases/download/chromium-${pkgver%%.*}-patchset-$_gcc_patchset/chromium-${pkgver%%.*}-patchset-$_gcc_patchset.tar.xz
+        subpixel-anti-aliasing-in-FreeType-2.8.1.patch)
+sha256sums=('38b118fbe8bbdf89e4f170ced090088f5eb2bb68f2295abbb0006cc94b7f827d'
+            '86859c11cfc8ba106a3826479c0bc759324a62150b271dd35d1a0f96e890f52f'
+            'e5a60a4c9d0544d3321cc241b4c7bd4adb0a885f090c6c6c21581eac8e3b4ba9'
+            '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
+declare -gA _system_libs=(
+  [ffmpeg]=ffmpeg
+  [flac]=flac
+  [fontconfig]=fontconfig
+  [freetype]=freetype2
+  [harfbuzz-ng]=harfbuzz
+  [icu]=icu
+  [libdrm]=
+  [libjpeg]=libjpeg
+  [libpng]=libpng
+  #[libvpx]=libvpx
+  [libwebp]=libwebp
+  [libxml]=libxml2
+  [libxslt]=libxslt
+  [opus]=opus
+  [re2]=re2
+  [snappy]=snappy
+  [zlib]=minizip
+)
+_unwanted_bundled_libs=(
+  $(printf "%s\n" ${!_system_libs[@]} | sed 's/^libjpeg$/&_turbo/')
+)
+depends+=(${_system_libs[@]})
+
+# Google API keys (see https://www.chromium.org/developers/how-tos/api-keys)
+# Note: These are for Arch Linux use ONLY. For your own distribution, please
+# get your own set of keys.
+_google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM
+_google_default_client_id=413772536636.apps.googleusercontent.com
+_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Allow building against system libraries in official builds
+  sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+    tools/generate_shim_headers/generate_shim_headers.py
+
+  # https://crbug.com/893950
+  sed -i -e 's/\<xmlMalloc\>/malloc/' -e 's/\<xmlFree\>/free/' \
+    third_party/blink/renderer/core/xml/*.cc \
+    third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \
+    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-openscreen-include.patch
+  patch -Np1 -i ../patches/chromium-88-CompositorFrameReporter-dcheck.patch
+  patch -Np1 -i ../patches/chromium-88-ideographicSpaceCharacter.patch
+  patch -Np1 -i ../patches/chromium-88-AXTreeFormatter-include.patch
+
+  # Force script incompatible with Python 3 to use /usr/bin/python2
+  sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py
+
+  mkdir -p third_party/node/linux/node-linux-x64/bin
+  ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
+
+  # Remove bundled libraries for which we will use the system copies; this
+  # *should* do what the remove_bundled_libraries.py script does, with the
+  # added benefit of not having to list all the remaining libraries
+  local _lib
+  for _lib in ${_unwanted_bundled_libs[@]}; do
+    find "third_party/$_lib" -type f \
+      \! -path "third_party/$_lib/chromium/*" \
+      \! -path "third_party/$_lib/google/*" \
+      \! -path "third_party/harfbuzz-ng/utils/hb_scoped.h" \
+      \! -regex '.*\.\(gn\|gni\|isolate\)' \
+      -delete
+  done
+
+  python2 build/linux/unbundle/replace_gn_files.py \
+    --system-libraries "${!_system_libs[@]}"
+}
+
+build() {
+  make -C chromium-launcher-$_launcher_ver
+
+  cd "$srcdir/$pkgname-$pkgver"
+
+  if check_buildoption ccache y; then
+    # Avoid falling back to preprocessor mode when sources contain time macros
+    export CCACHE_SLOPPINESS=time_macros
+  fi
+
+  export CC=clang
+  export CXX=clang++
+  export AR=ar
+  export NM=nm
+
+  local _flags=(
+    'custom_toolchain="//build/toolchain/linux/unbundle:default"'
+    'host_toolchain="//build/toolchain/linux/unbundle:default"'
+    'clang_use_chrome_plugins=false'
+    'is_official_build=true' # implies is_cfi=true on x86_64
+    'treat_warnings_as_errors=false'
+    'fieldtrial_testing_like_official_build=true'
+    'ffmpeg_branding="Chrome"'
+    'proprietary_codecs=true'
+    'rtc_use_pipewire=true'
+    'link_pulseaudio=true'
+    'use_gnome_keyring=false'
+    'use_sysroot=false'
+    'use_custom_libcxx=false'
+    'enable_hangout_services_extension=true'
+    'enable_widevine=true'
+    'use_vaapi=true'
+    'enable_nacl=false'
+    "google_api_key=\"${_google_api_key}\""
+    "google_default_client_id=\"${_google_default_client_id}\""
+    "google_default_client_secret=\"${_google_default_client_secret}\""
+  )
+
+  if [[ -n ${_system_libs[icu]+set} ]]; then
+    _flags+=('icu_use_data_file=false')
+  fi
+
+  if check_option strip y; then
+    _flags+=('symbol_level=0')
+  fi
+
+  # Facilitate deterministic builds (taken from build/config/compiler/BUILD.gn)
+  CFLAGS+='   -Wno-builtin-macro-redefined'
+  CXXFLAGS+=' -Wno-builtin-macro-redefined'
+  CPPFLAGS+=' -D__DATE__=  -D__TIME__=  -D__TIMESTAMP__='
+
+  # Do not warn about unknown warning options
+  CFLAGS+='   -Wno-unknown-warning-option'
+  CXXFLAGS+=' -Wno-unknown-warning-option'
+
+  gn gen out/Release --args="${_flags[*]}" --script-executable=python2
+  ninja -C out/Release chrome chrome_sandbox chromedriver
+}
+
+package() {
+  cd chromium-launcher-$_launcher_ver
+  make PREFIX=/usr DESTDIR="$pkgdir" install
+  install -Dm644 LICENSE \
+    "$pkgdir/usr/share/licenses/chromium/LICENSE.launcher"
+
+  cd "$srcdir/$pkgname-$pkgver"
+
+  install -D out/Release/chrome "$pkgdir/usr/lib/chromium/chromium"
+  install -Dm4755 out/Release/chrome_sandbox "$pkgdir/usr/lib/chromium/chrome-sandbox"
+  ln -s /usr/lib/chromium/chromedriver "$pkgdir/usr/bin/chromedriver"
+
+  install -Dm644 chrome/installer/linux/common/desktop.template \
+    "$pkgdir/usr/share/applications/chromium.desktop"
+  install -Dm644 chrome/app/resources/manpage.1.in \
+    "$pkgdir/usr/share/man/man1/chromium.1"
+  sed -i \
+    -e 's/@@MENUNAME@@/Chromium/g' \
+    -e 's/@@PACKAGE@@/chromium/g' \
+    -e 's/@@USR_BIN_SYMLINK_NAME@@/chromium/g' \
+    "$pkgdir/usr/share/applications/chromium.desktop" \
+    "$pkgdir/usr/share/man/man1/chromium.1"
+
+  install -Dm644 chrome/installer/linux/common/chromium-browser/chromium-browser.appdata.xml \
+    "$pkgdir/usr/share/metainfo/chromium.appdata.xml"
+  sed -ni \
+    -e 's/chromium-browser\.desktop/chromium.desktop/' \
+    -e '/<update_contact>/d' \
+    -e '/<p>/N;/<p>\n.*\(We invite\|Chromium supports Vorbis\)/,/<\/p>/d' \
+    -e '/^<?xml/,$p' \
+    "$pkgdir/usr/share/metainfo/chromium.appdata.xml"
+
+  local toplevel_files=(
+    chrome_100_percent.pak
+    chrome_200_percent.pak
+    resources.pak
+    v8_context_snapshot.bin
+
+    # ANGLE
+    libEGL.so
+    libGLESv2.so
+
+    chromedriver
+  )
+
+  if [[ -z ${_system_libs[icu]+set} ]]; then
+    toplevel_files+=(icudtl.dat)
+  fi
+
+  cp "${toplevel_files[@]/#/out/Release/}" "$pkgdir/usr/lib/chromium/"
+  install -Dm644 -t "$pkgdir/usr/lib/chromium/locales" out/Release/locales/*.pak
+  install -Dm755 -t "$pkgdir/usr/lib/chromium/swiftshader" out/Release/swiftshader/*.so
+
+  for size in 24 48 64 128 256; do
+    install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
+      "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
+  done
+
+  for size in 16 32; do
+    install -Dm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \
+      "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
+  done
+
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: chromium/repos/staging-x86_64/subpixel-anti-aliasing-in-FreeType-2.8.1.patch (from rev 407141, chromium/trunk/subpixel-anti-aliasing-in-FreeType-2.8.1.patch)
===================================================================
--- staging-x86_64/subpixel-anti-aliasing-in-FreeType-2.8.1.patch	                        (rev 0)
+++ staging-x86_64/subpixel-anti-aliasing-in-FreeType-2.8.1.patch	2021-02-03 12:15:46 UTC (rev 407142)
@@ -0,0 +1,100 @@
+From f25787b72c20e97cdeb74e037dc1ff56a88b45c6 Mon Sep 17 00:00:00 2001
+From: Ben Wagner <bungeman at google.com>
+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 <herb at google.com>
+Commit-Queue: Ben Wagner <bungeman at google.com>
+---
+ 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 <memory>
++#include <tuple>
+ 
+ #include <ft2build.h>
+ #include FT_ADVANCES_H
+@@ -147,13 +148,16 @@ public:
+         // *reinterpret_cast<void**>(&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<FT_Int, FT_Int, FT_Int>;
++        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() {


More information about the arch-commits mailing list