diff options
-rw-r--r-- | .SRCINFO | 19 | ||||
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | PKGBUILD | 33 | ||||
-rw-r--r-- | fix_668446.diff | 101 | ||||
-rw-r--r-- | fix_668446_r1.diff | 53 |
5 files changed, 86 insertions, 122 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sat Jan 28 10:18:31 UTC 2017 +# Sun Feb 5 19:26:30 UTC 2017 pkgbase = chromium-dev pkgdesc = The open-source project behind Google Chrome (Dev Channel) - pkgver = 57.0.2987.8 + pkgver = 58.0.3000.4 pkgrel = 1 url = http://www.chromium.org install = chromium-dev.install @@ -22,6 +22,7 @@ pkgbase = chromium-dev makedepends = git makedepends = imagemagick makedepends = hwids + makedepends = npm depends = jsoncpp depends = libxslt depends = libxss @@ -45,18 +46,18 @@ pkgbase = chromium-dev optdepends = libexif: Need for read EXIF metadata optdepends = ttf-font: For some typography options = !strip - source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-57.0.2987.8.tar.xz + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-58.0.3000.4.tar.xz source = chromium-launcher-3.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v3.tar.gz source = chromium-dev.svg source = BUILD.gn source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-system-ffmpeg-r4.patch - source = enable_vaapi_on_linux_57.0.2987.8.diff::https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/f02f22cdc0923ab18c44dc46dda0942e078b870d/debian/patches/enable_vaapi_on_linux.diff - source = specify-max-resolution_57.0.2987.8.patch::https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/f02f22cdc0923ab18c44dc46dda0942e078b870d/debian/patches/specify-max-resolution.patch - source = fix-gl-image_57.0.2987.8.patch::https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/f02f22cdc0923ab18c44dc46dda0942e078b870d/debian/patches/fix-gl-image.patch + source = enable_vaapi_on_linux_58.0.3000.4.diff::https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/f02f22cdc0923ab18c44dc46dda0942e078b870d/debian/patches/enable_vaapi_on_linux.diff + source = specify-max-resolution_58.0.3000.4.patch::https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/f02f22cdc0923ab18c44dc46dda0942e078b870d/debian/patches/specify-max-resolution.patch + source = fix-gl-image_58.0.3000.4.patch::https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/f02f22cdc0923ab18c44dc46dda0942e078b870d/debian/patches/fix-gl-image.patch source = minizip.patch source = chromium-widevine-r1.patch - source = fix_668446.diff - sha256sums = 3fbdb631a03cf310ca7fab6783c0a2dabd02940330fdcb1a0bc3436bcca4ac36 + source = fix_668446_r1.diff + sha256sums = ceaa08e4d6bbc95af2da994fb36465e84908870efb225cd2a59436560291faa1 sha256sums = 8b01fb4efe58146279858a754d90b49e5a38c9a0b36a1f84cbb7d12f92b84c28 sha256sums = dd2b5c4191e468972b5ea8ddb4fa2e2fa3c2c94c79fc06645d0efc0e63ce7ee1 sha256sums = c7d9974834fc3803b5f1a1d310ff391306964caaabc807a62f8e5c3d38526ee6 @@ -66,7 +67,7 @@ pkgbase = chromium-dev sha256sums = 89178b6549f09737d7455fe8923c93ead3556c59914ba4375db49789b73b45f3 sha256sums = 95ba939b9372e533ecbcc9ca034f3e9fc6621d3bddabb57c4d092ea69fa6c840 sha256sums = 0d537830944814fe0854f834b5dc41dc5fc2428f77b2ad61d4a5e76b0fe99880 - sha256sums = 4ec7ef64298599e1e30c6391e68f2fd1f6d5dd35a964f78693d7501b98311955 + sha256sums = 5f7d403e2a4cd2503ba4946d5c7226c5e9caa3c8433c2175f2545e491cfd9e5f pkgname = chromium-dev diff --git a/.gitignore b/.gitignore index 5dcd1dd79921..4632973d0f54 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ !chromium-widevine-r1.patch !BUILD.gn !minizip.patch -!fix_668446.diff +!fix_668446_r1.diff @@ -20,7 +20,7 @@ _enable_vaapi=0 # Patch for VAAPI HW acceleration NOTE: don't work in some grap ## -- Package and components information -- ## ############################################## pkgname=chromium-dev -pkgver=57.0.2987.8 +pkgver=58.0.3000.4 _launcher_ver=3 pkgrel=1 pkgdesc="The open-source project behind Google Chrome (Dev Channel)" @@ -58,6 +58,7 @@ makedepends=('libexif' 'git' 'imagemagick' 'hwids' + 'npm' ) optdepends=('libva-vdpau-driver-chromium: HW video acceleration for NVIDIA users' 'libva-mesa-driver: HW video acceleration for Nouveau, r600 and radeonsi users' @@ -87,7 +88,7 @@ source=( #"https://gsdview.appspot.com/chromium-browser-official/chromium-${pkgv 'minizip.patch' # Patch from crbug (chromium bugtracker) 'chromium-widevine-r1.patch' - 'fix_668446.diff' + 'fix_668446_r1.diff' ) sha256sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/chromium-55.0.2873.0.tar.xz.hashes | grep sha256 | cut -d ' ' -f3)" "$(curl -sL https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${pkgver}.tar.xz.hashes | grep sha256 | cut -d ' ' -f3)" @@ -103,7 +104,7 @@ sha256sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/ '95ba939b9372e533ecbcc9ca034f3e9fc6621d3bddabb57c4d092ea69fa6c840' # Patch from crbug (chromium bugtracker) '0d537830944814fe0854f834b5dc41dc5fc2428f77b2ad61d4a5e76b0fe99880' - '4ec7ef64298599e1e30c6391e68f2fd1f6d5dd35a964f78693d7501b98311955' + '5f7d403e2a4cd2503ba4946d5c7226c5e9caa3c8433c2175f2545e491cfd9e5f' ) options=('!strip') install=chromium-dev.install @@ -245,6 +246,7 @@ _keeplibs=( 'third_party/mesa' 'third_party/modp_b64' 'third_party/mt19937ar' + 'third_party/node' 'third_party/openh264' 'third_party/openmax_dl' 'third_party/opus' @@ -415,7 +417,7 @@ prepare() { sed 's|@WIDEVINE_VERSION@|The Cake Is a Lie|g' -i "third_party/widevine/cdm/stub/widevine_cdm_version.h" # https://crbug.com/668446 - patch -p0 -i "${srcdir}/fix_668446.diff" + patch -p0 -i "${srcdir}/fix_668446_r1.diff" # Try to fix libpng errors. msg2 "Attempt for fix libpng errors" @@ -433,8 +435,10 @@ prepare() { echo > "${srcdir}/flapper_version.h" # Remove most bundled libraries. Some are still needed. - msg2 "Removing unnecessary components to save space" + msg2 "Removing unnecessary components to save space." python2 build/linux/unbundle/remove_bundled_libraries.py ${_keeplibs[@]} --do-remove + + # Can lead fail rm -fr native_client/toolchain rm -fr build/linux/debian* @@ -442,17 +446,24 @@ prepare() { find . -name '*.py' -exec sed -r 's|/usr/bin/python$|&2|g' -i {} + find . -name '*.py' -exec sed -r 's|/usr/bin/env python$|&2|g' -i {} + - touch chrome/test/data/webui/i18n_process_css_test.html - - # Changing bundle libraries to system ones. + msg2 "Changing bundle libraries to system ones." python2 build/linux/unbundle/replace_gn_files.py --system-libraries ${_use_system[@]} - # update libaddressinput strings. - python2 third_party/libaddressinput/chromium/tools/update-strings.py - # Use the file at run time instead of effectively compiling it in. sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' -i device/usb/BUILD.gn + msg2 "Update libaddressinput strings." + python2 third_party/libaddressinput/chromium/tools/update-strings.py + + msg2 "Update nodejs deps" + # Fix some things in the update_node_binaries script + sed -e 's|latest-v6.x|${NODE_VERSION}|g' \ + -e 's|rm "SHASUMS256.txt"|rm -fr "SHASUMS256.txt"|g' \ + -i third_party/node/update_node_binaries + + ./third_party/node/update_node_binaries + ./third_party/node/update_npm_deps + if [ "${_build_nacl}" = "1" ]; then msg2 "Setup NaCl/PNaCl SDK: Download and install NaCl/PNaCl toolchains" python2 build/download_nacl_toolchains.py --packages nacl_x86_newlib,pnacl_newlib,pnacl_translator sync --extract diff --git a/fix_668446.diff b/fix_668446.diff deleted file mode 100644 index 04021204c329..000000000000 --- a/fix_668446.diff +++ /dev/null @@ -1,101 +0,0 @@ ---- chrome/browser/ui/libgtkui/BUILD.gn 2017-01-21 01:34:13.510335097 +0100 -+++ chrome/browser/ui/libgtkui/BUILD.gn.new 2017-01-21 01:34:01.410694761 +0100 -@@ -128,52 +128,55 @@ - - # TODO(thomasanderson): libgtk2ui and libgtk3ui share much of the same code. - # Extract the common code into a template. --component("libgtk2ui") { -- sources = common_sources + [ -- "native_theme_gtk2.cc", -- "native_theme_gtk2.h", -- ] -- configs += common_configs -- defines = [ "LIBGTKUI_IMPLEMENTATION" ] - -- # GTK2 pulls pangoft2 as dependency, and pangoft2 depends on harfbuzz. -- # To avoid missing indirectly referenced harfbuzz symbols from pango, -- # some hack is required when bundled harfbuzz is used and component build is -- # disabled. -- # See crbug.com/462689 for details. -- all_dependent_configs = [ "//third_party/harfbuzz-ng:pangoft2_link_hack" ] -+if (use_gtk3) { -+ # This is compiled with "all" even when it's not referenced to ensure that -+ # GTK3 continues to build. GTK3 is explicitly specified by some distros. -+ component("libgtk3ui") { -+ sources = common_sources + [ -+ "native_theme_gtk3.cc", -+ "native_theme_gtk3.h", -+ ] -+ configs += common_configs -+ defines = [ "LIBGTKUI_IMPLEMENTATION" ] - -- deps = common_deps + [ -- "//build/config/linux/gtk2", -- "//build/config/linux/gtk2:gtkprint2", -- ] -- public_deps = [ -- "//chrome/browser:theme_properties", -- ] --} -+ # GTK3 pulls pangoft2 as dependency, and pangoft2 depends on harfbuzz. -+ # To avoid missing indirectly referenced harfbuzz symbols from pango, -+ # some hack is required when bundled harfbuzz is used and component build is -+ # disabled. -+ # See crbug.com/462689 for details. -+ all_dependent_configs = [ "//third_party/harfbuzz-ng:pangoft2_link_hack" ] - --# This is compiled with "all" even when it's not referenced to ensure that --# GTK3 continues to build. GTK3 is explicitly specified by some distros. --component("libgtk3ui") { -- sources = common_sources + [ -- "native_theme_gtk3.cc", -- "native_theme_gtk3.h", -- ] -- configs += common_configs -- defines = [ "LIBGTKUI_IMPLEMENTATION" ] -+ deps = common_deps + [ -+ "//build/config/linux/gtk3", -+ "//build/config/linux/gtk3:gtkprint3", -+ ] -+ public_deps = [ -+ "//chrome/browser:theme_properties", -+ ] -+ } -+} else { -+ component("libgtk2ui") { -+ sources = common_sources + [ -+ "native_theme_gtk2.cc", -+ "native_theme_gtk2.h", -+ ] -+ configs += common_configs -+ defines = [ "LIBGTKUI_IMPLEMENTATION" ] - -- # GTK3 pulls pangoft2 as dependency, and pangoft2 depends on harfbuzz. -- # To avoid missing indirectly referenced harfbuzz symbols from pango, -- # some hack is required when bundled harfbuzz is used and component build is -- # disabled. -- # See crbug.com/462689 for details. -- all_dependent_configs = [ "//third_party/harfbuzz-ng:pangoft2_link_hack" ] -+ # GTK2 pulls pangoft2 as dependency, and pangoft2 depends on harfbuzz. -+ # To avoid missing indirectly referenced harfbuzz symbols from pango, -+ # some hack is required when bundled harfbuzz is used and component build is -+ # disabled. -+ # See crbug.com/462689 for details. -+ all_dependent_configs = [ "//third_party/harfbuzz-ng:pangoft2_link_hack" ] - -- deps = common_deps + [ -- "//build/config/linux/gtk3", -- "//build/config/linux/gtk3:gtkprint3", -- ] -- public_deps = [ -- "//chrome/browser:theme_properties", -- ] -+ deps = common_deps + [ -+ "//build/config/linux/gtk2", -+ "//build/config/linux/gtk2:gtkprint2", -+ ] -+ public_deps = [ -+ "//chrome/browser:theme_properties", -+ ] -+ } - } diff --git a/fix_668446_r1.diff b/fix_668446_r1.diff new file mode 100644 index 000000000000..6e12fabcce32 --- /dev/null +++ b/fix_668446_r1.diff @@ -0,0 +1,53 @@ +--- chrome/browser/ui/libgtkui/BUILD.gn.orig 2017-02-05 00:32:39.518999004 +0100 ++++ chrome/browser/ui/libgtkui/BUILD.gn 2017-02-05 00:23:33.532382915 +0100 +@@ -140,26 +140,28 @@ + } + } + +-libgtkui("libgtk2ui") { +- sources = [ +- "native_theme_gtk2.cc", +- "native_theme_gtk2.h", +- ] +- deps = [ +- "//build/config/linux/gtk2", +- "//build/config/linux/gtk2:gtkprint2", +- ] +-} +- +-# This is compiled with "all" even when it's not referenced to ensure that +-# GTK3 continues to build. GTK3 is explicitly specified by some distros. +-libgtkui("libgtk3ui") { +- sources = [ +- "native_theme_gtk3.cc", +- "native_theme_gtk3.h", +- ] +- deps = [ +- "//build/config/linux/gtk3", +- "//build/config/linux/gtk3:gtkprint3", +- ] ++if (use_gtk3) { ++ # This is compiled with "all" even when it's not referenced to ensure that ++ # GTK3 continues to build. GTK3 is explicitly specified by some distros. ++ libgtkui("libgtk3ui") { ++ sources = [ ++ "native_theme_gtk3.cc", ++ "native_theme_gtk3.h", ++ ] ++ deps = [ ++ "//build/config/linux/gtk3", ++ "//build/config/linux/gtk3:gtkprint3", ++ ] ++ } ++} else { ++ libgtkui("libgtk2ui") { ++ sources = [ ++ "native_theme_gtk2.cc", ++ "native_theme_gtk2.h", ++ ] ++ deps = [ ++ "//build/config/linux/gtk2", ++ "//build/config/linux/gtk2:gtkprint2", ++ ] ++ } + } |