diff options
author | Daniel Playfair Cal | 2019-02-06 19:33:15 +1100 |
---|---|---|
committer | Daniel Playfair Cal | 2019-02-06 19:36:38 +1100 |
commit | 66a3e7f3f175be14b5d7c292579da0f82437b656 (patch) | |
tree | 0b3af6f1062357f2f37f8d720194906b22f81fd4 | |
download | aur-66a3e7f3f175be14b5d7c292579da0f82437b656.tar.gz |
Initial publish
-rw-r--r-- | .SRCINFO | 71 | ||||
-rw-r--r-- | .gitignore | 8 | ||||
-rw-r--r-- | PKGBUILD | 287 | ||||
-rw-r--r-- | chromium-cmath.patch | 13 | ||||
-rw-r--r-- | chromium-is-constructible.patch | 13 | ||||
-rw-r--r-- | chromium-system-icu.patch | 19 | ||||
-rw-r--r-- | chromium-widevine.patch | 22 | ||||
-rw-r--r-- | chromium.install | 16 |
8 files changed, 449 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..c224db29b912 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,71 @@ +pkgbase = chromium-ozone-wayland-git + pkgdesc = Chromium built from the Igalia fork with experimental Wayland support via Ozone + pkgver = 74.0.3694.0+39+27f5faa20d + pkgrel = 1 + url = https://www.chromium.org/Home + install = chromium.install + arch = x86_64 + license = BSD + makedepends = python + makedepends = python2 + makedepends = gperf + makedepends = yasm + makedepends = mesa + makedepends = ninja + makedepends = nodejs + makedepends = git + makedepends = clang + makedepends = lld + makedepends = gn + makedepends = java-runtime-headless + makedepends = depot-tools-git + depends = gtk3 + depends = nss + depends = alsa-lib + depends = xdg-utils + depends = libxss + depends = libcups + depends = libgcrypt + depends = ttf-font + depends = systemd + depends = dbus + depends = libpulse + depends = pciutils + depends = json-glib + depends = desktop-file-utils + depends = hicolor-icon-theme + depends = icu + depends = libxml2 + depends = fontconfig + depends = harfbuzz + depends = libjpeg + depends = re2 + depends = snappy + depends = ffmpeg + depends = flac + depends = libwebp + depends = minizip + depends = libxslt + depends = freetype2 + depends = opus + optdepends = pepper-flash: support for Flash content + optdepends = kdialog: needed for file dialogs in KDE + optdepends = gnome-keyring: for storing passwords in GNOME keyring + optdepends = kwallet: for storing passwords in KWallet + provides = chromium + conflicts = chromium + options = !strip + options = debug + source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz + source = chromium-system-icu.patch + source = chromium-widevine.patch + source = chromium-cmath.patch + source = chromium-is-constructible.patch + sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1 + sha256sums = e2d284311f49c529ea45083438a768db390bde52949995534034d2a814beab89 + sha256sums = d081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b + sha256sums = 00c9439fd2216693d909a806f11b2260abd0ded4feca79136870c2c136a78515 + sha256sums = 2fe35a8eaa6b32285ceaab03235802e9cb3da54b08ef49af0796a4e3c7c3078f + +pkgname = chromium-ozone-wayland-git + diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..937339d86edb --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +pkg/ +src/ +*.zip +*.part +*.gz +*.tar +*.tar.xz + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..c19fffa8e0a2 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,287 @@ +# Maintainer: Daniel Playfair Cal <daniel.playfair.cal@gmail.com> +# Contributor: Gustavo Alvarez <sl1pkn07@gmail.com> +# Contributor: Mikhail Vorozhtsov <mikhail.vorozhtsov@gmail.com> +# Contributor: Nagisa <simonas@kazlauskas.me> +# Contributor: Misc <andreas.reis@gmail.com> +# Contributor: Jeagoss <jgoliver@jeago.com> +# Contributor: Saikrishna Arcot <saiarcot895@gmail.com> +# Contributor: Steven Newbury <steve@snewbury.org.uk> +# Contributor: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Pierre Schmitz <pierre@archlinux.de> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=chromium-ozone-wayland-git +pkgver=74.0.3694.0+39+27f5faa20d +pkgrel=1 +_launcher_ver=6 +pkgdesc="Chromium built from the Igalia fork with experimental Wayland support via Ozone" +arch=('x86_64') +options=(!strip debug) +url="https://www.chromium.org/Home" +license=('BSD') +depends=('gtk3' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libcups' 'libgcrypt' + 'ttf-font' 'systemd' 'dbus' 'libpulse' 'pciutils' 'json-glib' + 'desktop-file-utils' 'hicolor-icon-theme') +provides=('chromium') +conflicts=('chromium') +makedepends=('python' 'python2' 'gperf' 'yasm' 'mesa' 'ninja' 'nodejs' 'git' + 'clang' 'lld' 'gn' 'java-runtime-headless' 'depot-tools-git') +optdepends=('pepper-flash: support for Flash content' + 'kdialog: needed for file dialogs in KDE' + 'gnome-keyring: for storing passwords in GNOME keyring' + 'kwallet: for storing passwords in KWallet') +install=chromium.install +source=(chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz + chromium-system-icu.patch + chromium-widevine.patch + chromium-cmath.patch + chromium-is-constructible.patch) +sha256sums=('04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1' + 'e2d284311f49c529ea45083438a768db390bde52949995534034d2a814beab89' + 'd081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b' + '00c9439fd2216693d909a806f11b2260abd0ded4feca79136870c2c136a78515' + '2fe35a8eaa6b32285ceaab03235802e9cb3da54b08ef49af0796a4e3c7c3078f') + +# Repository and branch/commit to fetch code from +_gitrepo=https://github.com/Igalia/chromium.git +_gitref=ozone-wayland-dev + +# 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 # https://crbug.com/752403#c10 + #[libvpx]=libvpx # needs unreleased libvpx + [libwebp]=libwebp + [libxml]=libxml2 + [libxslt]=libxslt + [opus]=opus + [re2]=re2 + [snappy]=snappy + [yasm]= + [zlib]=minizip +) +_unwanted_bundled_libs=( + ${!_system_libs[@]} + ${_system_libs[libjpeg]+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 + +export PATH="/opt/depot_tools:${PATH}" + +prepare() { + cd "$srcdir" + + gclient config --spec "solutions = [ + { + \"url\": \"${_gitrepo}@${_gitref}\", + \"managed\": False, + \"name\": \"src\", + \"deps_file\": \".DEPS.git\", + \"custom_deps\": {}, + }, + ] + " + # Hopefully 1000 is enough to find the last change to chrome/VERSION + git clone --depth 1000 "$_gitrepo" src + cd src + git checkout "$gitref" + + # Download synced projects + gclient sync --reset --no-history --nohooks --ignore_locks + + # 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/libxml_utils.cc + + # Load Widevine CDM if available + patch -Np1 -i ../chromium-widevine.patch + + # https://bugs.gentoo.org/661880#c21 + patch -Np1 -i ../chromium-system-icu.patch + + # https://github.com/Igalia/chromium/issues/525 + patch -Np1 -i ../chromium-cmath.patch + patch -Np1 -i ../chromium-is-constructible.patch ## Absolute dirty hack + + # Remove compiler flags not supported by our system clang + # sed -i \ + # -e '/"-Wno-defaulted-function-deleted"/d' \ + # build/config/compiler/BUILD.gn + + sed -i \ + -e '/"-fsplit-lto-unit"/d' \ + build/config/compiler/BUILD.gn + + # Force script incompatible with Python 3 to use /usr/bin/python2 + sed -i '1s|python$|&2|' \ + -i third_party/dom_distiller_js/protoc_plugins/*.py + + # Obviously, python code sometimes also calls python itself + sed -i "s/'python'/'python2'/g" third_party/binutils/download.py + + # 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/yasm/run_yasm.py' \ + \! -regex '.*\.\(gn\|gni\|isolate\)' \ + -delete + done + + python2 build/linux/unbundle/replace_gn_files.py \ + --system-libraries "${!_system_libs[@]}" + + gclient runhooks +} + +pkgver() { + cd "$srcdir/src" + . "chrome/VERSION" + tag_version="$MAJOR.$MINOR.$BUILD.$PATCH" + tag_commit=$(git rev-list -1 HEAD -- "chrome/VERSION") + commits_since=$(git rev-list ${tag_commit}...HEAD --count) + head_commit=$(git rev-list -1 --abbrev-commit HEAD) + echo "$tag_version+$commits_since+$head_commit" +} + +build() { + make -C chromium-launcher-$_launcher_ver + + cd "$srcdir/src" + + _clang_path="${BUILDDIR}${_builddir}/src/src/third_party/llvm-build/Release+Asserts/bin/" + + export CC="${_clang_path}clang" + export CXX="${_clang_path}clang++" + export AR=ar + export NM=nm + + if check_buildoption ccache y; then + # Avoid falling back to preprocessor mode when sources contain time macros + export CCACHE_SLOPPINESS=time_macros + export CC="ccache $CC" + export CXX="ccache $CXX" + fi + + local _flags=( + 'custom_toolchain="//build/toolchain/linux/unbundle:default"' + 'host_toolchain="//build/toolchain/linux/unbundle:default"' + 'clang_use_chrome_plugins=true' + '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' + 'link_pulseaudio=true' + 'use_gnome_keyring=false' + 'use_sysroot=false' + 'use_ozone=true' + 'use_xkbcommon=true' + 'use_system_minigbm=true' + 'use_vaapi=true' + 'linux_use_bundled_binutils=false' + 'use_custom_libcxx=false' + 'use_jumbo_build=true' + 'remove_webcore_debug_symbols=true' + 'enable_hangout_services_extension=true' + 'enable_widevine=true' + 'enable_nacl=false' + 'enable_swiftshader=false' + "google_api_key=\"${_google_api_key}\"" + "google_default_client_id=\"${_google_default_client_id}\"" + "google_default_client_secret=\"${_google_default_client_secret}\"" + ) + + # 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__=' + + if check_option strip y; then + _flags+=('symbol_level=0') + + # Mimic exclude_unwind_tables=true + CFLAGS+=' -fno-unwind-tables -fno-asynchronous-unwind-tables' + CXXFLAGS+=' -fno-unwind-tables -fno-asynchronous-unwind-tables' + CPPFLAGS+=' -DNO_UNWIND_TABLES' + else + _flags+=('symbol_level=1') + fi + + gn gen out/Release -v --args="${_flags[*]}" --script-executable=/usr/bin/python2 + /usr/bin/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/src" + + 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" + + cp \ + out/Release/{chrome_{100,200}_percent,resources}.pak \ + out/Release/{*.bin,chromedriver} \ + "$pkgdir/usr/lib/chromium/" + install -Dm644 -t "$pkgdir/usr/lib/chromium/locales" out/Release/locales/*.pak + + if [[ -z ${_system_libs[icu]+set} ]]; then + cp out/Release/icudtl.dat "$pkgdir/usr/lib/chromium/" + fi + + for size in 22 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: diff --git a/chromium-cmath.patch b/chromium-cmath.patch new file mode 100644 index 000000000000..dc5e73b54164 --- /dev/null +++ b/chromium-cmath.patch @@ -0,0 +1,13 @@ +diff --git a/ui/gfx/color_utils.cc b/ui/gfx/color_utils.cc +index c868cd54bac3..0aa130b0e88d 100644 +--- a/ui/gfx/color_utils.cc ++++ b/ui/gfx/color_utils.cc +@@ -431,7 +431,7 @@ SkColor SetDarkestColorForTesting(SkColor color) { + // GetContrastRatio(kWhiteLuminance, g_luminance_midpoint). The formula below + // can be verified by plugging it into how GetContrastRatio() operates. + g_luminance_midpoint = +- std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f; ++ ::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f; + + return previous_darkest_color; + } diff --git a/chromium-is-constructible.patch b/chromium-is-constructible.patch new file mode 100644 index 000000000000..748cb376112f --- /dev/null +++ b/chromium-is-constructible.patch @@ -0,0 +1,13 @@ +diff --git a/base/optional.h b/base/optional.h +index 84b302e53079..10586d65f225 100644 +--- a/base/optional.h ++++ b/base/optional.h +@@ -345,7 +345,7 @@ struct IsConvertibleFromOptional + : std::integral_constant< + bool, + std::is_constructible<T, Optional<U>&>::value || +- std::is_constructible<T, const Optional<U>&>::value || ++ // std::is_constructible<T, const Optional<U>&>::value || + std::is_constructible<T, Optional<U>&&>::value || + std::is_constructible<T, const Optional<U>&&>::value || + std::is_convertible<Optional<U>&, T>::value || diff --git a/chromium-system-icu.patch b/chromium-system-icu.patch new file mode 100644 index 000000000000..23dde5d712a7 --- /dev/null +++ b/chromium-system-icu.patch @@ -0,0 +1,19 @@ +diff --git a/third_party/blink/renderer/platform/text/character_property_data.h b/third_party/blink/renderer/platform/text/character_property_data.h +index 28fb6a9..bb4dbd7 100644 +--- a/third_party/blink/renderer/platform/text/character_property_data.h ++++ b/third_party/blink/renderer/platform/text/character_property_data.h +@@ -244,10 +244,12 @@ static const UChar32 kIsHangulRanges[] = { + 0xD7B0, 0xD7FF, + // Halfwidth Hangul Jamo + // https://www.unicode.org/charts/nameslist/c_FF00.html +- 0xFFA0, 0xFFDC, ++ 0xFFA0, 0xFFDB, + }; + +-static const UChar32 kIsHangulArray[] = {}; ++static const UChar32 kIsHangulArray[] = { ++ 0xFFDC, ++}; + + #if !defined(USING_SYSTEM_ICU) + // Freezed trie tree, see character_property_data_generator.cc. diff --git a/chromium-widevine.patch b/chromium-widevine.patch new file mode 100644 index 000000000000..1a1a3f228bf5 --- /dev/null +++ b/chromium-widevine.patch @@ -0,0 +1,22 @@ +diff -upr chromium-71.0.3578.80.orig/chrome/common/chrome_content_client.cc chromium-71.0.3578.80/chrome/common/chrome_content_client.cc +--- chromium-71.0.3578.80.orig/chrome/common/chrome_content_client.cc 2018-12-03 20:16:43.000000000 +0000 ++++ chromium-71.0.3578.80/chrome/common/chrome_content_client.cc 2018-12-04 21:34:28.658206942 +0000 +@@ -99,7 +99,7 @@ + // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is + // bundled and not a component. When the Widevine CDM is a component, it is + // registered in widevine_cdm_component_installer.cc. +-#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) ++#if BUILDFLAG(ENABLE_WIDEVINE) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) + #define REGISTER_BUNDLED_WIDEVINE_CDM + #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck + // TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support +diff -upr chromium-71.0.3578.80.orig/third_party/widevine/cdm/widevine_cdm_version.h chromium-71.0.3578.80/third_party/widevine/cdm/widevine_cdm_version.h +--- chromium-71.0.3578.80.orig/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-03 20:18:01.000000000 +0000 ++++ chromium-71.0.3578.80/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-04 21:37:45.635374949 +0000 +@@ -12,4 +12,6 @@ + // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available + // as a string, e.g., "1.0.123.456"). + ++#define WIDEVINE_CDM_VERSION_STRING "unknown" ++ + #endif // WIDEVINE_CDM_VERSION_H_ diff --git a/chromium.install b/chromium.install new file mode 100644 index 000000000000..c2b5000d2d7b --- /dev/null +++ b/chromium.install @@ -0,0 +1,16 @@ +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: |