[arch-commits] Commit in chromium/trunk (4 files)
Evangelos Foutras
foutrelis at archlinux.org
Tue Oct 18 19:50:29 UTC 2016
Date: Tuesday, October 18, 2016 @ 19:50:28
Author: foutrelis
Revision: 278967
upgpkg: chromium 54.0.2840.59-2
Fix frequent tab crashes (FS#51387).
Modified:
chromium/trunk/PKGBUILD
chromium/trunk/chromium-53.0.2785.92-last-commit-position.patch
Deleted:
chromium/trunk/PKGBUILD.53
chromium/trunk/chromium-cups-2.2.patch
--------------------------------------------------+
PKGBUILD | 325 +++++----------------
PKGBUILD.53 | 229 --------------
chromium-53.0.2785.92-last-commit-position.patch | 121 -------
chromium-cups-2.2.patch | 31 --
4 files changed, 104 insertions(+), 602 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-10-18 19:00:32 UTC (rev 278966)
+++ PKGBUILD 2016-10-18 19:50:28 UTC (rev 278967)
@@ -4,25 +4,40 @@
# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# 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 -rgA _system_libs=(
+ [flac]=flac
+ [harfbuzz-ng]=harfbuzz-icu
+ #[libjpeg]=libjpeg # Error during build
+ [libpng]=libpng
+ [libvpx]=libvpx
+ [libwebp]=libwebp
+ #[libxml]=libxml2 # https://bugs.archlinux.org/task/29939
+ [libxslt]=libxslt
+ [re2]=re2
+ [snappy]=snappy
+ [yasm]=
+ #[zlib]=zlib # Error during build
+)
+
pkgname=chromium
pkgver=54.0.2840.59
-pkgrel=1.1
+pkgrel=2
_launcher_ver=3
pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
arch=('i686' 'x86_64')
url="http://www.chromium.org/"
license=('BSD')
-depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libxss' 'libexif'
- 'libgcrypt' 'ttf-font' 'systemd' 'dbus' 'flac' 'libpulse' 'harfbuzz'
- 'perl' 'perl-file-basedir' 'desktop-file-utils' 'hicolor-icon-theme'
- 'pciutils')
-makedepends=('python2' 'gperf' 'yasm' 'mesa' 'ninja' 'python2-jinja'
- 'python2-markupsafe' 'python2-ply' 'python2-beautifulsoup4'
- 'python2-html5lib')
+depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libexif' 'libgcrypt'
+ 'ttf-font' 'systemd' 'dbus' 'libpulse' 'perl' 'perl-file-basedir'
+ 'pciutils' 'desktop-file-utils' 'hicolor-icon-theme')
+depends+=(${_system_libs[@]})
+makedepends=('python2' 'gperf' 'yasm' 'mesa' 'ninja')
optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
'gnome-keyring: for storing passwords in GNOME keyring'
'kwallet: for storing passwords in KWallet')
-options=('!strip' debug)
+options=('!strip')
install=chromium.install
source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
@@ -34,7 +49,7 @@
'8b01fb4efe58146279858a754d90b49e5a38c9a0b36a1f84cbb7d12f92b84c28'
'028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9'
'3b3aa9e28f29e6f539ed1c7832e79463b13128863a02e9c6fecd16c30d61c227'
- '9502a4d7e825a21ae63cced5715e5f06d983033b623cd41d94d1e38a70f29310'
+ 'd3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e'
'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808')
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -49,163 +64,12 @@
# instructions on how to build the toolchain from source don't work that well
# (at least not from within the Chromium 39 source tree).
# https://sites.google.com/a/chromium.org/dev/nativeclient/pnacl/building-pnacl-components-for-distribution-packagers
-_build_nacl=0
-_nacl="false"
+_build_nacl=false
if [[ $CARCH == i686 ]]; then
- _build_nacl=0
- _nacl="false"
+ _build_nacl=false
fi
prepare() {
- # These are few system libraries that can be safely used
- local _system_libs=(
- 'bzip2'
- 'flac'
- 'harfbuzz'
- 'icu'
- 'libjpeg'
- 'libpng'
- 'libwebp'
- 'libxml'
- 'libxslt'
- 're2'
- 'yasm'
- 'zlib'
- )
-
- # List of required bundled libraries
- local _keeplibs=(
- 'base/third_party/dmg_fp'
- 'base/third_party/dynamic_annotations'
- 'base/third_party/icu'
- 'base/third_party/libevent'
- 'base/third_party/nspr'
- 'base/third_party/superfasthash'
- 'base/third_party/symbolize'
- 'base/third_party/valgrind'
- 'base/third_party/xdg_mime'
- 'base/third_party/xdg_user_dirs'
- 'breakpad/src/third_party/curl'
- 'buildtools/third_party/libc++'
- 'buildtools/third_party/libc++abi'
- 'chrome/third_party/mozilla_security_manager'
- 'courgette/third_party'
- 'native_client/src/third_party/dlmalloc'
- 'native_client/src/third_party/valgrind'
- 'net/third_party/mozilla_security_manager'
- 'net/third_party/nss'
- 'third_party/WebKit'
- 'third_party/adobe'
- 'third_party/analytics'
- 'third_party/angle'
- 'third_party/angle/src/common/third_party/numerics'
- 'third_party/angle/src/third_party/compiler'
- 'third_party/angle/src/third_party/libXNVCtrl'
- 'third_party/angle/src/third_party/murmurhash'
- 'third_party/angle/src/third_party/trace_event'
- 'third_party/boringssl'
- 'third_party/brotli'
- 'third_party/cacheinvalidation'
- 'third_party/catapult'
- 'third_party/catapult/third_party/polymer'
- 'third_party/catapult/third_party/py_vulcanize'
- 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin'
- 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin'
- 'third_party/catapult/tracing/third_party/d3'
- 'third_party/catapult/tracing/third_party/gl-matrix'
- 'third_party/catapult/tracing/third_party/jszip'
- 'third_party/catapult/tracing/third_party/mannwhitneyu'
- 'third_party/ced'
- 'third_party/cld_2'
- 'third_party/cld_3'
- 'third_party/cros_system_api'
- 'third_party/cython/python_flags.py'
- 'third_party/devscripts'
- 'third_party/dom_distiller_js'
- 'third_party/ffmpeg'
- 'third_party/fips181'
- 'third_party/flac'
- 'third_party/flatbuffers'
- 'third_party/flot'
- 'third_party/google_input_tools'
- 'third_party/google_input_tools/third_party/closure_library'
- 'third_party/google_input_tools/third_party/closure_library/third_party/closure'
- 'third_party/harfbuzz-ng'
- 'third_party/hunspell'
- 'third_party/iccjpeg'
- 'third_party/icu'
- 'third_party/jstemplate'
- 'third_party/khronos'
- 'third_party/leveldatabase'
- 'third_party/libXNVCtrl'
- 'third_party/libaddressinput'
- 'third_party/libjingle'
- 'third_party/libjpeg_turbo'
- 'third_party/libphonenumber'
- 'third_party/libpng'
- 'third_party/libsecret'
- 'third_party/libsrtp'
- 'third_party/libudev'
- 'third_party/libusb'
- 'third_party/libvpx'
- 'third_party/libvpx/source/libvpx/third_party/x86inc'
- 'third_party/libwebm'
- 'third_party/libwebp'
- 'third_party/libxml'
- 'third_party/libxml/chromium'
- 'third_party/libxslt'
- 'third_party/libyuv'
- 'third_party/lss'
- 'third_party/lzma_sdk'
- 'third_party/mesa'
- 'third_party/mesa'
- 'third_party/modp_b64'
- 'third_party/mt19937ar'
- 'third_party/openh264'
- 'third_party/openmax_dl'
- 'third_party/opus'
- 'third_party/ots'
- 'third_party/pdfium'
- 'third_party/pdfium/third_party/agg23'
- 'third_party/pdfium/third_party/base'
- 'third_party/pdfium/third_party/bigint'
- 'third_party/pdfium/third_party/freetype'
- 'third_party/pdfium/third_party/lcms2-2.6'
- 'third_party/pdfium/third_party/libjpeg'
- 'third_party/pdfium/third_party/libopenjpeg20'
- 'third_party/pdfium/third_party/libpng16'
- 'third_party/pdfium/third_party/libtiff'
- 'third_party/pdfium/third_party/zlib_v128'
- 'third_party/polymer'
- 'third_party/protobuf'
- 'third_party/protobuf/third_party/six'
- 'third_party/protobuf/third_party/six'
- 'third_party/qcms'
- 'third_party/re2'
- 'third_party/sfntly'
- 'third_party/skia'
- 'third_party/smhasher'
- 'third_party/snappy'
- 'third_party/speech-dispatcher'
- 'third_party/sqlite'
- 'third_party/tcmalloc'
- 'third_party/usb_ids'
- 'third_party/usrsctp'
- 'third_party/web-animations-js'
- 'third_party/webdriver'
- 'third_party/webrtc'
- 'third_party/widevine'
- 'third_party/woff2'
- 'third_party/x86inc'
- 'third_party/xdg-utils'
- 'third_party/yasm'
- 'third_party/yasm/run_yasm.py'
- 'third_party/zlib'
- 'third_party/zlib/google'
- 'url/third_party/mozilla'
- 'v8/src/third_party/valgrind'
- )
-
cd "$srcdir/$pkgname-$pkgver"
# Enable support for the Widevine CDM plugin
@@ -221,6 +85,12 @@
# Disable last_commit_position as we don't build from git repository
patch -Np1 -i ../chromium-53.0.2785.92-last-commit-position.patch
+ # Work around bug in blink in which GCC 6 optimizes away null pointer checks
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833524
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68853#c2
+ sed -i '/config("compiler")/ a cflags_cc = [ "-fno-delete-null-pointer-checks" ]' \
+ build/config/linux/BUILD.gn
+
# Use Python 2
find . -name '*.py' -exec sed -i -r 's|/usr/bin/python$|&2|g' {} +
@@ -229,7 +99,7 @@
ln -sf /usr/bin/python2 "$srcdir/python2-path/python"
# Download the PNaCL toolchain on x86_64; i686 toolchain is no longer provided
- if (( $_build_nacl )); then
+ if [[ $_build_nacl == true ]]; then
python2 build/download_nacl_toolchains.py \
--packages nacl_x86_newlib,pnacl_newlib,pnacl_translator \
sync --extract
@@ -236,72 +106,69 @@
#python2 tools/clang/scripts/update.py
fi
- # Remove bundled and switch to system libraries (where possible)
- python2 build/linux/unbundle/remove_bundled_libraries.py \
- --do-remove "${_keeplibs[@]}"
+ # 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 ${!_system_libs[@]}; do
+ find -type f -path "*third_party/$_lib/*" \
+ \! -path "*third_party/$_lib/chromium/*" \
+ \! -path "*third_party/$_lib/google/*" \
+ \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
+ -delete
+ done
+
python2 build/linux/unbundle/replace_gn_files.py \
- --system-libraries "${_use_system[@]}"
+ --system-libraries "${!_system_libs[@]}"
- # More inexplicable hacks
- rm -rf third_party/{jinja2,markupsafe,ply}
- ln -s /usr/lib/python2.7/site-packages/jinja2 third_party/jinja2
- ln -s /usr/lib/python2.7/site-packages/markupsafe third_party/markupsafe
- ln -s /usr/lib/python2.7/site-packages/ply third_party/ply
-
python2 third_party/libaddressinput/chromium/tools/update-strings.py
- touch chrome/test/data/webui/i18n_process_css_test.html
-
- # Use the file at runtime
- sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' -i device/usb/BUILD.gn
}
build() {
+ make -C "$srcdir/chromium-launcher-$_launcher_ver" PREFIX=/usr
+
+ cd "$srcdir/$pkgname-$pkgver"
+
+ export PATH="$srcdir/python2-path:$PATH"
+ export TMPDIR="$srcdir/temp"
+ mkdir -p "$TMPDIR"
+
local _flags=(
+ 'is_clang=false'
+ 'clang_use_chrome_plugins=false'
+ 'symbol_level=0'
'is_debug=false'
- 'symbol_level=0'
+ 'fatal_linker_warnings=false'
+ 'treat_warnings_as_errors=false'
+ 'fieldtrial_testing_like_official_build=true'
+ 'remove_webcore_debug_symbols=true'
+ 'ffmpeg_branding="Chrome"'
+ 'proprietary_codecs=true'
+ 'link_pulseaudio=true'
+ 'linux_use_bundled_binutils=false'
+ 'use_allocator="none"'
+ 'use_cups=true'
+ 'use_gconf=false'
+ 'use_gnome_keyring=false'
+ 'use_gold=false'
+ 'use_gtk3=false'
+ 'use_kerberos=true'
+ 'use_pulseaudio=true'
+ 'use_sysroot=false'
+ 'enable_hangout_services_extension=true'
'enable_widevine=true'
- 'enable_hangout_services_extension=false'
- "ffmpeg_branding=\"ChromeOS\""
- 'proprietary_codecs=true'
+ "enable_nacl=$_build_nacl"
+ "enable_nacl_nonsfi=$_build_nacl"
"google_api_key=\"${_google_api_key}\""
"google_default_client_id=\"${_google_default_client_id}\""
"google_default_client_secret=\"${_google_default_client_secret}\""
- 'fieldtrial_testing_like_official_build=false'
- "remove_webcore_debug_symbols=true"
- 'use_gconf=false'
- "use_gio=false"
- "use_gnome_keyring=false"
- "use_gtk3=false"
- "use_pulseaudio=true"
- "link_pulseaudio=true"
- 'use_kerberos=true'
- 'use_cups=true'
- 'use_sysroot=false'
- 'use_gold=false'
- "use_allocator=\"none\""
- 'linux_use_bundled_binutils=false'
- 'fatal_linker_warnings=false'
- 'treat_warnings_as_errors=false'
- "enable_nacl=${_nacl}"
- "enable_nacl_nonsfi=${_nacl}"
- 'is_clang=false'
- 'clang_use_chrome_plugins=false'
)
- make -C "$srcdir/chromium-launcher-$_launcher_ver" PREFIX=/usr
-
- cd "$srcdir/$pkgname-$pkgver"
- export PATH="$srcdir/python2-path:$PATH"
-
- python2 tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${_flags[*]}"
- out/Release/gn gen out/Release -v --args="${_flags[*]}" \
+ python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args "${_flags[*]}"
+ out/Release/gn gen out/Release --args="${_flags[*]}" \
--script-executable=/usr/bin/python2
- ninja -C out/Release \
- pdf \
- chrome chrome_sandbox chromedriver \
- widevinecdmadapter \
- clearkeycdm
+ ninja -C out/Release chrome chrome_sandbox chromedriver widevinecdmadapter
}
package() {
@@ -314,33 +181,30 @@
cd "$srcdir/$pkgname-$pkgver"
install -D out/Release/chrome "$pkgdir/usr/lib/chromium/chromium"
+ install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1"
+ install -Dm644 "$srcdir/chromium.desktop" \
+ "$pkgdir/usr/share/applications/chromium.desktop"
install -Dm4755 out/Release/chrome_sandbox \
"$pkgdir/usr/lib/chromium/chrome-sandbox"
- install -D out/Release/chromedriver "$pkgdir/usr/lib/chromium/chromedriver"
-
- cp out/Release/{*.pak,*.bin,libwidevinecdmadapter.so} \
+ cp -a out/Release/{*.pak,*.bin,chromedriver,libwidevinecdmadapter.so,icudtl.dat} \
+ out/Release/locales \
+ out/Release/gen/content/content_resources.pak \
"$pkgdir/usr/lib/chromium/"
+ ln -s /usr/lib/chromium/chromedriver "$pkgdir/usr/bin/chromedriver"
+
# Manually strip binaries so that 'nacl_irt_*.nexe' is left intact
- strip $STRIP_BINARIES "$pkgdir/usr/lib/chromium/"{chromium,chrome-sandbox} \
- "$pkgdir/usr/lib/chromium/chromedriver"
+ strip $STRIP_BINARIES "$pkgdir/usr/lib/chromium/"{chromium,chrome-sandbox,chromedriver}
strip $STRIP_SHARED "$pkgdir/usr/lib/chromium/libwidevinecdmadapter.so"
- if (( $_build_nacl )); then
+ if [[ $_build_nacl == true ]]; then
cp out/Release/nacl_helper{,_bootstrap} out/Release/nacl_irt_*.nexe \
"$pkgdir/usr/lib/chromium/"
strip $STRIP_BINARIES "$pkgdir/usr/lib/chromium/"nacl_helper{,_bootstrap}
fi
- cp -a out/Release/locales "$pkgdir/usr/lib/chromium/"
-
- install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1"
-
- install -Dm644 "$srcdir/chromium.desktop" \
- "$pkgdir/usr/share/applications/chromium.desktop"
-
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"
@@ -351,14 +215,7 @@
"$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
done
- ln -s /usr/lib/chromium/chromedriver "$pkgdir/usr/bin/chromedriver"
-
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE"
-
- install -Dm644 out/Release/icudtl.dat "$pkgdir/usr/lib/chromium/icudtl.dat"
-
- install -Dm644 out/Release/gen/content/content_resources.pak \
- "$pkgdir/usr/lib/chromium/content_resources.pak"
}
# vim:set ts=2 sw=2 et:
Deleted: PKGBUILD.53
===================================================================
--- PKGBUILD.53 2016-10-18 19:00:32 UTC (rev 278966)
+++ PKGBUILD.53 2016-10-18 19:50:28 UTC (rev 278967)
@@ -1,229 +0,0 @@
-# $Id$
-# 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=53.0.2785.143
-pkgrel=1
-_launcher_ver=3
-pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
-arch=('i686' 'x86_64')
-url="http://www.chromium.org/"
-license=('BSD')
-depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss'
- 'libexif' 'libgcrypt' 'ttf-font' 'systemd' 'dbus' 'flac' 'snappy'
- 'speech-dispatcher' 'pciutils' 'libpulse' 'harfbuzz' 'libsecret'
- 'libvpx' 'perl' 'perl-file-basedir' 'desktop-file-utils'
- 'hicolor-icon-theme')
-makedepends=('python2' 'gperf' 'yasm' 'mesa' 'ninja')
-makedepends_x86_64=('lib32-gcc-libs' 'lib32-zlib')
-optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
- 'gnome-keyring: for storing passwords in GNOME keyring'
- 'kwallet: for storing passwords in KWallet')
-options=('!strip')
-install=chromium.install
-source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
- chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
- chromium.desktop
- chromium-52.0.2743.116-unset-madv_free.patch
- chromium-cups-2.2.patch
- chromium-widevine.patch)
-sha256sums=('c52a58b79bfb27bb87e4a0a6ff213001485fbc747657b290f75d39ddce07dcc3'
- '8b01fb4efe58146279858a754d90b49e5a38c9a0b36a1f84cbb7d12f92b84c28'
- '028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9'
- '3b3aa9e28f29e6f539ed1c7832e79463b13128863a02e9c6fecd16c30d61c227'
- '6519cf913cb68e2def1bbf9210ef40a178b45bc9d325297c41b7a784ff57cc8e'
- 'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808')
-
-# Google API keys (see http://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. Feel free to contact foutrelis at archlinux.org for
-# more information.
-_google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM
-_google_default_client_id=413772536636.apps.googleusercontent.com
-_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
-
-# We can't build (P)NaCL on i686 because the toolchain is x86_64 only and the
-# instructions on how to build the toolchain from source don't work that well
-# (at least not from within the Chromium 39 source tree).
-# https://sites.google.com/a/chromium.org/dev/nativeclient/pnacl/building-pnacl-components-for-distribution-packagers
-_build_nacl=1
-if [[ $CARCH == i686 ]]; then
- _build_nacl=0
-fi
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion
- touch chrome/test/data/webui/i18n_process_css_test.html
-
- # Enable support for the Widevine CDM plugin
- # libwidevinecdm.so is not included, but can be copied over from Chrome
- # (Version string doesn't seem to matter so let's go with "Pinkie Pie")
- sed "s/@WIDEVINE_VERSION@/Pinkie Pie/" ../chromium-widevine.patch |
- patch -Np1
-
- # Commentception – use bundled ICU due to build failures (50.0.2661.75)
- # See https://crbug.com/584920 and https://crbug.com/592268
- # ---
- ## Remove bundled ICU; its header files appear to get picked up instead of
- ## the system ones, leading to errors during the final link stage.
- ## https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/BNGvJc08B6Q
- #find third_party/icu -type f \! -regex '.*\.\(gyp\|gypi\|isolate\)' -delete
-
- # Disable MADV_FREE (if set by glibc)
- # https://bugzilla.redhat.com/show_bug.cgi?id=1361157
- patch -Np1 -i ../chromium-52.0.2743.116-unset-madv_free.patch
-
- # Fix compiling with CUPS 2.2 backend
- patch -Np0 -i ../chromium-cups-2.2.patch
-
- # Use Python 2
- find . -name '*.py' -exec sed -i -r 's|/usr/bin/python$|&2|g' {} +
- # There are still a lot of relative calls which need a workaround
- mkdir -p "$srcdir/python2-path"
- ln -sf /usr/bin/python2 "$srcdir/python2-path/python"
-
- # Download the PNaCL toolchain on x86_64; i686 toolchain is no longer provided
- if (( $_build_nacl )); then
- python2 build/download_nacl_toolchains.py \
- --packages nacl_x86_newlib,pnacl_newlib,pnacl_translator \
- sync --extract
- fi
-}
-
-build() {
- cd "$srcdir/chromium-launcher-$_launcher_ver"
-
- make PREFIX=/usr
-
- cd "$srcdir/$pkgname-$pkgver"
-
- export PATH="$srcdir/python2-path:$PATH"
-
- # CFLAGS are passed through release_extra_cflags below
- export -n CFLAGS CXXFLAGS
-
- # Work around bug in v8 in which GCC 6 optimizes away null pointer checks
- # https://bugs.chromium.org/p/v8/issues/detail?id=3782
- # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69234
- CFLAGS+=' -fno-delete-null-pointer-checks'
-
- local _chromium_conf=(
- -Dgoogle_api_key=$_google_api_key
- -Dgoogle_default_client_id=$_google_default_client_id
- -Dgoogle_default_client_secret=$_google_default_client_secret
- -Dwerror=
- -Dclang=0
- -Dpython_ver=2.7
- -Dlinux_link_gsettings=1
- -Dlinux_link_libpci=1
- -Dlinux_link_libspeechd=1
- -Dlinux_link_pulseaudio=1
- -Dlinux_strip_binary=1
- -Dlinux_use_bundled_binutils=0
- -Dlinux_use_bundled_gold=0
- -Dlinux_use_gold_flags=0
- -Dicu_use_data_file_flag=1
- -Dlogging_like_official_build=1
- -Dtracing_like_official_build=1
- -Dfieldtrial_testing_like_official_build=1
- -Drelease_extra_cflags="$CFLAGS"
- -Dlibspeechd_h_prefix=speech-dispatcher/
- -Dffmpeg_branding=Chrome
- -Dproprietary_codecs=1
- -Duse_gnome_keyring=0
- -Duse_system_bzip2=1
- -Duse_system_flac=1
- -Duse_system_ffmpeg=0
- -Duse_system_harfbuzz=1
- -Duse_system_icu=0
- -Duse_system_libevent=1
- -Duse_system_libjpeg=1
- -Duse_system_libpng=1
- -Duse_system_libvpx=1
- -Duse_system_libxml=0
- -Duse_system_snappy=1
- -Duse_system_xdg_utils=1
- -Duse_system_yasm=1
- -Duse_system_zlib=0
- -Dusb_ids_path=/usr/share/hwdata/usb.ids
- -Duse_mojo=0
- -Duse_gconf=0
- -Duse_sysroot=0
- -Denable_hangout_services_extension=1
- -Denable_widevine=1
- -Ddisable_fatal_linker_warnings=1
- -Ddisable_glibc=1)
-
- if (( ! $_build_nacl )); then
- _chromium_conf+=(
- -Ddisable_nacl=1
- -Ddisable_pnacl=1
- )
- fi
-
- build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}"
- build/gyp_chromium --depth=. "${_chromium_conf[@]}"
-
- ninja -C out/Release chrome chrome_sandbox chromedriver
-}
-
-package() {
- cd "$srcdir/chromium-launcher-$_launcher_ver"
-
- make PREFIX=/usr DESTDIR="$pkgdir" install-strip
- 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"
-
- install -D out/Release/chromedriver "$pkgdir/usr/lib/chromium/chromedriver"
-
- cp out/Release/{*.pak,*.bin,libwidevinecdmadapter.so} \
- "$pkgdir/usr/lib/chromium/"
-
- # Manually strip binaries so that 'nacl_irt_*.nexe' is left intact
- strip $STRIP_BINARIES "$pkgdir/usr/lib/chromium/"{chromium,chrome-sandbox} \
- "$pkgdir/usr/lib/chromium/chromedriver"
- strip $STRIP_SHARED "$pkgdir/usr/lib/chromium/libwidevinecdmadapter.so"
-
- if (( $_build_nacl )); then
- cp out/Release/nacl_helper{,_bootstrap} out/Release/nacl_irt_*.nexe \
- "$pkgdir/usr/lib/chromium/"
- strip $STRIP_BINARIES "$pkgdir/usr/lib/chromium/"nacl_helper{,_bootstrap}
- fi
-
- cp -a out/Release/locales "$pkgdir/usr/lib/chromium/"
-
- install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1"
-
- install -Dm644 "$srcdir/chromium.desktop" \
- "$pkgdir/usr/share/applications/chromium.desktop"
-
- 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
-
- ln -s /usr/lib/chromium/chromedriver "$pkgdir/usr/bin/chromedriver"
-
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE"
-
- install -Dm644 out/Release/icudtl.dat "${pkgdir}/usr/lib/chromium/icudtl.dat"
-}
-
-# vim:set ts=2 sw=2 et:
Modified: chromium-53.0.2785.92-last-commit-position.patch
===================================================================
--- chromium-53.0.2785.92-last-commit-position.patch 2016-10-18 19:00:32 UTC (rev 278966)
+++ chromium-53.0.2785.92-last-commit-position.patch 2016-10-18 19:50:28 UTC (rev 278967)
@@ -1,105 +1,6 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>rpms/chromium.git - rpms/chromium</title>
-<meta name='generator' content='cgit v0.12'/>
-<meta name='robots' content='index, nofollow'/>
-<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
-<link rel='shortcut icon' href='/favicon.ico'/>
-<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/rpms/chromium.git/atom/chromium-53.0.2785.92-last-commit-position.patch?h=master' type='application/atom+xml'/>
-<link rel='vcs-git' href='git://pkgs.fedoraproject.org/rpms/chromium.git' title='rpms/chromium.git Git repository'/>
-<link rel='vcs-git' href='ssh://pkgs.fedoraproject.org/rpms/chromium.git' title='rpms/chromium.git Git repository'/>
-<link rel='vcs-git' href='http://pkgs.fedoraproject.org/git/rpms/chromium.git' title='rpms/chromium.git Git repository'/>
-</head>
-<body>
-<script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script>
-<script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script>
-
-<script>
- var base = 'https://apps.fedoraproject.org/';
- var tokens = window.location.href.split('/');
- var repo = null;
- if (tokens.length > 4 && tokens[4] != '') {
- repo = tokens[4].split('.')[0];
- }
- fedmenu({
- 'url': base + 'js/data.js',
- 'mimeType': 'application/javascript',
- 'position': 'bottom-right',
- 'package': repo,
- });
-</script>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
-<td class='main'><a href='/cgit/'>index</a> : <a title='rpms/chromium.git' href='/cgit/rpms/chromium.git/'>rpms/chromium.git</a></td><td class='form'><form method='get' action=''>
-<select name='h' onchange='this.form.submit();'>
-<option value='epel7'>epel7</option>
-<option value='f23'>f23</option>
-<option value='f24'>f24</option>
-<option value='f25'>f25</option>
-<option value='master' selected='selected'>master</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>rpms/chromium</td><td class='sub right'>root</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/cgit/rpms/chromium.git/'>summary</a><a href='/cgit/rpms/chromium.git/refs/'>refs</a><a href='/cgit/rpms/chromium.git/log/chromium-53.0.2785.92-last-commit-position.patch'>log</a><a class='active' href='/cgit/rpms/chromium.git/tree/chromium-53.0.2785.92-last-commit-position.patch'>tree</a><a href='/cgit/rpms/chromium.git/commit/chromium-53.0.2785.92-last-commit-position.patch'>commit</a><a href='/cgit/rpms/chromium.git/diff/chromium-53.0.2785.92-last-commit-position.patch'>diff</a><a href='/cgit/rpms/chromium.git/stats/chromium-53.0.2785.92-last-commit-position.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/rpms/chromium.git/log/chromium-53.0.2785.92-last-commit-position.patch'>
-<select name='qt'>
-<option value='grep'>log msg</option>
-<option value='author'>author</option>
-<option value='committer'>committer</option>
-<option value='range'>range</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input type='submit' value='search'/>
-</form>
-</td></tr></table>
-<div class='path'>path: <a href='/cgit/rpms/chromium.git/tree/'>root</a>/<a href='/cgit/rpms/chromium.git/tree/chromium-53.0.2785.92-last-commit-position.patch'>chromium-53.0.2785.92-last-commit-position.patch</a></div><div class='content'>blob: 46806f755aa0196d3d00bee7de1056991897b65f (<a href='/cgit/rpms/chromium.git/plain/chromium-53.0.2785.92-last-commit-position.patch'>plain</a>)
-<table summary='blob content' class='blob'>
-<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
-<a id='n2' href='#n2'>2</a>
-<a id='n3' href='#n3'>3</a>
-<a id='n4' href='#n4'>4</a>
-<a id='n5' href='#n5'>5</a>
-<a id='n6' href='#n6'>6</a>
-<a id='n7' href='#n7'>7</a>
-<a id='n8' href='#n8'>8</a>
-<a id='n9' href='#n9'>9</a>
-<a id='n10' href='#n10'>10</a>
-<a id='n11' href='#n11'>11</a>
-<a id='n12' href='#n12'>12</a>
-<a id='n13' href='#n13'>13</a>
-<a id='n14' href='#n14'>14</a>
-<a id='n15' href='#n15'>15</a>
-<a id='n16' href='#n16'>16</a>
-<a id='n17' href='#n17'>17</a>
-<a id='n18' href='#n18'>18</a>
-<a id='n19' href='#n19'>19</a>
-<a id='n20' href='#n20'>20</a>
-<a id='n21' href='#n21'>21</a>
-<a id='n22' href='#n22'>22</a>
-<a id='n23' href='#n23'>23</a>
-<a id='n24' href='#n24'>24</a>
-<a id='n25' href='#n25'>25</a>
-<a id='n26' href='#n26'>26</a>
-<a id='n27' href='#n27'>27</a>
-<a id='n28' href='#n28'>28</a>
-</pre></td>
-<td class='lines'><pre><code>diff -up chromium-53.0.2785.92/tools/gn/BUILD.gn.lastcommitfix chromium-53.0.2785.92/tools/gn/BUILD.gn
---- chromium-53.0.2785.92/tools/gn/BUILD.gn.lastcommitfix 2016-09-06 13:50:17.540459136 -0400
-+++ chromium-53.0.2785.92/tools/gn/BUILD.gn 2016-09-06 13:50:27.380269110 -0400
-@@ -259,7 +259,6 @@ executable("gn") {
-
- deps = [
- ":gn_lib",
-- ":last_commit_position",
- "//base",
- "//build/config/sanitizers:deps",
- "//build/win:default_exe_manifest",
-diff -up chromium-53.0.2785.92/tools/gn/gn_main.cc.lastcommitfix chromium-53.0.2785.92/tools/gn/gn_main.cc
---- chromium-53.0.2785.92/tools/gn/gn_main.cc.lastcommitfix 2016-09-06 13:49:34.620288177 -0400
-+++ chromium-53.0.2785.92/tools/gn/gn_main.cc 2016-09-06 13:49:47.316042652 -0400
-@@ -12,13 +12,7 @@
+--- a/tools/gn/gn_main.cc.orig 2015-11-12 11:49:56.260549036 +0000
++++ b/tools/gn/gn_main.cc 2015-11-12 11:50:14.780931485 +0000
+@@ -11,13 +11,7 @@
#include "tools/gn/standard_out.h"
#include "tools/gn/switches.h"
@@ -113,9 +14,13 @@
namespace {
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit v0.12</a> at 2016-10-13 19:26:26 (GMT)</div>
-</div> <!-- id=cgit -->
-</body>
-</html>
+--- a/tools/gn/BUILD.gn.orig 2015-11-12 11:50:43.513524769 +0000
++++ b/tools/gn/BUILD.gn 2015-11-12 11:50:57.697817632 +0000
+@@ -227,7 +227,6 @@
+
+ deps = [
+ ":gn_lib",
+- ":last_commit_position",
+ "//base",
+ "//build/config/sanitizers:deps",
+ ]
Deleted: chromium-cups-2.2.patch
===================================================================
--- chromium-cups-2.2.patch 2016-10-18 19:00:32 UTC (rev 278966)
+++ chromium-cups-2.2.patch 2016-10-18 19:50:28 UTC (rev 278967)
@@ -1,31 +0,0 @@
-commit 5132ca58a0a3ada1aee99732fd30d53ebe5af984
-author saiarcot895 <saiarcot895 at gmail.com> Mon Aug 22 18:41:54 2016
-committer Commit bot <commit-bot at chromium.org> Mon Aug 22 18:44:13 2016
-tree b4783f1c90f2fdb001843ad83463e260de9b292c
-parent da7b21cac1ded0c70cb330e4f76a1f7915e38ccf
-
-Fix compiling with CUPS 2.2 backend.
-
-cupsGetPPD() and cupsGetPPD2() have been moved into the cups/ppd.h
-header starting with CUPS 2.2. This header file now needs to be included
-to use these functions. The header file also exists on older versions of
-CUPS, so a compile error will not occur.
-
-R=skau at chromium.org, thestig at chromium.org
-
-Review-Url: https://codereview.chromium.org/2258333004
-Cr-Commit-Position: refs/heads/master@{#413484}
-
-diff --git printing/backend/cups_helper.h printing/backend/cups_helper.h
-index fd7601d..b72903f 100644
---- printing/backend/cups_helper.h
-+++ printing/backend/cups_helper.h
-
-@@ -6,6 +6,7 @@
- #define PRINTING_BACKEND_CUPS_HELPER_H_
-
- #include <cups/cups.h>
-+#include <cups/ppd.h>
-
- #include "base/strings/string_piece.h"
- #include "printing/printing_export.h"
More information about the arch-commits
mailing list