From 79d44473aa09ed8d8f5dc299fb066bf0600d2f72 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sun, 6 Aug 2017 11:28:01 +0200 Subject: [PATCH] chromium: updated to 60.0.3112.78 --- chromium/.footprint | 79 ++++++++++++++++++++++++++++++--------------- chromium/.md5sum | 7 +++- chromium/Pkgfile | 46 +++++++++++++++++++++----- 3 files changed, 97 insertions(+), 35 deletions(-) diff --git a/chromium/.footprint b/chromium/.footprint index a7d254a..0c5b46d 100644 --- a/chromium/.footprint +++ b/chromium/.footprint @@ -7,6 +7,7 @@ drwxr-xr-x root/root usr/lib/chromium/ -rw-r--r-- root/root usr/lib/chromium/chrome_100_percent.pak -rw-r--r-- root/root usr/lib/chromium/chrome_200_percent.pak -rwxr-xr-x root/root usr/lib/chromium/chromium +-rw-r--r-- root/root usr/lib/chromium/headless_lib.pak -rw-r--r-- root/root usr/lib/chromium/icudtl.dat -rw-r--r-- root/root usr/lib/chromium/keyboard_resources.pak drwxr-xr-x root/root usr/lib/chromium/locales/ @@ -25,7 +26,7 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/accelerometer-left.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/accelerometer-right.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/accelerometer-top.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/applicationCache.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/audits_logo.svg -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpoint.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointConditional.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointConditional_2x.png @@ -39,21 +40,17 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/chromeSelect.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/chromeSelect_2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/deleteIcon.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/domain.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/errorWave.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/errorWave_2x.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/fileSystem.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/forward.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/frame.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/graphLabelCalloutLeft.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/graphLabelCalloutRight.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/ic_info_black_18dp.svg -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/ic_warning_black_18dp.svg +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/largeIcons.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/largeIcons_2x.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/mediumIcons.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/mediumIcons_2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/navigationControls.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/navigationControls_2x.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneAddButtons.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneFilterButtons.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/paneRefreshButtons.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/nodeIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/popoverArrows.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/profileGroupIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/profileIcon.png @@ -68,8 +65,6 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceCSSIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceDocumentIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceDocumentIconSmall.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceGlyphs.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceGlyphs_2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourceJSIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourcePlainIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/resourcePlainIconSmall.png @@ -78,18 +73,15 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/searchPrev.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/securityIcons.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/securityIcons_2x.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/settingsListRemove.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/settingsListRemove_2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/smallIcons.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/smallIcons_2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/speech.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/toolbarButtonGlyphs.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/toolbarButtonGlyphs_2x.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/toolbarItemSelected.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/toolbarResizerHorizontal.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/toolbarResizerVertical.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/touchCursor.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/touchCursor_2x.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/treeoutlineTriangles.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/treeoutlineTriangles_2x.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/whatsnew.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/InspectorBackendCommands.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/SupportedCSSProperties.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Tests.js @@ -99,15 +91,30 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/animation/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/animation/animation_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/audits/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits/audits_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/audits2/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits2/audits2_module.js +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits2_worker.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/audits2_worker/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits2_worker/audits2_worker_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/changes/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/changes/changes_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/cm/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/cm/cm_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/cm_modes/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/cm_modes/cm_modes_module.js -drwxr-xr-x root/root usr/lib/chromium/resources/inspector/components_lazy/ --rw-r--r-- root/root usr/lib/chromium/resources/inspector/components_lazy/components_lazy_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/color_picker/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/color_picker/color_picker_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/console/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/console/console_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/cookie_table/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/cookie_table/cookie_table_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/coverage/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/coverage/coverage_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/data_grid/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/data_grid/data_grid_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/devices/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/devices/devices_module.js --rw-r--r-- root/root usr/lib/chromium/resources/inspector/devtools.js +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/devtools_compatibility.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/devtools_extension_api.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/diff/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/diff/diff_module.js @@ -151,10 +158,16 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/emulated_devices/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/iPhone6-portrait.svg -rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg -rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/event_listeners/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/event_listeners/event_listeners_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/formatter_worker.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/gonzales/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/gonzales/gonzales_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/heap_snapshot_model/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/heap_snapshot_model/heap_snapshot_model_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/heap_snapshot_worker.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/inline_editor/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/inline_editor/inline_editor_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspector.html -rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspector.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/layer_viewer/ @@ -163,18 +176,30 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/layers/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/layers/layers_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/network/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/network/network_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/object_ui/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/object_ui/object_ui_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/perf_ui/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/perf_ui/perf_ui_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/product_registry/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/product_registry/product_registry_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/product_registry_impl/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/product_registry_impl/product_registry_impl_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/profiler/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/profiler/profiler_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/protocol/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/protocol/protocol_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/quick_open/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/quick_open/quick_open_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/resources/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/resources/resources_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sass/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/sass/sass_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/screencast/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/screencast/screencast_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sdk/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/sdk/sdk_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/security/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/security/security_module.js -drwxr-xr-x root/root usr/lib/chromium/resources/inspector/services/ --rw-r--r-- root/root usr/lib/chromium/resources/inspector/services/services_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/settings/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/settings/settings_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/snippets/ @@ -183,7 +208,6 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/source_frame/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/source_frame/source_frame_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sources/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/sources/sources_module.js --rw-r--r-- root/root usr/lib/chromium/resources/inspector/temp_storage_shared_worker.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/terminal/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/terminal/terminal_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/text_editor/ @@ -194,8 +218,11 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/timeline_model/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/timeline_model/timeline_model_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/toolbox.html -rw-r--r-- root/root usr/lib/chromium/resources/inspector/toolbox.js -drwxr-xr-x root/root usr/lib/chromium/resources/inspector/ui_lazy/ --rw-r--r-- root/root usr/lib/chromium/resources/inspector/ui_lazy/ui_lazy_module.js +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/unit_test_runner.html +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/unit_test_runner.js +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/utility_shared_worker.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/workspace_diff/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/workspace_diff/workspace_diff_module.js -rw-r--r-- root/root usr/lib/chromium/snapshot_blob.bin -rw-r--r-- root/root usr/lib/chromium/views_mus_resources.pak drwxr-xr-x root/root usr/share/ diff --git a/chromium/.md5sum b/chromium/.md5sum index 692da99..d80a0f1 100644 --- a/chromium/.md5sum +++ b/chromium/.md5sum @@ -1,5 +1,10 @@ -1bbfd501e662a324b5749ceaad8ab3b4 chromium-55.0.2883.103.tar.xz +c8b274991cdd5064aed600add48a0bf6 0001-Clip-FreeType-glyph-bitmap-to-mask.patch +e5f1c85bec4a50df09da6d4b17249826 chromium-60.0.3112.78.tar.xz +034bc28a6988f3d6d1e7f291ec95365c chromium-blink-gcc7.patch bce5db9dba2aec40a1a709797a907e2a chromium-build-toolchain.patch +776649f56b8f7bcad7f23d496bba8042 chromium-gn-bootstrap-r2.patch +3d379c46c547a21d6f20fc1c1761bff1 chromium-gn-bootstrap-r8.patch +c2f283eee77d4123a0952d9ee277ec3c chromium-v8-gcc7.patch b527005e021b14869a669e42c46b661d chromium.desktop 64968626706b07721983ac59fb3babbf chromium.sh 3354997dd0bfde3443499133a6e16a85 last-commit-position.patch diff --git a/chromium/Pkgfile b/chromium/Pkgfile index 4f99762..3e2215f 100644 --- a/chromium/Pkgfile +++ b/chromium/Pkgfile @@ -3,21 +3,26 @@ # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu # Maintainer: Jose V Beneyto, sepen at crux dot nu # Packager: Tadeusz Sosnierz, tadzikes gmail com -# Depends on: dbus-glib gperf gtk libevent libexif libgcrypt mesa3d ninja nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt xorg-libxtst yasm +# Depends on: dbus-glib gperf gtk libevent libexif libgcrypt mesa3d ninja nodejs nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt xorg-libxtst yasm name=chromium -version=55.0.2883.103 - +version=60.0.3112.78 release=1 source=(http://commondatastorage.googleapis.com/$name-browser-official/$name-$version.tar.xz \ - last-commit-position.patch $name-build-toolchain.patch $name.sh $name.desktop) + last-commit-position.patch $name-build-toolchain.patch $name-gn-bootstrap-r2.patch $name.sh $name.desktop + 0001-Clip-FreeType-glyph-bitmap-to-mask.patch + chromium-blink-gcc7.patch + chromium-v8-gcc7.patch + chromium-gn-bootstrap-r8.patch) build() { cd $name-$version + export CFLAGS="-O2 -pipe -mfloat-abi=hard" + export CFLAGS="$CFLAGS $(pkg-config --cflags nspr) -lpthread" export LDFLAGS="$LDFLAGS $(pkg-config --libs nspr)" - + # determine some flags depending on SOC USE_ARMV7=0; USE_ARM_THUMB=0; USE_ARM_NEON=0 case $(uname -m) in @@ -33,15 +38,33 @@ build() { # we don't use git sources patch -p1 -i $SRC/last-commit-position.patch + # https://bugs.chromium.org/p/skia/issues/detail?id=6663 + patch -p1 -d third_party/skia -i $SRC/0001-Clip-FreeType-glyph-bitmap-to-mask.patch + + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853347 + patch -p1 -i $SRC/chromium-blink-gcc7.patch + + # https://bugs.chromium.org/p/chromium/issues/detail?id=614289 + patch -p1 -i $SRC/chromium-v8-gcc7.patch + + # Fixes from Gentoo + patch -p1 -i $SRC/chromium-gn-bootstrap-r8.patch + + mkdir -p third_party/node/linux/node-linux-x64/bin + ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ + # Let's fix the toolchain patch -p0 -i $SRC/$name-build-toolchain.patch + # Gentoo patch + patch -p1 -i $SRC/$name-gn-bootstrap-r2.patch + _gn_args=( 'blink_gc_plugin=false' 'clang_use_chrome_plugins=false' 'enable_hangout_services_extension=true' 'enable_nacl=false' - 'enable_nacl_nonsfi=false' + 'enable_swiftshader=false' 'fatal_linker_warnings=false' 'ffmpeg_branding="Chrome"' 'is_clang=false' @@ -62,11 +85,18 @@ build() { 'use_system_libjpeg=true' ) + export TMPDIR="${PKGMK_WORK_DIR}/temp" + mkdir -p -m 755 "${TMPDIR}" || die + python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args="${_gn_args[*]}" out/Release/gn gen out/Release --args="${_gn_args[*]}" --script-executable=/usr/bin/python2 - ninja -C out/Release chrome chrome_sandbox - + # Ninja, by default, sets the number of jobs to the number of availalble threads +# local JOBS=$(awk 'BEGIN{RS="-j|--jobs="} NR==2 {print $1}' <<< $MAKEFLAGS) +# test -n "$JOBS" && export JOBS="-j $JOBS" + JOBS="-j 2" + ninja $JOBS -C out/Release chrome chrome_sandbox + install -m 0755 -D out/Release/chrome $PKG/usr/lib/$name/$name install -m 4755 -o root -g root -D out/Release/chrome_sandbox $PKG/usr/lib/$name/chrome-sandbox install -m 0644 -D out/Release/*.pak $PKG/usr/lib/$name -- 2.26.2