[arch-commits] Commit in chromium/trunk (3 files)
Date: Thursday, December 3, 2020 @ 02:52:46 Author: foutrelis Revision: 402840 upgpkg: chromium 87.0.4280.88-1: new upstream release Added: chromium/trunk/subpixel-anti-aliasing-in-FreeType-2.8.1.patch Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium-skia-harmony.patch + PKGBUILD | 14 +-- chromium-skia-harmony.patch| 14 --- subpixel-anti-aliasing-in-FreeType-2.8.1.patch | 100 +++ 3 files changed, 106 insertions(+), 22 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-12-03 02:11:09 UTC (rev 402839) +++ PKGBUILD2020-12-03 02:52:46 UTC (rev 402840) @@ -4,7 +4,7 @@ # Contributor: Daniel J Griffiths pkgname=chromium -pkgver=87.0.4280.66 +pkgver=87.0.4280.88 pkgrel=1 _launcher_ver=6 _gcc_patchset=9 @@ -27,11 +27,11 @@ 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 -chromium-skia-harmony.patch) -sha256sums=('29a8e4ea82edec2fdcf34ece68323bec7ab90f3d5669e6b77f58cff9c278f741' +subpixel-anti-aliasing-in-FreeType-2.8.1.patch) +sha256sums=('3e4645328735ef60db78d1a313efb3770a3edeaede90d076414df52f567a09c0' '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1' 'c99934bcd2f3ae8ea9620f5f59a94338b2cf739647f04c28c8a551d9083fa7e9' -'771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1') +'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 @@ -80,14 +80,12 @@ 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-ServiceWorkerContainerHost-crash.patch patch -Np1 -i ../patches/chromium-87-openscreen-include.patch - # https://crbug.com/skia/6663#c10 - patch -Np0 -i ../chromium-skia-harmony.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 @@ -166,7 +164,7 @@ CFLAGS+=' -Wno-unknown-warning-option' CXXFLAGS+=' -Wno-unknown-warning-option' - gn gen out/Release --args="${_flags[*]}" --script-executable=/usr/bin/python2 + gn gen out/Release --args="${_flags[*]}" --script-executable=python2 ninja -C out/Release chrome chrome_sandbox chromedriver } Deleted: chromium-skia-harmony.patch === --- chromium-skia-harmony.patch 2020-12-03 02:11:09 UTC (rev 402839) +++ chromium-skia-harmony.patch 2020-12-03 02:52:46 UTC (rev 402840) @@ -1,14 +0,0 @@ third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig2019-07-19 11:08:34.770972665 + -+++ third_party/skia/src/ports/SkFontHost_FreeType.cpp 2019-07-19 11:08:44.274442065 + -@@ -128,9 +128,9 @@ public: - : fGetVarDesignCoordinates(nullptr) - , fGetVarAxisFlags(nullptr) - , fLibrary(nullptr) --, fIsLCDSupported(false) -+, fIsLCDSupported(true) - , fLightHintingIsYOnly(false) --, fLCDExtra(0) -+, fLCDExtra(2) - { - if (FT_New_Library(&gFTMemory, &fLibrary)) { - return; Added: subpixel-anti-aliasing-in-FreeType-2.8.1.patch === --- subpixel-anti-aliasing-in-FreeType-2.8.1.patch (rev 0) +++ subpixel-anti-aliasing-in-FreeType-2.8.1.patch 2020-12-03 02:52:46 UTC (rev 402840) @@ -0,0 +1,100 @@ +From f25787b72c20e97cdeb74e037dc1ff56a88b45c6 Mon Sep 17 00:00:00 2001 +From: Ben Wagner +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 +Commit-Queue: Ben Wagner +--- + 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/SkFontHos
[arch-commits] Commit in chromium/trunk (3 files)
Date: Saturday, February 8, 2020 @ 08:48:23 Author: foutrelis Revision: 374996 upgpkg: chromium 80.0.3987.87-2: Fix frame buttons rendering as inactive. Added: chromium/trunk/rebuild-Linux-frame-button-cache-when-activation.patch chromium/trunk/rename-Relayout-in-DesktopWindowTreeHostPlatform.patch Modified: chromium/trunk/PKGBUILD + PKGBUILD | 10 ++ rebuild-Linux-frame-button-cache-when-activation.patch | 62 ++ rename-Relayout-in-DesktopWindowTreeHostPlatform.patch | 64 +++ 3 files changed, 135 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-02-08 02:11:28 UTC (rev 374995) +++ PKGBUILD2020-02-08 08:48:23 UTC (rev 374996) @@ -5,7 +5,7 @@ pkgname=chromium pkgver=80.0.3987.87 -pkgrel=1 +pkgrel=2 _launcher_ver=6 pkgdesc="A web browser built for speed, simplicity, and security" arch=('x86_64') @@ -32,6 +32,8 @@ remove-verbose-logging-in-local-unique-font-matching.patch fix-building-with-unbundled-libxml.patch fix-browser-frame-view-not-getting-a-relayout.patch +rename-Relayout-in-DesktopWindowTreeHostPlatform.patch +rebuild-Linux-frame-button-cache-when-activation.patch chromium-widevine.patch chromium-skia-harmony.patch) sha256sums=('f51f6fca5d9abbef855aa6b5bf427410c6e96ae58b64a7d45f843868cfb0ac8e' @@ -44,6 +46,8 @@ '5bc775c0ece84d67855f51b30eadcf96fa8163b416d2036e9f9ba19072f54dfe' 'e530d1b39504c2ab247e16f1602359c484e9e8be4ef6d4824d68b14d29a7f60b' '5db225565336a3d9b9e9f341281680433c0b7bb343dff2698b2acffd86585cbe' +'ae3bf107834bd8eda9a3ec7899fe35fde62e6111062e5def7d24bf49b53db3db' +'46f7fc9768730c460b27681ccf3dc2685c7e1fd22d70d3a82d9e57e3389bb014' '709e2fddba3c1f2ed4deb3a239fc0479bfa50c46e054e7f32db4fb1365fed070' '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1') @@ -117,6 +121,10 @@ # https://crbug.com/1046122 patch -Np1 -i ../fix-browser-frame-view-not-getting-a-relayout.patch + # https://crbug.com/1049258 + patch -Np1 -i ../rename-Relayout-in-DesktopWindowTreeHostPlatform.patch + patch -Np1 -i ../rebuild-Linux-frame-button-cache-when-activation.patch + # Load bundled Widevine CDM if available (see chromium-widevine in the AUR) # M79 is supposed to download it as a component but it doesn't seem to work patch -Np1 -i ../chromium-widevine.patch Added: rebuild-Linux-frame-button-cache-when-activation.patch === --- rebuild-Linux-frame-button-cache-when-activation.patch (rev 0) +++ rebuild-Linux-frame-button-cache-when-activation.patch 2020-02-08 08:48:23 UTC (rev 374996) @@ -0,0 +1,62 @@ +From d10f885b9327399be9348b780967ebd6b7f2c4bc Mon Sep 17 00:00:00 2001 +From: Tom Anderson +Date: Fri, 7 Feb 2020 22:44:54 + +Subject: [PATCH] Rebuild Linux frame button cache when activation state + changes + +This fixes an issue where the frame buttons would always render in an +inactive state on Linux (see repro steps in bug 1049258). + +Bug: 1049258 +R=sky +CC=pkasting + +Change-Id: Ic5af33199003e1d1cdf6cedf506e32388ea11fa9 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2044538 +Auto-Submit: Thomas Anderson +Commit-Queue: Scott Violet +Reviewed-by: Scott Violet +Cr-Commit-Position: refs/heads/master@{#739585} +--- + .../ui/views/frame/desktop_linux_browser_frame_view.cc | 6 +++--- + .../desktop_aura/desktop_window_tree_host_platform.cc | 3 +++ + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.cc b/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.cc +index 954e776057f..4f579955675 100644 +--- a/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.cc b/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.cc +@@ -22,13 +22,13 @@ DesktopLinuxBrowserFrameView::DesktopLinuxBrowserFrameView( + : OpaqueBrowserFrameView(frame, browser_view, layout), + nav_button_provider_(std::move(nav_button_provider)) {} + +-DesktopLinuxBrowserFrameView::~DesktopLinuxBrowserFrameView() {} ++DesktopLinuxBrowserFrameView::~DesktopLinuxBrowserFrameView() = default; + + void DesktopLinuxBrowserFrameView::Layout() { + // Calling MaybeUpdateCachedFrameButtonImages() from Layout() is sufficient to + // catch all cases that could update the appearance, since +- // DesktopWindowTreeHostPlatform::OnWindowStateChanged() does a layout any +- // time any properties change. ++ // DesktopWindowTreeHostPlatform::On{Window,Activation}StateChanged() does a ++ // layout any time the maximized and activation state changes, respectively. + MaybeUpdateC
[arch-commits] Commit in chromium/trunk (3 files)
Date: Monday, January 27, 2020 @ 12:30:31 Author: foutrelis Revision: 374076 Switch to upstream patch for unbundling zlib Added: chromium/trunk/fix-building-with-system-zlib.patch Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium-system-zlib.patch -+ PKGBUILD|8 +--- chromium-system-zlib.patch | 13 - fix-building-with-system-zlib.patch | 32 3 files changed, 37 insertions(+), 16 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-01-27 11:13:19 UTC (rev 374075) +++ PKGBUILD2020-01-27 12:30:31 UTC (rev 374076) @@ -28,8 +28,8 @@ include-algorithm-to-use-std-lower_bound.patch icu65.patch sync-enable-USSPasswords-by-default.patch +fix-building-with-system-zlib.patch chromium-system-icu.patch -chromium-system-zlib.patch chromium-system-hb.patch fix-spammy-unique-font-matching-log.patch chromium-widevine.patch @@ -40,8 +40,8 @@ '1f906676563e866e2b59719679e76e0b2f7f082f48ef0593e86da0351a586c73' '1de9bdbfed482295dda45c7d4e323cee55a34e42f66b892da1c1a778682b7a41' '08ef82476780e0864b5bf7f20eb19db320e73b9a5d4f595351e12e97dda8746f' +'18276e65c68a0c328601b12fefb7e8bfc632346f34b87e64944c9de8c95c5cfa' 'e73cc2ee8d3ea35aab18c478d76fdfc68ca4463e1e10306fa1e738c03b3f26b5' -'eb67eda4945a89c3b90473fa8dc20637511ca4dcb58879a8ed6bf403700ca9c8' 'c0ad3fa426cb8fc1a237ddc6309a6b2dd4055bbe41dd07f50071ee61f969b81a' '6fbffe59b886195b92c9a55137cef83021c16593f49714acb20023633e3ebb19' '709e2fddba3c1f2ed4deb3a239fc0479bfa50c46e054e7f32db4fb1365fed070' @@ -105,9 +105,11 @@ # https://crbug.com/1027929 patch -Np1 -i ../sync-enable-USSPasswords-by-default.patch + # https://crbug.com/977964 + patch -Np1 -i ../fix-building-with-system-zlib.patch + # Fixes from Gentoo patch -Np1 -i ../chromium-system-icu.patch - patch -Np1 -i ../chromium-system-zlib.patch patch -Np1 -i ../chromium-system-hb.patch # https://crbug.com/1005508 Deleted: chromium-system-zlib.patch === --- chromium-system-zlib.patch 2020-01-27 11:13:19 UTC (rev 374075) +++ chromium-system-zlib.patch 2020-01-27 12:30:31 UTC (rev 374076) @@ -1,13 +0,0 @@ -diff --git a/third_party/perfetto/gn/BUILD.gn b/third_party/perfetto/gn/BUILD.gn -index 3bc618a..e0ddf6d 100644 a/third_party/perfetto/gn/BUILD.gn -+++ b/third_party/perfetto/gn/BUILD.gn -@@ -244,7 +244,7 @@ if (enable_perfetto_trace_processor || perfetto_build_standalone || - "//buildtools:zlib", - ] - } else { -- public_configs = [ "//third_party/zlib:zlib_config" ] -+ public_configs = [ "//third_party/zlib:system_zlib" ] - public_deps = [ - "//third_party/zlib", - ] Added: fix-building-with-system-zlib.patch === --- fix-building-with-system-zlib.patch (rev 0) +++ fix-building-with-system-zlib.patch 2020-01-27 12:30:31 UTC (rev 374076) @@ -0,0 +1,32 @@ +From cda86e34ddadba5f08dea764881bbb6c8ec01e8a Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Sat, 25 Jan 2020 02:00:43 + +Subject: [PATCH] Fix building with system zlib + +Add zlib_config target because perfetto depends on it. + +Bug: 977964 +Change-Id: I2aac5c3704f1274f932a61264d1c26a05f2db55e +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2019035 +Reviewed-by: Thomas Anderson +Commit-Queue: Thomas Anderson +Cr-Commit-Position: refs/heads/master@{#735201} +--- + build/linux/unbundle/zlib.gn | 4 + 1 file changed, 4 insertions(+) + +diff --git a/build/linux/unbundle/zlib.gn b/build/linux/unbundle/zlib.gn +index 1fdd472f35e..97d6aebe6d5 100644 +--- a/build/linux/unbundle/zlib.gn b/build/linux/unbundle/zlib.gn +@@ -13,6 +13,10 @@ config("system_zlib") { + defines = [ "USE_SYSTEM_ZLIB=1" ] + } + ++config("zlib_config") { ++ configs = [ ":system_zlib" ] ++} ++ + source_set("zlib") { + deps = [ ":zlib_shim" ] + libs = [ "z" ]
[arch-commits] Commit in chromium/trunk (3 files)
Date: Tuesday, June 4, 2019 @ 21:49:17 Author: foutrelis Revision: 354859 upgpkg: chromium 75.0.3770.80-1 New upstream release. Added: chromium/trunk/libstdc-do-not-assume-unique_ptr-has-ostream-operator.patch Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium-glibc-2.29.patch -+ PKGBUILD| 14 - chromium-glibc-2.29.patch | 105 -- libstdc-do-not-assume-unique_ptr-has-ostream-operator.patch | 36 +++ 3 files changed, 43 insertions(+), 112 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-06-04 19:01:15 UTC (rev 354858) +++ PKGBUILD2019-06-04 21:49:17 UTC (rev 354859) @@ -4,8 +4,8 @@ # Contributor: Daniel J Griffiths pkgname=chromium -pkgver=74.0.3729.169 -pkgrel=2 +pkgver=75.0.3770.80 +pkgrel=1 _launcher_ver=6 pkgdesc="A web browser built for speed, simplicity, and security" arch=('x86_64') @@ -24,14 +24,14 @@ 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-system-icu.patch -chromium-glibc-2.29.patch +libstdc-do-not-assume-unique_ptr-has-ostream-operator.patch chromium-fix-window-flash-for-some-WMs.patch chromium-widevine.patch chromium-skia-harmony.patch) -sha256sums=('070f0210017f54b65264f88726431da7582e36a04caa673fe50662e8b41a0cb4' +sha256sums=('da828bc8d887821380b461abfbbd0e17538c211d56f240f03711b918c77a66d6' '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1' 'e2d284311f49c529ea45083438a768db390bde52949995534034d2a814beab89' -'dd791f154b48e69cd47fd94753c45448655b529590995fd71ac1591c53a3d60c' +'e309dfd9d790f32cb1d23103726ac25e405b6ae6757a1c957a8395667d753908' '183d8cc712f0bcf1afcb01ce90c4c104a4c8d8070a06f94974a28b007d9e2ce4' 'd081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b' '5887f78b55c4ecbbcba5930f3f0bb7bc0117c2a41c2f761805fcf7f46f1ca2b3') @@ -84,8 +84,8 @@ third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \ third_party/libxml/chromium/libxml_utils.cc - # https://crbug.com/949312 - patch -Np1 -i ../chromium-glibc-2.29.patch + # https://chromium-review.googlesource.com/1584292 + patch -Np1 -i ../libstdc-do-not-assume-unique_ptr-has-ostream-operator.patch # https://crbug.com/956061 patch -Np1 -i ../chromium-fix-window-flash-for-some-WMs.patch Deleted: chromium-glibc-2.29.patch === --- chromium-glibc-2.29.patch 2019-06-04 19:01:15 UTC (rev 354858) +++ chromium-glibc-2.29.patch 2019-06-04 21:49:17 UTC (rev 354859) @@ -1,105 +0,0 @@ -From 65046b8f90d0336cbe5f2f15cc7da5cb798360ad Mon Sep 17 00:00:00 2001 -From: Matthew Denton -Date: Wed, 24 Apr 2019 15:44:40 + -Subject: [PATCH] Update Linux Seccomp syscall restrictions to EPERM - posix_spawn/vfork - -Glibc's system() function switched to using posix_spawn, which uses -CLONE_VFORK. Pepperflash includes a sandbox debugging check which -relies on us EPERM-ing process creation like this, rather than crashing -the process with SIGSYS. - -So whitelist clone() calls, like posix_spawn, that include the flags -CLONE_VFORK and CLONE_VM. - -Bug: 949312 -Change-Id: I3f4b90114b2fc1d9929e3c0a85bbe8f10def3c20 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1568086 -Commit-Queue: Robert Sesek -Reviewed-by: Robert Sesek -Cr-Commit-Position: refs/heads/master@{#653590} - .../baseline_policy_unittest.cc | 29 +++ - .../syscall_parameters_restrictions.cc| 13 +++-- - 2 files changed, 40 insertions(+), 2 deletions(-) - -diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc -index cdeb210ccb..40fcebf933 100644 a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc -+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc -@@ -10,7 +10,9 @@ - #include - #include - #include -+#include - #include -+#include - #include - #include - #include -@@ -130,6 +132,33 @@ BPF_TEST_C(BaselinePolicy, ForkArmEperm, BaselinePolicy) { - BPF_ASSERT_EQ(EPERM, fork_errno); - } - -+BPF_TEST_C(BaselinePolicy, SystemEperm, BaselinePolicy) { -+ errno = 0; -+ int ret_val = system("echo SHOULD NEVER RUN"); -+ BPF_ASSERT_EQ(-1, ret_val); -+ BPF_ASSERT_EQ(EPERM, errno); -+} -+ -+BPF_TEST_C(BaselinePolicy, CloneVforkEperm, BaselinePolicy) { -+ errno = 0; -+ // Allocate a couple pages for the child's stack even though the child should -+ // never start. -+ constexpr size_t
[arch-commits] Commit in chromium/trunk (3 files)
Date: Friday, March 15, 2019 @ 20:51:15 Author: foutrelis Revision: 348360 upgpkg: chromium 73.0.3683.75-2 Remove VAAPI support; it hasn't been as trouble-free as I had expected. Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium-drirc-disable-10bpc-color-configs.conf chromium/trunk/chromium-vaapi.patch -+ PKGBUILD| 16 --- chromium-drirc-disable-10bpc-color-configs.conf | 15 -- chromium-vaapi.patch| 116 -- 3 files changed, 2 insertions(+), 145 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-03-15 20:42:52 UTC (rev 348359) +++ PKGBUILD2019-03-15 20:51:15 UTC (rev 348360) @@ -5,7 +5,7 @@ pkgname=chromium pkgver=73.0.3683.75 -pkgrel=1 +pkgrel=2 _launcher_ver=6 pkgdesc="A web browser built for speed, simplicity, and security" arch=('x86_64') @@ -12,7 +12,7 @@ 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' 'libva' + 'ttf-font' 'systemd' 'dbus' 'libpulse' 'pciutils' 'json-glib' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('python' 'python2' 'gperf' 'yasm' 'mesa' 'ninja' 'nodejs' 'git' 'clang' 'lld' 'gn' 'java-runtime-headless') @@ -20,13 +20,10 @@ 'kdialog: needed for file dialogs in KDE' 'gnome-keyring: for storing passwords in GNOME keyring' 'kwallet: for storing passwords in KWallet') -replaces=('chromium-vaapi' 'chromium-vaapi-bin') 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-drirc-disable-10bpc-color-configs.conf chromium-system-icu.patch -chromium-vaapi.patch chromium-color_utils-use-std-sqrt.patch chromium-media-fix-build-with-libstdc++.patch chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch @@ -34,9 +31,7 @@ chromium-skia-harmony.patch) sha256sums=('8304810626c69c296b3262844e20052e7476280b634c525a711a7f6c0e3dd57c' '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1' -'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb' 'e2d284311f49c529ea45083438a768db390bde52949995534034d2a814beab89' -'e87ede45edf39ac19e56ac1ae49c9d1f5f5130e5838bcbb4c3d4fb16e55575c0' 'b3b6f5147d519c586cbdaf3b227dd1719676fa3a65edd6f08989087afd287afa' 'f51fe91427d8638c5551746d2ec7de99e8059dd76889cfeaee8ca3d8fed62265' 'f2b12ccf83a8e0adda4a87ae5c983df5e092ccf1f9a6f2e05799ce4d451dbda1' @@ -100,9 +95,6 @@ # https://crbug.com/879929 patch -Np1 -i ../chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch - # Enable VAAPI on Linux - patch -Np1 -i ../chromium-vaapi.patch - # Load Widevine CDM if available patch -Np1 -i ../chromium-widevine.patch @@ -172,7 +164,6 @@ 'use_custom_libcxx=false' 'enable_hangout_services_extension=true' 'enable_widevine=true' -'use_vaapi=true' 'enable_nacl=false' 'enable_swiftshader=false' "google_api_key=\"${_google_api_key}\"" @@ -210,9 +201,6 @@ install -Dm4755 out/Release/chrome_sandbox "$pkgdir/usr/lib/chromium/chrome-sandbox" ln -s /usr/lib/chromium/chromedriver "$pkgdir/usr/bin/chromedriver" - install -Dm644 ../chromium-drirc-disable-10bpc-color-configs.conf \ -"$pkgdir/usr/share/drirc.d/10-$pkgname.conf" - install -Dm644 chrome/installer/linux/common/desktop.template \ "$pkgdir/usr/share/applications/chromium.desktop" install -Dm644 chrome/app/resources/manpage.1.in \ Deleted: chromium-drirc-disable-10bpc-color-configs.conf === --- chromium-drirc-disable-10bpc-color-configs.conf 2019-03-15 20:42:52 UTC (rev 348359) +++ chromium-drirc-disable-10bpc-color-configs.conf 2019-03-15 20:51:15 UTC (rev 348360) @@ -1,15 +0,0 @@ - - - - - - - - - Deleted: chromium-vaapi.patch === --- chromium-vaapi.patch2019-03-15 20:42:52 UTC (rev 348359) +++ chromium-vaapi.patch2019-03-15 20:51:15 UTC (rev 348360) @@ -1,116 +0,0 @@ -From abc7295ca1653c85472916909f0eb76e28e79a58 Mon Sep 17 00:00:00 2001 -From: Akarshan Biswas -Date: Thu, 24 Jan 2019 12:45:29 +0530 -Subject: [PATCH] Enable mojo with VDA2 on Linux - - chrome/browser/about_flags.cc| 8 - chrome/browser/flag_descriptions.cc | 9 +++-- - chrome/browser/flag
[arch-commits] Commit in chromium/trunk (3 files)
Date: Saturday, January 5, 2019 @ 06:13:44 Author: foutrelis Revision: 342976 upgpkg: chromium 71.0.3578.98-3 Disable ServiceWorkerServicification by default and implement a different fix for the Gmail breakage. https://crbug.com/913220#c61 Added: chromium/trunk/fix-nav-preload-with-third-party-cookie-blocking.patch Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/enable-ServiceWorkerServicification-by-default.patch + PKGBUILD |8 +-- enable-ServiceWorkerServicification-by-default.patch | 28 -- fix-nav-preload-with-third-party-cookie-blocking.patch | 40 +++ 3 files changed, 44 insertions(+), 32 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-01-05 05:07:27 UTC (rev 342975) +++ PKGBUILD2019-01-05 06:13:44 UTC (rev 342976) @@ -5,7 +5,7 @@ pkgname=chromium pkgver=71.0.3578.98 -pkgrel=2 +pkgrel=3 _launcher_ver=6 pkgdesc="A web browser built for speed, simplicity, and security" arch=('x86_64') @@ -23,7 +23,7 @@ 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 -enable-ServiceWorkerServicification-by-default.patch +fix-nav-preload-with-third-party-cookie-blocking.patch chromium-harfbuzz-r0.patch chromium-system-icu.patch chromium-widevine.patch @@ -30,7 +30,7 @@ chromium-skia-harmony.patch) sha256sums=('1c56a9e30825774c83d568d194e9585625c6e90f81ee0ef09760fcedc86b9d45' '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1' -'d8736348aef47c92f417f38cb4eaab45e75c48b16e3dd3bbe2e4ef64d858b97a' +'d2c497f3400baad7d380305f4705fd1e5b9f70a8460384490a1bb78e1c2b0f23' '1b370d49c43e88acfe7c0b1f9517047e927f3407bd80b4a48bba32c001f80136' 'c4f2d1bed9034c02b8806f00c2e8165df24de467803855904bff709ceaf11af5' 'd081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b' @@ -85,7 +85,7 @@ third_party/libxml/chromium/libxml_utils.cc # https://crbug.com/913220 - patch -Np1 -i ../enable-ServiceWorkerServicification-by-default.patch + patch -Np1 -i ../fix-nav-preload-with-third-party-cookie-blocking.patch # Load Widevine CDM if available patch -Np1 -i ../chromium-widevine.patch Deleted: enable-ServiceWorkerServicification-by-default.patch === --- enable-ServiceWorkerServicification-by-default.patch2019-01-05 05:07:27 UTC (rev 342975) +++ enable-ServiceWorkerServicification-by-default.patch2019-01-05 06:13:44 UTC (rev 342976) @@ -1,28 +0,0 @@ -From 5d2271ca9f5f569bbec950f9f0cc98af070ea52f Mon Sep 17 00:00:00 2001 -From: Matt Falkenhagen -Date: Wed, 17 Oct 2018 10:12:44 + -Subject: [PATCH] Enable ServiceWorkerServicification by default. - -Bug: 715640, 846235 -Change-Id: I49ed8a5a3bc5962cd52e24ab734b00fdfdd7b32d -Reviewed-on: https://chromium-review.googlesource.com/c/1286238 -Commit-Queue: Matt Falkenhagen -Reviewed-by: Kinuko Yasuda -Cr-Commit-Position: refs/heads/master@{#600337} - third_party/blink/common/features.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc -index a5cf355e1b..b58abdb515 100644 a/third_party/blink/common/features.cc -+++ b/third_party/blink/common/features.cc -@@ -59,7 +59,7 @@ const base::Feature kServiceWorkerParallelSideDataReading{ - // Enable new service worker glue for NetworkService. Can be - // enabled independently of NetworkService. - const base::Feature kServiceWorkerServicification{ --"ServiceWorkerServicification", base::FEATURE_DISABLED_BY_DEFAULT}; -+"ServiceWorkerServicification", base::FEATURE_ENABLED_BY_DEFAULT}; - - // Freeze scheduler task queues in background after allowed grace time. - // "stop" is a legacy name. Added: fix-nav-preload-with-third-party-cookie-blocking.patch === --- fix-nav-preload-with-third-party-cookie-blocking.patch (rev 0) +++ fix-nav-preload-with-third-party-cookie-blocking.patch 2019-01-05 06:13:44 UTC (rev 342976) @@ -0,0 +1,40 @@ +From c0d0bacc0ae01f15c4d06405057fd35f371bcaf3 Mon Sep 17 00:00:00 2001 +From: Matt Falkenhagen +Date: Tue, 18 Dec 2018 08:31:08 + +Subject: [PATCH] service worker: Fix nav preload with third-party cookie + blocking. + +In non-ServiceWorkerServicification, the navigation preload request +wasn't setting site_for_cookies field when converting from a URLRequest +to ResourceRequest, so StaticCookiePolicy was blocking cookie access +
[arch-commits] Commit in chromium/trunk (3 files)
Date: Thursday, June 21, 2018 @ 06:29:13 Author: foutrelis Revision: 327396 Update patch that disables XML catalogs Added: chromium/trunk/blink-disable-XML-catalogs-at-runtime.patch Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium-disable_xml_catalogs.patch -+ PKGBUILD|8 ++-- blink-disable-XML-catalogs-at-runtime.patch | 47 ++ chromium-disable_xml_catalogs.patch | 34 -- 3 files changed, 52 insertions(+), 37 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-06-21 06:26:45 UTC (rev 327395) +++ PKGBUILD2018-06-21 06:29:13 UTC (rev 327396) @@ -26,17 +26,17 @@ chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz remove-dependency-on-ffmpeg-internals-for-start-time.patch x11-fix-mixup-between-DIP-pixel-coordinates.patch +blink-disable-XML-catalogs-at-runtime.patch chromium-ffmpeg-r1.patch chromium-widevine-r2.patch -chromium-disable_xml_catalogs.patch chromium-skia-harmony.patch) sha256sums=('5d27a72f0cb8247343034f63fdd9747ff388c05b9fceb541668dd04fb372db1d' '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1' '2cc80f5ed8a9b42495a0f3ab3c1bae026b9081972269a1b6d407331d33f7d257' 'e2c2754536243a60fa70541bbd4121715eccd83caa8f1fb1873bd994cd81f871' +'98a5c41cf9687c52ee380d2b683c95387334c76254479c347bdb733646dab815' 'aa885330bc4180b78d915f9dfdfc3210038a0acab7b16735ea9828ab6a633bde' '02c69bb3954087db599def7f5b6d65cf8f7cf2ed81dfbdaa4bb7b51863b4df15' -'f9d191e89ed9b2b2641370ea0a11868409a13cad181f7b63f6007de002a1' 'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3') # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py @@ -87,6 +87,9 @@ # https://crbug.com/707721 patch -Np1 -i ../x11-fix-mixup-between-DIP-pixel-coordinates.patch + # https://crbug.com/736026 + patch -Np1 -i ../blink-disable-XML-catalogs-at-runtime.patch + # https://crbug.com/skia/6663#c10 patch -Np4 -i ../chromium-skia-harmony.patch @@ -93,7 +96,6 @@ # Fixes from Gentoo patch -Np1 -i ../chromium-ffmpeg-r1.patch patch -Np1 -i ../chromium-widevine-r2.patch - patch -Np1 -i ../chromium-disable_xml_catalogs.patch # Remove compiler flags not supported by our system clang sed -i \ Added: blink-disable-XML-catalogs-at-runtime.patch === --- blink-disable-XML-catalogs-at-runtime.patch (rev 0) +++ blink-disable-XML-catalogs-at-runtime.patch 2018-06-21 06:29:13 UTC (rev 327396) @@ -0,0 +1,47 @@ +From 8f0c8c8d9bce12c70ce9acb4a7474cd15c9be65b Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Wed, 20 Jun 2018 20:37:46 + +Subject: [PATCH] blink: disable XML catalogs at runtime + +Chromium may optionally be built against libxml installed on the system. +The system libxml commonly has XML catalog support enabled. Disable it +by calling xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE). + +Bug: https://bugs.gentoo.org/653078 +Change-Id: I069f6dcecf81168f9d31eb0efe2519197ec8e779 +Reviewed-on: https://chromium-review.googlesource.com/1103710 +Reviewed-by: Daniel Cheng +Commit-Queue: Scott Graham +Cr-Commit-Position: refs/heads/master@{#568998} +--- + .../blink/renderer/core/xml/parser/xml_document_parser.cc | 7 +++ + 1 file changed, 7 insertions(+) + +diff --git a/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc b/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc +index 9744de383d9a..d0539f61e4b5 100644 +--- a/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc b/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc +@@ -28,6 +28,10 @@ + + #include + #include ++#include ++#if defined(LIBXML_CATALOG_ENABLED) ++#include ++#endif + #include + + #include +@@ -648,6 +652,9 @@ static void InitializeLibXMLIfNecessary() { + if (did_init) + return; + ++#if defined(LIBXML_CATALOG_ENABLED) ++ xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE); ++#endif + xmlInitParser(); + xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc); + xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc); +-- +2.17.1 + Deleted: chromium-disable_xml_catalogs.patch === --- chromium-disable_xml_catalogs.patch 2018-06-21 06:26:45 UTC (rev 327395) +++ chromium-disable_xml_catalogs.patch 2018-06-21 06:29:13 UTC (rev 327396) @@ -1,34 +0,0 @@ a/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc -+++ b/third_party/blink/renderer/core/xml/parser/xml_document_par
[arch-commits] Commit in chromium/trunk (3 files)
Date: Wednesday, April 4, 2018 @ 16:37:57 Author: foutrelis Revision: 320941 upgpkg: chromium 65.0.3325.181-6 Add two upstream patches to fix: - Oversized title buttons with some GTK themes (FS#57746) - Intermittent scrolling issue (https://crbug.com/797708) Added: chromium/trunk/fix-frame-buttons-rendering-too-large-when-using-OSX.patch chromium/trunk/send-GSB-before-switching-to-mainthread-scrolling-in.patch Modified: chromium/trunk/PKGBUILD + PKGBUILD | 12 ++ fix-frame-buttons-rendering-too-large-when-using-OSX.patch | 60 +++ send-GSB-before-switching-to-mainthread-scrolling-in.patch | 53 + 3 files changed, 124 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-04-04 16:26:18 UTC (rev 320940) +++ PKGBUILD2018-04-04 16:37:57 UTC (rev 320941) @@ -6,7 +6,7 @@ pkgname=chromium pkgver=65.0.3325.181 -pkgrel=5 +pkgrel=6 _launcher_ver=6 pkgdesc="A web browser built for speed, simplicity, and security" arch=('x86_64') @@ -27,6 +27,8 @@ chromium-$pkgver.txt::https://chromium.googlesource.com/chromium/src.git/+/$pkgver?format=TEXT fix-crash-in-is_cfi-true-builds-with-unbundled-ICU.patch allow-stat-in-Linux-for-GPU-process-for-a-list-of-files.patch +fix-frame-buttons-rendering-too-large-when-using-OSX.patch +send-GSB-before-switching-to-mainthread-scrolling-in.patch chromium-skia-harmony.patch chromium-clang-r2.patch chromium-math.h-r0.patch @@ -37,6 +39,8 @@ '2771c049b66c9aba3b945fe065f2610f164d55506eb5d71751a26aaf8b40d4ee' 'e3fb73b43bb8c69ff517e66b2cac73d6e759fd240003eb35598df9af442422fe' '4327289866d0b3006de62799ec06b07198a738e50e0a5c2e41ff62dbe00b4a2c' +'bd5e0e61df3f89172590801aea7c8ac75162c10c7fe83e262e96a14388d1633a' +'b20bb43c89dd1fb5fc787e52b7ef6f4f20714f7d74e33372c0979fe398b5b436' 'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3' '4495e8b29dae242c79ffe4beefc5171eb3c7aacb7e9aebfd2d4d69b9d8c958d3' 'fe0ab86aa5b0072db730eccda3e1582ebed4af25815bfd49fe0da24cf63ca902' @@ -106,6 +110,12 @@ # https://crbug.com/817400 patch -Np1 -i ../allow-stat-in-Linux-for-GPU-process-for-a-list-of-files.patch + # https://crbug.com/821881 + patch -Np1 -i ../fix-frame-buttons-rendering-too-large-when-using-OSX.patch + + # https://crbug.com/797708 + patch -Np1 -i ../send-GSB-before-switching-to-mainthread-scrolling-in.patch + # https://crbug.com/skia/6663#c10 patch -Np4 -i ../chromium-skia-harmony.patch Added: fix-frame-buttons-rendering-too-large-when-using-OSX.patch === --- fix-frame-buttons-rendering-too-large-when-using-OSX.patch (rev 0) +++ fix-frame-buttons-rendering-too-large-when-using-OSX.patch 2018-04-04 16:37:57 UTC (rev 320941) @@ -0,0 +1,60 @@ +From 7ef426c221d11b53b6de507b398e35e8d7b3cc94 Mon Sep 17 00:00:00 2001 +From: Tom Anderson +Date: Wed, 4 Apr 2018 01:23:26 + +Subject: [PATCH] Fix frame buttons rendering too large when using + OSX-Arc-White GTK theme + +The check for GTK 3.20 was incorrect as the issue it was trying to fix +was still occurring on GTK 3.20+ systems. This CL adds the correct, +but more complex, check. + +Verified on these configurations: +{GTK 3.18, GTK 3.22} X +{Breeze, Adwaita, OSX-Arc-White, Greybird} X +{scale=1, scale=2} X +{fullscreen, restored} + +BUG=821881 +R=thestig + +Change-Id: I05afa35c1452a46a1abf4c39191a13657bfd8e2c +Reviewed-on: https://chromium-review.googlesource.com/990717 +Reviewed-by: Lei Zhang +Commit-Queue: Thomas Anderson +Cr-Commit-Position: refs/heads/master@{#547921} +--- + chrome/browser/ui/libgtkui/nav_button_provider_gtk3.cc | 18 +- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/chrome/browser/ui/libgtkui/nav_button_provider_gtk3.cc b/chrome/browser/ui/libgtkui/nav_button_provider_gtk3.cc +index 31a8087bca11..6a09faec5dd2 100644 +--- a/chrome/browser/ui/libgtkui/nav_button_provider_gtk3.cc b/chrome/browser/ui/libgtkui/nav_button_provider_gtk3.cc +@@ -213,7 +213,23 @@ class NavButtonImageSource : public gfx::ImageSkiaSource { + // is not scaled for the (unexpected) smaller button size, and the button's + // edges appear cut off. To fix this, manually set the background to scale + // to the button size when it would have clipped. +-if (GtkVersionCheck(3, 20)) { ++// ++// GTK's "contain" is unlike CSS's "contain". In CSS, the image would only ++// be downsized when it would have clipped. In GTK, the image is always ++// scaled to fit the drawing region (preserving aspect ratio). Only add ++// "contain" if clipping would occur. ++
[arch-commits] Commit in chromium/trunk (3 files)
Date: Thursday, December 21, 2017 @ 00:08:54 Author: foutrelis Revision: 313461 upgpkg: chromium 63.0.3239.108-2 - Use system freetype and harfbuzz - Unescape fragment for display in Omnibox Added: chromium/trunk/chromium-omnibox-unescape-fragment.patch Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium.desktop --+ PKGBUILD | 45 +- chromium-omnibox-unescape-fragment.patch | 437 + chromium.desktop | 112 --- 3 files changed, 466 insertions(+), 128 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-12-20 23:58:20 UTC (rev 313460) +++ PKGBUILD2017-12-21 00:08:54 UTC (rev 313461) @@ -6,7 +6,7 @@ pkgname=chromium pkgver=63.0.3239.108 -pkgrel=1 +pkgrel=2 _launcher_ver=5 pkgdesc="A web browser built for speed, simplicity, and security" arch=('x86_64') @@ -25,32 +25,32 @@ 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-$pkgver.txt::https://chromium.googlesource.com/chromium/src.git/+/$pkgver?format=TEXT -chromium.desktop -chromium-exclude_unwind_tables.patch +chromium-omnibox-unescape-fragment.patch chromium-clang-r1.patch chromium-webrtc-r0.patch +chromium-exclude_unwind_tables.patch chromium-widevine.patch) sha256sums=('47d80798194da78bdd519b7ce012425b13cf89d6eb287e22a34342a245c31a2b' '4dc3428f2c927955d9ae117f2fb24d098cc6dd67adb760ac9c82b522ec8b0587' '6da2cc8e4ae13547763f946c331b2f819fbb8af01681b8b90564a95f8a423e58' -'028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9' -'e53dc6f259acd39df13874f8a0f440528fae764b859dd71447991a5b1fac7c9c' +'814eb2cecb10cb697e24036b08aac41e88d0e38971741f9e946200764e2401ae' 'ab5368a3e3a67fa63b33fefc6788ad5b4a79089ef4db1011a14c3bee9fdf70c6' 'bcb2f4588cf5dcf75cde855c7431e94fdcc34bdd68b876a90f65ab9938594562' +'e53dc6f259acd39df13874f8a0f440528fae764b859dd71447991a5b1fac7c9c' 'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808') # 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=( - #[ffmpeg]=ffmpeg # https://crbug.com/731766 +readonly -A _system_libs=( + #[ffmpeg]=ffmpeg# https://crbug.com/731766 [flac]=flac - #[freetype]=freetype2 # https://crbug.com/pdfium/733 - #[harfbuzz-ng]=harfbuzz-icu # https://crbug.com/768938 - #[icu]=icu# https://crbug.com/772655 + #[freetype]=freetype2 # Using 'use_system_freetype=true' until M65 + #[harfbuzz-ng]=harfbuzz # Using 'use_system_harfbuzz=true' until M65 + #[icu]=icu # https://crbug.com/772655 + need M64 for ICU 60 [libdrm]= [libjpeg]=libjpeg - #[libpng]=libpng # https://crbug.com/752403#c10 - #[libvpx]=libvpx # https://bugs.gentoo.org/611394 + #[libpng]=libpng# https://crbug.com/752403#c10 + #[libvpx]=libvpx# https://bugs.gentoo.org/611394 [libwebp]=libwebp [libxml]=libxml2 [libxslt]=libxslt @@ -60,7 +60,13 @@ [yasm]= [zlib]=minizip ) -depends+=(${_system_libs[@]}) +readonly _unwanted_bundled_libs=( + ${!_system_libs[@]} + ${_system_libs[libjpeg]+libjpeg_turbo} + freetype + harfbuzz-ng +) +depends+=(${_system_libs[@]} freetype2 harfbuzz) # 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 @@ -90,6 +96,9 @@ # https://chromium-review.googlesource.com/c/chromium/src/+/712575 patch -Np1 -i ../chromium-exclude_unwind_tables.patch + # https://crbug.com/789163 + patch -Np1 -i ../chromium-omnibox-unescape-fragment.patch + # Fixes from Gentoo patch -Np1 -i ../chromium-clang-r1.patch patch -Np1 -i ../chromium-webrtc-r0.patch @@ -116,12 +125,14 @@ # *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[@]} ${_system_libs[libjpeg]+libjpeg_turbo}; do + for _lib in ${_unwanted_bundled_libs[@]}; do find -type f -path "*third_party/$_lib/*" \ \! -path "*third_party/$_lib/chromium/*" \ \! -path "*third_party/$_lib/google/*" \ - \! -path "*base/third_party/icu/*" \ - \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \ + \! -path './base/third_party/icu/*' \ + \! -path './third_party/freetype/src/src/psnames/pstables.h' \ + \! -path
[arch-commits] Commit in chromium/trunk (3 files)
Date: Friday, October 6, 2017 @ 20:36:34 Author: foutrelis Revision: 307065 Prepare for Chromium 62 Added: chromium/trunk/PKGBUILD.62 chromium/trunk/chromium-gn-bootstrap-r17.patch chromium/trunk/crc32c-string-view-check.patch -+ PKGBUILD.62 | 207 ++ chromium-gn-bootstrap-r17.patch | 68 crc32c-string-view-check.patch | 74 + 3 files changed, 349 insertions(+) Added: PKGBUILD.62 === --- PKGBUILD.62 (rev 0) +++ PKGBUILD.62 2017-10-06 20:36:34 UTC (rev 307065) @@ -0,0 +1,207 @@ +# $Id: PKGBUILD 277477 2016-10-01 03:36:40Z foutrelis $ +# Maintainer: Evangelos Foutras +# Contributor: Pierre Schmitz +# Contributor: Jan "heftig" Steffens +# Contributor: Daniel J Griffiths + +pkgname=chromium +pkgver=62.0.3202.45 +pkgrel=1 +_launcher_ver=5 +pkgdesc="A web browser built for speed, simplicity, and security" +arch=('i686' 'x86_64') +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') +makedepends=('python2' 'gperf' 'yasm' 'mesa' 'ninja' 'nodejs' '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=(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 +breakpad-use-ucontext_t.patch +crc32c-string-view-check.patch +chromium-gn-bootstrap-r17.patch +chromium-widevine.patch) +sha256sums=('975a2fd6dff93067860016959de8e9fbad21778c67c16f4d29e1faee19635c13' +'4dc3428f2c927955d9ae117f2fb24d098cc6dd67adb760ac9c82b522ec8b0587' +'028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9' +'6e9a345f810d36068ee74ebba4708c70ab30421dad3571b6be5e9db635078ea8' +'35435e8dae76737baafecdc76d74a1c97281c4179e416556e033a06a31468e6d' +'d81319f168dad0e411c8e810f73daa2f56ff579578771bd9c9bb1aa2d7c09a8b' +'d6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808') + +# 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=( + #[ffmpeg]=ffmpeg # https://crbug.com/731766 + [flac]=flac + #[freetype]=freetype2 # https://crbug.com/pdfium/733 + [harfbuzz-ng]=harfbuzz-icu + [icu]=icu + [libdrm]= + [libjpeg]=libjpeg + #[libpng]=libpng # https://crbug.com/752403#c10 + #[libvpx]=libvpx # https://bugs.gentoo.org/611394 + [libwebp]=libwebp + [libxml]=libxml2 + [libxslt]=libxslt + [opus]=opus + [re2]=re2 + [snappy]=snappy + [yasm]= + [zlib]=minizip +) +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" + + # https://crbug.com/710701 + local _chrome_build_hash=$(curl -s https://chromium.googlesource.com/chromium/src.git/+/$pkgver?format=TEXT | +base64 -d | grep -Po '^parent \K[a-z0-9]{40}$') + if [[ -z $_chrome_build_hash ]]; then +error "Unable to fetch Chrome build hash." +return 1 + fi + echo "LASTCHANGE=$_chrome_build_hash-" >build/util/LASTCHANGE + + # 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 + + # Fix build with glibc 2.26 + patch -Np1 -i ../breakpad-use-ucontext_t.patch + + # Fix incorrect inclusion of in modes other than >= C++17 + patch -Np1 -d third_party/crc32c/src <../crc32c-string-view-check.patch + + # Fixes from Gentoo + patch -Np1 -i ../chromium-gn-bootstrap-r17.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 "$srcdir/python2-path" + ln -s /usr/bin/python2 "$srcdir/python2-path/python" + + mkdir -p third_party/node/linux/node-linux-x64/bin +
[arch-commits] Commit in chromium/trunk (3 files)
Date: Thursday, March 3, 2016 @ 08:38:11 Author: foutrelis Revision: 260569 upgpkg: chromium 49.0.2623.75-1 New upstream release. Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium-fix-print-preview-on-en_GB-locale.patch chromium/trunk/chromium-use-non-versioned-icu-namespace.patch --+ PKGBUILD | 15 +++ chromium-fix-print-preview-on-en_GB-locale.patch | 17 - chromium-use-non-versioned-icu-namespace.patch | 14 -- 3 files changed, 3 insertions(+), 43 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-03-03 07:18:38 UTC (rev 260568) +++ PKGBUILD2016-03-03 07:38:11 UTC (rev 260569) @@ -5,7 +5,7 @@ # Contributor: Daniel J Griffiths pkgname=chromium -pkgver=48.0.2564.116 +pkgver=49.0.2623.75 pkgrel=1 _launcher_ver=3 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" @@ -27,14 +27,10 @@ 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-use-non-versioned-icu-namespace.patch -chromium-fix-print-preview-on-en_GB-locale.patch chromium-widevine.patch) -sha256sums=('6a1eb9b4c853f15eeec0a55af7ac3b41835f0fc592ba6c0a500873cb12a84d0f' +sha256sums=('a4fd4c85b12b021789d8afc33b27555396e47d9f67c8a062ee3609c4d6b582f5' '8b01fb4efe58146279858a754d90b49e5a38c9a0b36a1f84cbb7d12f92b84c28' '028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9' -'e4192446cc0ab6a5c540599c8a149f4f2208f0014da2786ada6c9544913d7426' -'6fff45aafa31fb35a032b4e2175a341e08f9d2a9b37c5cf080c318180f558378' '4660344789c45c9b9e52cb6d86f7cb6edb297b39320d04f6947e5216d6e5f64c') # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -63,12 +59,6 @@ # https://code.google.com/p/chromium/issues/detail?id=541273 sed -i "/'target_name': 'libvpx'/s/libvpx/&_new/" build/linux/unbundle/libvpx.gyp - # https://codereview.chromium.org/1505763002 - patch -Np1 -i ../chromium-use-non-versioned-icu-namespace.patch - - # https://code.google.com/p/chromium/issues/detail?id=480415 - patch -Np1 -i ../chromium-fix-print-preview-on-en_GB-locale.patch - # 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") @@ -147,6 +137,7 @@ -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 Deleted: chromium-fix-print-preview-on-en_GB-locale.patch === --- chromium-fix-print-preview-on-en_GB-locale.patch2016-03-03 07:18:38 UTC (rev 260568) +++ chromium-fix-print-preview-on-en_GB-locale.patch2016-03-03 07:38:11 UTC (rev 260569) @@ -1,17 +0,0 @@ -Index: chrome/browser/ui/webui/print_preview/print_preview_handler.cc -diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc -index 6cfd861387c9f8b145fb33472b10025537986213..c936a9c1dadb13c00418e8ae79a8a1987c1d36cd 100644 a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc -+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc -@@ -1222,7 +1222,10 @@ void PrintPreviewHandler::GetNumberFormatAndMeasurementSystem( - UErrorCode errorCode = U_ZERO_ERROR; - const char* locale = g_browser_process->GetApplicationLocale().c_str(); - UMeasurementSystem system = ulocdata_getMeasurementSystem(locale, &errorCode); -- if (errorCode > U_ZERO_ERROR || system == UMS_LIMIT) -+ // On error, assume the units are SI. -+ // Since the only measurement units print preview's WebUI cares about are -+ // those for measuring distance, assume anything non-US is SI. -+ if (errorCode > U_ZERO_ERROR || system != UMS_US) - system = UMS_SI; - - // Getting the number formatting based on the locale and writing to Deleted: chromium-use-non-versioned-icu-namespace.patch === --- chromium-use-non-versioned-icu-namespace.patch 2016-03-03 07:18:38 UTC (rev 260568) +++ chromium-use-non-versioned-icu-namespace.patch 2016-03-03 07:38:11 UTC (rev 260569) @@ -1,14 +0,0 @@ -Index: components/autofill/core/common/autofill_l10n_util.cc -diff --git a/components/autofill/core/common/autofill_l10n_util.cc b/components/autofill/core/common/autofill_l10n_util.cc
[arch-commits] Commit in chromium/trunk (3 files)
Date: Wednesday, September 2, 2015 @ 02:15:54 Author: foutrelis Revision: 245187 upgpkg: chromium 45.0.2454.85-1 New upstream release. Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch chromium/trunk/0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch -+ 0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch | 33 -- 0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch | 32 - PKGBUILD| 19 + 3 files changed, 4 insertions(+), 80 deletions(-) Deleted: 0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch === --- 0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch 2015-09-01 22:36:16 UTC (rev 245186) +++ 0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch 2015-09-02 00:15:54 UTC (rev 245187) @@ -1,33 +0,0 @@ -From 1da1e686a87ad9f95d26786d2b53a1a4c280189f Mon Sep 17 00:00:00 2001 -From: agl -Date: Wed, 20 May 2015 13:20:29 -0700 -Subject: [PATCH] NSS: reject DH groups smaller than 1024 bits. - -Since some platforms are still using NSS for now, this change mirrors https://boringssl-review.googlesource.com/#/c/4813/ in NSS. - -BUG=490240 - -Review URL: https://codereview.chromium.org/1143303002 - -Cr-Commit-Position: refs/heads/master@{#330791} - net/third_party/nss/ssl/ssl3con.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c -index 89c98ea..861d434 100644 a/net/third_party/nss/ssl/ssl3con.c -+++ b/net/third_party/nss/ssl/ssl3con.c -@@ -6946,7 +6946,8 @@ ssl3_HandleServerKeyExchange(sslSocket *ss, SSL3Opaque *b, PRUint32 length) - if (rv != SECSuccess) { - goto loser; /* malformed. */ - } -- if (dh_p.len < 512/8) { -+ if (dh_p.len < 1024/8 || -+ (dh_p.len == 1024/8 && (dh_p.data[0] & 0x80) == 0)) { - errCode = SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY; - goto alert_loser; - } --- -2.4.2 - Deleted: 0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch === --- 0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch 2015-09-01 22:36:16 UTC (rev 245186) +++ 0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch 2015-09-02 00:15:54 UTC (rev 245187) @@ -1,32 +0,0 @@ -From aa9abe7692a3ee99b69811594938d97cb180351e Mon Sep 17 00:00:00 2001 -From: avi -Date: Wed, 20 May 2015 13:57:17 -0700 -Subject: [PATCH] Use the correct URL for ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY - errors. - -BUG=490260,490240 -TEST=as in bug - -Review URL: https://codereview.chromium.org/1148943002 - -Cr-Commit-Position: refs/heads/master@{#330799} - chrome/common/localized_error.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc -index 0c4ad43..1ea56b1 100644 a/chrome/common/localized_error.cc -+++ b/chrome/common/localized_error.cc -@@ -49,7 +49,7 @@ namespace { - static const char kRedirectLoopLearnMoreUrl[] = - "https://www.google.com/support/chrome/bin/answer.py?answer=95626";; - static const char kWeakDHKeyLearnMoreUrl[] = --"http://sites.google.com/a/chromium.org/dev/"; -+"https://www.chromium.org/administrators/"; - "err_ssl_weak_server_ephemeral_dh_key"; - #if defined(OS_CHROMEOS) - static const char kAppWarningLearnMoreUrl[] = --- -2.4.2 - Modified: PKGBUILD === --- PKGBUILD2015-09-01 22:36:16 UTC (rev 245186) +++ PKGBUILD2015-09-02 00:15:54 UTC (rev 245187) @@ -5,7 +5,7 @@ # Contributor: Daniel J Griffiths pkgname=chromium -pkgver=44.0.2403.157 +pkgver=45.0.2454.85 pkgrel=1 _launcher_ver=2 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" @@ -15,8 +15,7 @@ depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'icu' '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') + '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' @@ -27,15 +26,11 @@ 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$_laun
[arch-commits] Commit in chromium/trunk (3 files)
Date: Tuesday, June 23, 2015 @ 07:15:23 Author: foutrelis Revision: 241220 upgpkg: chromium 43.0.2357.130-1 New upstream release. Added: chromium/trunk/0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch chromium/trunk/0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch Modified: chromium/trunk/PKGBUILD -+ 0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch | 33 ++ 0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch | 32 + PKGBUILD| 17 +++-- 3 files changed, 78 insertions(+), 4 deletions(-) Added: 0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch === --- 0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch (rev 0) +++ 0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch 2015-06-23 05:15:23 UTC (rev 241220) @@ -0,0 +1,33 @@ +From 1da1e686a87ad9f95d26786d2b53a1a4c280189f Mon Sep 17 00:00:00 2001 +From: agl +Date: Wed, 20 May 2015 13:20:29 -0700 +Subject: [PATCH] NSS: reject DH groups smaller than 1024 bits. + +Since some platforms are still using NSS for now, this change mirrors https://boringssl-review.googlesource.com/#/c/4813/ in NSS. + +BUG=490240 + +Review URL: https://codereview.chromium.org/1143303002 + +Cr-Commit-Position: refs/heads/master@{#330791} +--- + net/third_party/nss/ssl/ssl3con.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c +index 89c98ea..861d434 100644 +--- a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c +@@ -6946,7 +6946,8 @@ ssl3_HandleServerKeyExchange(sslSocket *ss, SSL3Opaque *b, PRUint32 length) + if (rv != SECSuccess) { + goto loser; /* malformed. */ + } +- if (dh_p.len < 512/8) { ++ if (dh_p.len < 1024/8 || ++ (dh_p.len == 1024/8 && (dh_p.data[0] & 0x80) == 0)) { + errCode = SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY; + goto alert_loser; + } +-- +2.4.2 + Added: 0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch === --- 0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch (rev 0) +++ 0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch 2015-06-23 05:15:23 UTC (rev 241220) @@ -0,0 +1,32 @@ +From aa9abe7692a3ee99b69811594938d97cb180351e Mon Sep 17 00:00:00 2001 +From: avi +Date: Wed, 20 May 2015 13:57:17 -0700 +Subject: [PATCH] Use the correct URL for ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY + errors. + +BUG=490260,490240 +TEST=as in bug + +Review URL: https://codereview.chromium.org/1148943002 + +Cr-Commit-Position: refs/heads/master@{#330799} +--- + chrome/common/localized_error.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc +index 0c4ad43..1ea56b1 100644 +--- a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc +@@ -49,7 +49,7 @@ namespace { + static const char kRedirectLoopLearnMoreUrl[] = + "https://www.google.com/support/chrome/bin/answer.py?answer=95626";; + static const char kWeakDHKeyLearnMoreUrl[] = +-"http://sites.google.com/a/chromium.org/dev/"; ++"https://www.chromium.org/administrators/"; + "err_ssl_weak_server_ephemeral_dh_key"; + #if defined(OS_CHROMEOS) + static const char kAppWarningLearnMoreUrl[] = +-- +2.4.2 + Modified: PKGBUILD === --- PKGBUILD2015-06-23 04:33:01 UTC (rev 241219) +++ PKGBUILD2015-06-23 05:15:23 UTC (rev 241220) @@ -5,8 +5,8 @@ # Contributor: Daniel J Griffiths pkgname=chromium -pkgver=43.0.2357.125 -pkgrel=2 +pkgver=43.0.2357.130 +pkgrel=1 _launcher_ver=2 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" arch=('i686' 'x86_64') @@ -27,11 +27,15 @@ 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 +0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch +0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch add-build-flag-to-disable-hotwording.patch chromium-widevine.patch) -sha256sums=('af1774d093f90f9ccfd7def3b2b3a8caa109274ac28d4bec0285e50f8a5a5405' +sha256sums=('62fb55439396a5d49ba53d4377e8d2554c14c2e8a6255f07909ccee8f248002e' '7f91c81721092d707d7b94e6555a48bc7fd0bc0e1174df4649bdcd745930e52f' '028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9'
[arch-commits] Commit in chromium/trunk (3 files)
Date: Saturday, September 13, 2014 @ 22:39:42 Author: foutrelis Revision: 221625 upgpkg: chromium 37.0.2062.120-2 Fix FS#41033: URL request check fails for save-as command Fix FS#41963: Use the correct referrer policy in the FrameFetchContext Added: chromium/trunk/chromium-sanitize-referrer-in-context-menus.patch chromium/trunk/chromium-use-correct-referrer-policy.patch Modified: chromium/trunk/PKGBUILD ---+ PKGBUILD | 16 chromium-sanitize-referrer-in-context-menus.patch | 388 chromium-use-correct-referrer-policy.patch| 32 + 3 files changed, 434 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-09-13 18:28:27 UTC (rev 221624) +++ PKGBUILD2014-09-13 20:39:42 UTC (rev 221625) @@ -6,7 +6,7 @@ pkgname=chromium pkgver=37.0.2062.120 -pkgrel=1 +pkgrel=2 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/"; @@ -29,11 +29,15 @@ chromium.desktop chromium.default chromium-nacl-bootstrap-cflags.patch +chromium-sanitize-referrer-in-context-menus.patch +chromium-use-correct-referrer-policy.patch chromium.sh) sha256sums=('b3073758b6caf384d30de20ba7514ee52cce5c1460bc768cd28d15f53f0c6efb' '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322' '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232' 'd82bafd8d4d6517c2d420b2987fdbe1dfcc32d5fed74a6c0011bcb2f868225c3' +'c5d793dbaaaee8455ffc5cf008239b0b0bb8fe32e2e7b2b44d181cebb432f28e' +'9f5b73070b1d360c1d7915115c6829e11361d243e424c24179ca39b28ae03f85' '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9') # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -49,8 +53,16 @@ # Filter out -fstack-protector-strong for nacl_helper_bootstrap # https://code.google.com/p/chromium/issues/detail?id=104569 - patch -Np0 -i ../chromium-nacl-bootstrap-cflags.patch + patch -Np0 <../chromium-nacl-bootstrap-cflags.patch + # URL request check fails for save-as command (FS#41033) + # https://code.google.com/p/chromium/issues/detail?id=357473 + patch -Np1 <../chromium-sanitize-referrer-in-context-menus.patch + + # Make sure to use the correct referrer policy in the FrameFetchContext + # https://code.google.com/p/chromium/issues/detail?id=407510 + patch -d third_party/WebKit -Np1 <../chromium-use-correct-referrer-policy.patch + # Use Python 2 find . -type f -exec sed -i -r \ -e 's|/usr/bin/python$|&2|g' \ Added: chromium-sanitize-referrer-in-context-menus.patch === --- chromium-sanitize-referrer-in-context-menus.patch (rev 0) +++ chromium-sanitize-referrer-in-context-menus.patch 2014-09-13 20:39:42 UTC (rev 221625) @@ -0,0 +1,388 @@ +Index: chrome/browser/download/download_browsertest.cc +diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc +index 9fd163b1133b65f68a2369e9e0c452e5253d1b47..91525d254e70e40afe3b1765119d547c5b295a79 100644 +--- a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc +@@ -15,6 +15,7 @@ + #include "base/path_service.h" + #include "base/prefs/pref_service.h" + #include "base/stl_util.h" ++#include "base/strings/string_number_conversions.h" + #include "base/strings/string_split.h" + #include "base/strings/string_util.h" + #include "base/strings/stringprintf.h" +@@ -44,6 +45,7 @@ + #include "chrome/browser/infobars/infobar_service.h" + #include "chrome/browser/net/url_request_mock_util.h" + #include "chrome/browser/profiles/profile.h" ++#include "chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h" + #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h" + #include "chrome/browser/safe_browsing/download_feedback_service.h" + #include "chrome/browser/safe_browsing/download_protection_service.h" +@@ -2750,6 +2752,116 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, LoadURLExternallyReferrerPolicy) { + ASSERT_TRUE(VerifyFile(file, expected_contents, expected_contents.length())); + } + ++// This test ensures that the Referer header is properly sanitized when ++// Save Link As is chosen from the context menu. ++IN_PROC_BROWSER_TEST_F(DownloadTest, SaveLinkAsReferrerPolicyOrigin) { ++ // Do initial setup. ++ ASSERT_TRUE(test_server()->Start()); ++ net::SpawnedTestServer ssl_test_server( ++ net::SpawnedTestServer::TYPE_HTTPS, ++ net::SpawnedTestServer::kLocalhost, ++ base::FilePath(FILE_PATH_LITERAL("chrome/test/data/referrer_p
[arch-commits] Commit in chromium/trunk (3 files)
Date: Thursday, November 14, 2013 @ 00:41:00 Author: foutrelis Revision: 199519 upgpkg: chromium 31.0.1650.48-1 New upstream release. Added: chromium/trunk/chromium-31.0.1650.48-NPAPI-cookies.patch chromium/trunk/chromium-31.0.1650.48-NPN_URLRedirectResponse.patch Modified: chromium/trunk/PKGBUILD -+ PKGBUILD| 36 +- chromium-31.0.1650.48-NPAPI-cookies.patch | 276 ++ chromium-31.0.1650.48-NPN_URLRedirectResponse.patch | 13 3 files changed, 316 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-11-13 23:06:31 UTC (rev 199518) +++ PKGBUILD2013-11-13 23:41:00 UTC (rev 199519) @@ -5,8 +5,8 @@ # Contributor: Daniel J Griffiths pkgname=chromium -pkgver=30.0.1599.114 -_toolchains_rev=12029 +pkgver=31.0.1650.48 +_toolchains_rev=12181 pkgrel=1 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.chromium.org/"; license=('BSD') depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'icu' - 'libgcrypt' 'ttf-font' 'udev' 'dbus' 'flac' 'opus' 'libwebp' 'snappy' + 'libgcrypt' 'ttf-font' 'udev' 'dbus' 'flac' 'opus' 'snappy' 'speech-dispatcher' 'pciutils' 'libpulse' 'harfbuzz' 'harfbuzz-icu' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' @@ -21,6 +21,7 @@ [[ $CARCH = x86_64 ]] && makedepends+=('lib32-gcc-libs' 'lib32-zlib') optdepends=('kdebase-kdialog: needed for file dialogs in KDE') backup=('etc/chromium/default') +options=('!strip') install=chromium.install source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz naclsdk_nacl_linux_x86-$_toolchains_rev.tgz::https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/$_toolchains_rev/naclsdk_linux_x86.tgz @@ -30,18 +31,22 @@ chromium.desktop chromium.default chromium.sh +chromium-31.0.1650.48-NPN_URLRedirectResponse.patch +chromium-31.0.1650.48-NPAPI-cookies.patch chromium-system-icu-r0.patch) noextract=(naclsdk_nacl_linux_x86-$_toolchains_rev.tgz naclsdk_pnacl_linux_x86-$_toolchains_rev.tgz naclsdk_pnacl_translator-$_toolchains_rev.tgz) -sha256sums=('82ff2b54cb6fa9f314098e9905e79d578d97940bab05111a3c0c782217c2b760' -'641e2acf0e755bfe052016164e9e0198104130b612a042eacf259a2f2630d6cd' -'6ce53b1af8fef34c1557c7fbb764cfbca29cb70b8ee3367746a31976cf115e01' -'0b7afcbad1461336e7062d7c8d64e67e670a1fce07214e24313204af1f3a5a70' -'d6c5ed767ee9ee4e92b4de958cd32b0152783f170c1483fe99d2199fc2623813' +sha256sums=('3e478b5b85a023b3bba55b23d71cd6f585a08f865f7a98297a9a0757e9695c5d' +'cb4ac159f61de5e75d339813c0fc74f986156310a2c43a30ba40125951e72450' +'ad229b69a5af72a9fa7cf2167ee48560cc11049206e4ef919cb31d1273d6409f' +'fdb8309ef2b1c8600d63c4420ac02d66d85ab9befe98d99e9706828870730077' +'162cf456b0a1cb4ce505004f828a09164ee3e3c8274739c6d5e972bf0ef1cfe9' '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322' '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232' '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9' +'c2e56730e0cf962d762d18abf8488e1b19b4688ce39d22dd74c47dba7996319b' +'b24f58147333eb29f762aec58742db74825b587def3d6daf16c8cd315ce6ccff' '9bf164094ff33565f79807ab17cbd1d3f75655383fdaa01bb1a702263174cf09') # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -55,6 +60,14 @@ prepare() { cd "$srcdir/$pkgname-$pkgver" + # Black screen is displayed when playing a video with NPAPI plugin + # http://code.google.com/p/chromium/issues/detail?id=301510 + patch -Np0 -i "$srcdir/chromium-31.0.1650.48-NPN_URLRedirectResponse.patch" + + # Cookies not being sent with plugin requests + # http://code.google.com/p/chromium/issues/detail?id=316511 + patch -Np0 -i "$srcdir/chromium-31.0.1650.48-NPAPI-cookies.patch" + # Fix build with system ICU (patch from Gentoo) patch -Np0 -i "$srcdir/chromium-system-icu-r0.patch" @@ -116,7 +129,6 @@ -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 --Duse_system_libwebp=1 -Duse_system_libxml=0 -Duse_system_opus=1 -Duse_system_snappy=1 @@ -146,6 +158,12 @@ out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \ "$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/chromi
[arch-commits] Commit in chromium/trunk (3 files)
Date: Wednesday, October 2, 2013 @ 23:49:45 Author: foutrelis Revision: 195867 upgpkg: chromium 30.0.1599.66-1 New upstream release. Added: chromium/trunk/chromium-system-icu-r0.patch Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium-28.0.1500.71-avoid-std-string-copying-in-GetFileNameInWhitelist.patch + PKGBUILD | 47 ++ chromium-28.0.1500.71-avoid-std-string-copying-in-GetFileNameInWhitelist.patch | 46 - chromium-system-icu-r0.patch | 26 + 3 files changed, 56 insertions(+), 63 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-10-02 19:57:01 UTC (rev 195866) +++ PKGBUILD2013-10-02 21:49:45 UTC (rev 195867) @@ -5,7 +5,8 @@ # Contributor: Daniel J Griffiths pkgname=chromium -pkgver=29.0.1547.76 +pkgver=30.0.1599.66 +_toolchains_rev=12029 pkgrel=1 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" arch=('i686' 'x86_64') @@ -16,20 +17,32 @@ 'speech-dispatcher' 'pciutils' 'libpulse' 'harfbuzz' 'harfbuzz-icu' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' - 'elfutils' 'subversion' 'nacl-toolchain-newlib') + 'elfutils' 'subversion') +[[ $CARCH = x86_64 ]] && makedepends+=('lib32-gcc-libs' 'lib32-zlib') optdepends=('kdebase-kdialog: needed for file dialogs in KDE') backup=('etc/chromium/default') install=chromium.install source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz + naclsdk_nacl_linux_x86-$_toolchains_rev.tgz::https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/$_toolchains_rev/naclsdk_linux_x86.tgz + naclsdk_pnacl_linux_x86-$_toolchains_rev.tgz::https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/$_toolchains_rev/naclsdk_pnacl_linux_x86.tgz + naclsdk_pnacl_translator-$_toolchains_rev.tgz::https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/$_toolchains_rev/naclsdk_pnacl_translator.tgz + naclsdk_pnacl_translator-$_toolchains_rev.tgz.sha1hash::https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/$_toolchains_rev/naclsdk_pnacl_translator.tgz.sha1hash chromium.desktop chromium.default chromium.sh - chromium-28.0.1500.71-avoid-std-string-copying-in-GetFileNameInWhitelist.patch) -sha256sums=('61db2740f6eb7f95aeadf20d5e34a5c6759e9e8d08b88f5c960e041cfc502888' +chromium-system-icu-r0.patch) +noextract=(naclsdk_nacl_linux_x86-$_toolchains_rev.tgz + naclsdk_pnacl_linux_x86-$_toolchains_rev.tgz + naclsdk_pnacl_translator-$_toolchains_rev.tgz) +sha256sums=('8fe8262fd69b59c759916d17eaf4225d1d5b64c468629cb9a684144d3cd15724' +'641e2acf0e755bfe052016164e9e0198104130b612a042eacf259a2f2630d6cd' +'6ce53b1af8fef34c1557c7fbb764cfbca29cb70b8ee3367746a31976cf115e01' +'0b7afcbad1461336e7062d7c8d64e67e670a1fce07214e24313204af1f3a5a70' +'d6c5ed767ee9ee4e92b4de958cd32b0152783f170c1483fe99d2199fc2623813' '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322' '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232' '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9' -'7c2e448c30677999f524f9513c2f998f3cb15bc6084692cad9c3f310aa813530') +'9bf164094ff33565f79807ab17cbd1d3f75655383fdaa01bb1a702263174cf09') # 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 @@ -42,10 +55,8 @@ prepare() { cd "$srcdir/$pkgname-$pkgver" - # Fix deadlock related to the GPU sandbox when tcmalloc isn't used - # https://code.google.com/p/chromium/issues/detail?id=255063 - # https://bugs.gentoo.org/show_bug.cgi?id=471198#c23 - patch -Np1 -i "$srcdir/chromium-28.0.1500.71-avoid-std-string-copying-in-GetFileNameInWhitelist.patch" + # Fix build with system ICU (patch from Gentoo) + patch -Np0 -i "$srcdir/chromium-system-icu-r0.patch" # Use Python 2 find . -type f -exec sed -i -r \ @@ -57,10 +68,15 @@ ln -s /usr/bin/python2 "$srcdir/python2-path/python" # Prepare NaCL toolchain - mkdir -p out/Release/obj/gen/sdk/toolchain - cp -a /usr/lib/nacl-toolchain-newlib \ -out/Release/obj/gen/sdk/toolchain/linux_x86_newlib - touch out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/stamp.untar + mkdir native_client/toolchain/{.tars,pnacl_translator} + ln -s "$srcdir/naclsdk_nacl_linux_x86-$_toolchains_rev.tgz" \ +native_client/toolchain/.tar
[arch-commits] Commit in chromium/trunk (3 files)
Date: Wednesday, August 21, 2013 @ 04:10:52 Author: foutrelis Revision: 193475 upgpkg: chromium 29.0.1547.57-1 New upstream release. Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium-nss-3.15.patch chromium/trunk/chromium-system-harfbuzz-r0.patch ---+ PKGBUILD | 21 - chromium-nss-3.15.patch | 26 - chromium-system-harfbuzz-r0.patch | 44 3 files changed, 6 insertions(+), 85 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-08-20 22:25:07 UTC (rev 193474) +++ PKGBUILD2013-08-21 02:10:52 UTC (rev 193475) @@ -5,7 +5,7 @@ # Contributor: Daniel J Griffiths pkgname=chromium -pkgver=28.0.1500.95 +pkgver=29.0.1547.57 pkgrel=1 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" arch=('i686' 'x86_64') @@ -24,16 +24,12 @@ chromium.desktop chromium.default chromium.sh - chromium-28.0.1500.71-avoid-std-string-copying-in-GetFileNameInWhitelist.patch -chromium-nss-3.15.patch -chromium-system-harfbuzz-r0.patch) -sha256sums=('3c3bebed3d13f860babc7fb667d425723c350e25cdfb73fc746f4f91d734' + chromium-28.0.1500.71-avoid-std-string-copying-in-GetFileNameInWhitelist.patch) +sha256sums=('ae77204a5417ad7bf1ade257ba49f3ca64c83ed5741cb811a31f9f675d498576' '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322' '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232' '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9' -'7c2e448c30677999f524f9513c2f998f3cb15bc6084692cad9c3f310aa813530' -'a5ca532d213cc6f9ad19341445309ad4e4aec9530f4309536fb42ee97deca5a6' -'2bc4cf17adac9864f4e832e57247984f28fce171d3699c0fc2c3596d1ab20386') +'7c2e448c30677999f524f9513c2f998f3cb15bc6084692cad9c3f310aa813530') # 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 @@ -51,12 +47,6 @@ # https://bugs.gentoo.org/show_bug.cgi?id=471198#c23 patch -Np1 -i "$srcdir/chromium-28.0.1500.71-avoid-std-string-copying-in-GetFileNameInWhitelist.patch" - # Fix build with NSS 3.15 (patch from Gentoo) - patch -Np1 -i "$srcdir/chromium-nss-3.15.patch" - - # Fix build with system harfbuzz (patch from Gentoo) - patch -Np1 -i "$srcdir/chromium-system-harfbuzz-r0.patch" - # Use Python 2 find . -type f -exec sed -i -r \ -e 's|/usr/bin/python$|&2|g' \ @@ -98,6 +88,7 @@ -Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0 -Dlinux_use_tcmalloc=0 +-Dlogging_like_official_build=1 -Drelease_extra_cflags="$CFLAGS" -Dlibspeechd_h_prefix=speech-dispatcher/ -Dffmpeg_branding=Chrome @@ -125,7 +116,7 @@ -Ddisable_sse2=1) build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}" - build/gyp_chromium --depth=. "${_chromium_conf[@]}" + build/gyp_chromium -f make --depth=. "${_chromium_conf[@]}" make chrome chrome_sandbox BUILDTYPE=Release } Deleted: chromium-nss-3.15.patch === --- chromium-nss-3.15.patch 2013-08-20 22:25:07 UTC (rev 193474) +++ chromium-nss-3.15.patch 2013-08-21 02:10:52 UTC (rev 193475) @@ -1,26 +0,0 @@ a/net/third_party/nss/ssl/bodge/secitem_array.c -+++ b/net/third_party/nss/ssl/bodge/secitem_array.c -@@ -6,6 +6,7 @@ - * Support routines for SECItemArray data structure. - */ - -+#include "nssutil.h" - #include "seccomon.h" - #include "secitem.h" - #include "secerr.h" -@@ -13,10 +14,15 @@ - -+#define NSSUTIL_VERSION_NUM \ -+(NSSUTIL_VMAJOR * 1 + NSSUTIL_VMINOR * 100 + NSSUTIL_VPATCH) -+#if NSSUTIL_VERSION_NUM < 31500 -+// Added in NSS 3.15. - typedef struct SECItemArrayStr SECItemArray; - - struct SECItemArrayStr { - SECItem *items; - unsigned int len; - }; -+#endif - - SECItemArray * - SECITEM_AllocArray(PLArenaPool *arena, SECItemArray *array, unsigned int len) Deleted: chromium-system-harfbuzz-r0.patch === --- chromium-system-harfbuzz-r0.patch 2013-08-20 22:25:07 UTC (rev 193474) +++ chromium-system-harfbuzz-r0.patch 2013-08-21 02:10:52 UTC (rev 193475) @@ -1,44 +0,0 @@ -Index: build/linux/unbundle/harfbuzz.gyp -diff --git a/build/linux/unbundle/harfbuzz.gyp b/build/linux/unbundle/harfbuzz.gyp -index 456dd384df2d5c57d9857cfb775d46ef87add2bc..93b2a69c12d7b7524fa0c2aa67b52136b779196d 100644 a/build/linux/unbundle/harfbuzz.gyp -+++ b/build/linux/unbundle/harfbuzz.gyp -@@ -3,24 +3,34 @@ - # found in the LICENSE file. - - { -+ 'variables': { -+# Check for presence of harfbuzz-icu library, use it if present. -+
[arch-commits] Commit in chromium/trunk (3 files)
Date: Friday, March 29, 2013 @ 03:54:22 Author: foutrelis Revision: 180975 upgpkg: chromium 26.0.1410.43-2 Fix choppy/stuttering HTML5 audio (FS#34511). Go back to building the bundled ffmpeg as testing/ffmpeg 1.2 breaks media playback. Added: chromium/trunk/chromium-26.0.1410.43-audio-buffer-size.patch Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium-system-ffmpeg-r2a.patch ---+ PKGBUILD | 19 +- chromium-26.0.1410.43-audio-buffer-size.patch | 12 + chromium-system-ffmpeg-r2a.patch | 203 3 files changed, 22 insertions(+), 212 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-03-28 23:52:00 UTC (rev 180974) +++ PKGBUILD2013-03-29 02:54:22 UTC (rev 180975) @@ -6,13 +6,13 @@ pkgname=chromium pkgver=26.0.1410.43 -pkgrel=1 +pkgrel=2 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' - 'libgcrypt' 'ttf-font' 'udev' 'dbus' 'flac' 'opus' 'libwebp' 'ffmpeg' + 'libgcrypt' 'ttf-font' 'udev' 'dbus' 'flac' 'opus' 'libwebp' 'speech-dispatcher' 'pciutils' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' @@ -27,7 +27,7 @@ chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch chromium-25.0.1364.152-fix-crash-when-cups-is-down.patch chromium-ppapi-r0.patch -chromium-system-ffmpeg-r2a.patch +chromium-26.0.1410.43-audio-buffer-size.patch chromium-26.0.1410.43-speechd-0.8.patch) sha256sums=('31021f81642124b75cb9fa68aa806206dea345bf1aaf7094c71b3f84344b1d84' '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322' @@ -36,7 +36,7 @@ 'c1baf14121502efbc2a31b64029dcafa0e28ca5b71ad0e28a3c6342d18198615' '36ff43d8e85a7eac305727057c4ffd45eb7a357ce212a4a3f153037bc34a5ace' '1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7ed540cdb502fa0aa99c81bd' -'8344737762508e33f748a04a81fc460c82e1752ad49d214abf4ff670ecd06925' +'5af41119d383b10c21f98f0e02d2259cc8cf60eefdb2fa737d8ed87d4c01f056' '23b04468881642ffdc8457016c8f91df395dfccb4af2ad6b758168180ae070f3') # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -59,12 +59,12 @@ # Fix build without NaCl glibc toolchain (patch from Gentoo) patch -Np0 -i "$srcdir/chromium-ppapi-r0.patch" - # Patch to build with system ffmpeg (patch from Gentoo) - patch -Np1 -i "$srcdir/chromium-system-ffmpeg-r2a.patch" - # Fix header location for speech-dispatcher 0.8 (patch from PLD Linux) patch -Np2 -i "$srcdir/chromium-26.0.1410.43-speechd-0.8.patch" + # http://code.google.com/p/chromium/issues/detail?id=178626 + patch -Np1 -i "$srcdir/chromium-26.0.1410.43-audio-buffer-size.patch" + # Use Python 2 find . -type f -exec sed -i -r \ -e 's|/usr/bin/python$|&2|g' \ @@ -97,10 +97,11 @@ -Dlinux_use_gold_binary=0 \ -Dlinux_use_gold_flags=0 \ -Drelease_extra_cflags="$CFLAGS" \ +-Dffmpeg_branding=Chrome \ -Dproprietary_codecs=1 \ -Duse_system_bzip2=1 \ -Duse_system_flac=1 \ --Duse_system_ffmpeg=1 \ +-Duse_system_ffmpeg=0 \ -Duse_system_libevent=1 \ -Duse_system_libjpeg=1 \ -Duse_system_libpng=1 \ @@ -128,7 +129,7 @@ install -Dm4755 -o root -g root out/Release/chrome_sandbox \ "$pkgdir/usr/lib/chromium/chromium-sandbox" - cp out/Release/{*.pak,nacl_helper{,_bootstrap}} \ + cp out/Release/{*.pak,libffmpegsumo.so,nacl_helper{,_bootstrap}} \ out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \ "$pkgdir/usr/lib/chromium/" Added: chromium-26.0.1410.43-audio-buffer-size.patch === --- chromium-26.0.1410.43-audio-buffer-size.patch (rev 0) +++ chromium-26.0.1410.43-audio-buffer-size.patch 2013-03-29 02:54:22 UTC (rev 180975) @@ -0,0 +1,12 @@ +diff -upr chromium-26.0.1410.43.orig/media/audio/audio_util.cc chromium-26.0.1410.43/media/audio/audio_util.cc +--- chromium-26.0.1410.43.orig/media/audio/audio_util.cc 2013-03-29 02:10:07.0 +0200 chromium-26.0.1410.43/media/audio/audio_util.cc2013-03-29 02:21:41.0 +0200 +@@ -201,8 +201,6 @@ size_t GetAudioHardwareBufferSize() { + HRESULT hr = CoreAudioUtil::GetPreferredAudioParameters(eRender, eConsole, + ¶ms); + return FAILED(hr) ? kFallbackBufferSize : params.frames_per_buffer(); +-#elif defined(OS_LINUX) +- return 512; + #else + return 2048; + #endif Delet
[arch-commits] Commit in chromium/trunk (3 files)
Date: Tuesday, September 25, 2012 @ 16:15:07 Author: foutrelis Revision: 167127 upgpkg: chromium 22.0.1229.79-1 New upstream release. Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium-20.0.1132.57-bison-2.6-fix.patch chromium/trunk/chromium-21.0.1180.57-fix-crash-in-task-queue.patch -+ PKGBUILD| 19 chromium-20.0.1132.57-bison-2.6-fix.patch | 554 -- chromium-21.0.1180.57-fix-crash-in-task-queue.patch | 27 3 files changed, 3 insertions(+), 597 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-09-25 19:19:49 UTC (rev 167126) +++ PKGBUILD2012-09-25 20:15:07 UTC (rev 167127) @@ -5,7 +5,7 @@ # Contributor: Daniel J Griffiths pkgname=chromium -pkgver=21.0.1180.89 +pkgver=22.0.1229.79 pkgrel=1 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" arch=('i686' 'x86_64') @@ -24,16 +24,12 @@ chromium.default chromium.sh chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch -chromium-20.0.1132.57-bison-2.6-fix.patch -chromium-21.0.1180.57-fix-crash-in-task-queue.patch chromium-ppapi-r0.patch) -sha256sums=('16cca8d90a3369840f79a6f06d11756515fc8a4c3595060778dcab21e59235c5' +sha256sums=('06cab1c48092def5bd94e9f4aa764f6ff5728ce35bbcdcc12fddbad3a0f0f738' '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322' '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232' '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9' 'c1baf14121502efbc2a31b64029dcafa0e28ca5b71ad0e28a3c6342d18198615' -'d7aecc17e1eb582fe791c3e5fb2ca3f0efcb9bf5379309c1c27be35be4363bba' -'cbd04d9a7cfda7e9c39fa215da897991a410fb59bf0f664abf93ab2c38689898' '1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7ed540cdb502fa0aa99c81bd') build() { @@ -42,15 +38,6 @@ # Fix build with glibc 2.16 patch -Np1 -i "$srcdir/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch" - # Fix build with bison 2.6 (patch from Alexis Menard) - # http://crbug.com/138243 / https://bugs.webkit.org/show_bug.cgi?id=92264 - patch -d third_party/WebKit -Np1 -i \ -"$srcdir/chromium-20.0.1132.57-bison-2.6-fix.patch" - - # Fix crash in LazyBackgroundTaskQueue::ProcessPendingTasks - # http://crbug.com/138790 - patch -Np1 -i "$srcdir/chromium-21.0.1180.57-fix-crash-in-task-queue.patch" - # Fix build without NaCl glibc toolchain (patch from Gentoo) patch -Np0 -i "$srcdir/chromium-ppapi-r0.patch" @@ -93,7 +80,7 @@ -Duse_system_libxml=0 \ -Duse_system_ssl=0 \ -Duse_system_yasm=1 \ --Duse_system_zlib=1 \ +-Duse_system_zlib=0 \ -Duse_gconf=0 \ -Ddisable_glibc=1 \ -Ddisable_sse2=1 Deleted: chromium-20.0.1132.57-bison-2.6-fix.patch === --- chromium-20.0.1132.57-bison-2.6-fix.patch 2012-09-25 19:19:49 UTC (rev 167126) +++ chromium-20.0.1132.57-bison-2.6-fix.patch 2012-09-25 20:15:07 UTC (rev 167127) @@ -1,554 +0,0 @@ -diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y -index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644 a/Source/WebCore/css/CSSGrammar.y -+++ b/Source/WebCore/css/CSSGrammar.y -@@ -53,14 +53,13 @@ using namespace HTMLNames; - #define YYMAXDEPTH 1 - #define YYDEBUG 0 - --// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x --#define YYPARSE_PARAM parser --#define YYLEX_PARAM parser -- - %} - - %pure_parser - -+%parse-param { CSSParser* parser } -+%lex-param { CSSParser* parser } -+ - %union { - bool boolean; - char character; -@@ -89,7 +88,7 @@ using namespace HTMLNames; - - %{ - --static inline int cssyyerror(const char*) -+static inline int cssyyerror(void*, const char*) - { - return 1; - } -diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp -index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644 a/Source/WebCore/css/CSSParser.cpp -+++ b/Source/WebCore/css/CSSParser.cpp -@@ -114,7 +114,7 @@ - extern int cssyydebug; - #endif - --extern int cssyyparse(void* parser); -+extern int cssyyparse(WebCore::CSSParser*); - - using namespace std; - using namespace WTF; -diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y -index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644 a/Source/WebCore/xml/XPathGrammar.y -+++ b/Source/WebCore/xml/XPathGrammar.y -@@ -34,6 +34,7 @@ - #include "XPathParser.h" - #include "XPathPath.h" - #include "XPathPredicate.h" -+#include "XPathStep.h" - #include "XPathVariableRef
[arch-commits] Commit in chromium/trunk (3 files)
Date: Saturday, July 28, 2012 @ 22:06:13 Author: foutrelis Revision: 164260 Add proper patch for bison 2.6 build fix. Added: chromium/trunk/chromium-20.0.1132.57-bison-2.6-fix.patch Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium-20.0.1132.57-bison-2.6-remove-yyparse-decl.patch ---+ PKGBUILD | 12 chromium-20.0.1132.57-bison-2.6-fix.patch | 554 chromium-20.0.1132.57-bison-2.6-remove-yyparse-decl.patch | 22 3 files changed, 560 insertions(+), 28 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-07-29 01:13:10 UTC (rev 164259) +++ PKGBUILD2012-07-29 02:06:13 UTC (rev 164260) @@ -33,7 +33,7 @@ chromium.default chromium.sh chromium-gcc47.patch -chromium-20.0.1132.57-bison-2.6-remove-yyparse-decl.patch +chromium-20.0.1132.57-bison-2.6-fix.patch chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch) sha256sums=('1225c6b6306e89c8892bc0d18e94567d6081d777dee9b8c90efd0da9f6f2641b' @@ -42,7 +42,7 @@ '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232' '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9' 'f607347ba8477d3c8e60eb3803d26f3c9869f77fd49986c60887c59a6aa7d30d' -'8d0e0c53562eee3400606365e33aab035c487d7d958063bc25eea550c6fa3793' +'d7aecc17e1eb582fe791c3e5fb2ca3f0efcb9bf5379309c1c27be35be4363bba' 'c1baf14121502efbc2a31b64029dcafa0e28ca5b71ad0e28a3c6342d18198615' 'a700aa054800d1b21d84eaba27c38a703dfa023e9226d11a942690c2a0630aff') @@ -55,10 +55,10 @@ # Fix build with glibc 2.16 patch -Np1 -i "$srcdir/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch" - # Fix build with bison 2.6 (XXX: hacky; waiting on proper upstream fix) - # http://crbug.com/138243 / https://bugs.webkit.org/show_bug.cgi?id=91943 - patch -Np1 -i \ -"$srcdir/chromium-20.0.1132.57-bison-2.6-remove-yyparse-decl.patch" + # Fix build with bison 2.6 (patch from Alexis Menard) + # http://crbug.com/138243 / https://bugs.webkit.org/show_bug.cgi?id=92264 + patch -d third_party/WebKit -Np1 -i \ +"$srcdir/chromium-20.0.1132.57-bison-2.6-fix.patch" # http://code.google.com/p/chromium/issues/detail?id=109527 sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc Added: chromium-20.0.1132.57-bison-2.6-fix.patch === --- chromium-20.0.1132.57-bison-2.6-fix.patch (rev 0) +++ chromium-20.0.1132.57-bison-2.6-fix.patch 2012-07-29 02:06:13 UTC (rev 164260) @@ -0,0 +1,554 @@ +diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y +index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644 +--- a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y +@@ -53,14 +53,13 @@ using namespace HTMLNames; + #define YYMAXDEPTH 1 + #define YYDEBUG 0 + +-// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x +-#define YYPARSE_PARAM parser +-#define YYLEX_PARAM parser +- + %} + + %pure_parser + ++%parse-param { CSSParser* parser } ++%lex-param { CSSParser* parser } ++ + %union { + bool boolean; + char character; +@@ -89,7 +88,7 @@ using namespace HTMLNames; + + %{ + +-static inline int cssyyerror(const char*) ++static inline int cssyyerror(void*, const char*) + { + return 1; + } +diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp +index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644 +--- a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp +@@ -114,7 +114,7 @@ + extern int cssyydebug; + #endif + +-extern int cssyyparse(void* parser); ++extern int cssyyparse(WebCore::CSSParser*); + + using namespace std; + using namespace WTF; +diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y +index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644 +--- a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y +@@ -34,6 +34,7 @@ + #include "XPathParser.h" + #include "XPathPath.h" + #include "XPathPredicate.h" ++#include "XPathStep.h" + #include "XPathVariableReference.h" + #include + +@@ -44,8 +45,6 @@ + #define YYLTYPE_IS_TRIVIAL 1 + #define YYDEBUG 0 + #define YYMAXDEPTH 1 +-#define YYPARSE_PARAM parserParameter +-#define PARSER static_cast(parserParameter) + + using namespace WebCore; + using namespace XPath; +@@ -53,6 +52,7 @@ using namespace XPath; + %} + + %pure_parser ++%parse-param { WebCore::XPath::Parser* parser } + + %union + { +@@ -71,7 +71,7 @@
[arch-commits] Commit in chromium/trunk (3 files)
Date: Tuesday, May 15, 2012 @ 16:23:23 Author: foutrelis Revision: 159118 Bump to 19.0.1084.46; enable system libxml. Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium-media-no-sse-r0.patch chromium/trunk/chromium-revert-jpeg-swizzle-r2.patch ---+ PKGBUILD | 35 ++ chromium-media-no-sse-r0.patch| 17 chromium-revert-jpeg-swizzle-r2.patch | 61 3 files changed, 13 insertions(+), 100 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-05-15 19:51:57 UTC (rev 159117) +++ PKGBUILD2012-05-15 20:23:23 UTC (rev 159118) @@ -9,14 +9,14 @@ # build time. pkgname=chromium -pkgver=18.0.1025.168 -pkgrel=2 +pkgver=19.0.1084.46 +pkgrel=1 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' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' - 'libxss' 'libgcrypt' 'ttf-dejavu' 'desktop-file-utils' + 'libxss' 'libgcrypt' 'libxslt' 'ttf-dejavu' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' 'elfutils') @@ -31,37 +31,23 @@ chromium.desktop chromium.sh chromium-gcc47.patch -sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch -chromium-media-no-sse-r0.patch -chromium-revert-jpeg-swizzle-r2.patch) -sha256sums=('1f1fc7bd8066835844a465f9d60c49c21173ff559c40e5d113fe9c4627fc18b9' -'f9c5bc8ef4e251769a0609cbca1692682140dc93364c2558aaade3c404f3d987' +sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch) +sha256sums=('2fb77e5d155343a828bd04b6b9d4469fce3033dc6b9f8b53e34a9d02c464639f' +'2256327dc58792309911fe88996527925b79ddc7729ec78548b4adf5e4983d42' '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322' 'c53bfc4db9dde684fbaed6a4bbecb207e3e7a0a2703233426fe076a6d3c557f3' 'f607347ba8477d3c8e60eb3803d26f3c9869f77fd49986c60887c59a6aa7d30d' -'a700aa054800d1b21d84eaba27c38a703dfa023e9226d11a942690c2a0630aff' -'71751bf5913da1eec3c88c433044224c869b0abd5a29172cf239bddbb4eff761' -'d99162aa6bae562f116a42347254bbec3752464f0a3e4d8675e2b287b2a838a2') +'a700aa054800d1b21d84eaba27c38a703dfa023e9226d11a942690c2a0630aff') build() { cd "$srcdir/chromium-$pkgver" # Fix build with gcc 4.7 (patch from openSUSE) patch -Np2 -i "$srcdir/chromium-gcc47.patch" - # Add missing include that defines OS_POSIX - sed -i '1 i\ -#include "build/build_config.h"' \ -chrome/browser/diagnostics/diagnostics_main.cc # http://code.google.com/p/chromium/issues/detail?id=109527 sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc - # Remove unconditional use of SSE3 (patch from Gentoo) - patch -Np0 -i "$srcdir/chromium-media-no-sse-r0.patch" - - # Fix JPEG image rendering problem (patch from Gentoo bug #393471) - patch -Np0 -i "$srcdir/chromium-revert-jpeg-swizzle-r2.patch" - # SQLite: Fix a problem in fts3_write.c causing stack memory to be referenced # after it is out of scope (http://www.sqlite.org/src/info/f9c4a7c8f4) # (http://code.google.com/p/chromium/issues/detail?id=122525) @@ -88,10 +74,15 @@ # CFLAGS are passed through release_extra_cflags below export -n CFLAGS CXXFLAGS + # Silence "identifier 'nullptr' is a keyword in C++11" warnings + CFLAGS+=' -Wno-c++0x-compat' + build/gyp_chromium --depth=. \ -Dwerror= \ -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ -Dlinux_strip_binary=1 \ +-Dlinux_use_gold_binary=0 \ +-Dlinux_use_gold_flags=0 \ -Drelease_extra_cflags="$CFLAGS" \ -Dffmpeg_branding=Chrome \ -Dproprietary_codecs=1 \ @@ -100,7 +91,7 @@ -Duse_system_libevent=1 \ -Duse_system_libjpeg=1 \ -Duse_system_libpng=1 \ --Duse_system_libxml=0 \ +-Duse_system_libxml=1 \ -Duse_system_ssl=0 \ -Duse_system_yasm=1 \ -Duse_system_zlib=1 \ Deleted: chromium-media-no-sse-r0.patch === --- chromium-media-no-sse-r0.patch 2012-05-15 19:51:57 UTC (rev 159117) +++ chromium-media-no-sse-r0.patch 2012-05-15 20:23:23 UTC (rev 159118) @@ -1,17 +0,0 @@ media/media.gyp.orig 2012-02-02 10:03:41.0 +0100 -+++ media/media.gyp2012-02-02 10:04:09.0 +0100 -@@ -467,14 +467,6 @@ - [ 'os_posix == 1 and OS != "mac" and OS != "android"', { - 'cflags': [ - '-msse2', --'-msse3', --'-mssse3', -- ], --}], --[ 'OS == "openbsd"', { -- # OpenBSD's gcc (4.2.1) does not support
[arch-commits] Commit in chromium/trunk (3 files)
Date: Tuesday, October 25, 2011 @ 15:20:12 Author: foutrelis Revision: 141194 upgpkg: chromium 15.0.874.102-1 New upstream release. Added: chromium/trunk/nacl.gypi Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/webrtc-r240-r242-make-pulseaudio-optional.patch -+ PKGBUILD| 15 +- nacl.gypi |8 + webrtc-r240-r242-make-pulseaudio-optional.patch | 122 -- 3 files changed, 15 insertions(+), 130 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-10-25 18:48:36 UTC (rev 141193) +++ PKGBUILD2011-10-25 19:20:12 UTC (rev 141194) @@ -5,7 +5,7 @@ # Contributor: Daniel J Griffiths pkgname=chromium -pkgver=14.0.835.202 +pkgver=15.0.874.102 pkgrel=1 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" arch=('i686' 'x86_64') @@ -22,16 +22,19 @@ chromium.desktop chromium.sh gcc-4.6.patch -webrtc-r240-r242-make-pulseaudio-optional.patch) -sha1sums=('e1c2d7cacaa256b1d343ee012d07170dbb3beb2f' +nacl.gypi) +sha1sums=('d8dd8c5f57099ee879e8bd3ab53419f10339762c' '7d97535ec0ed124e95888de84b2c6a3654a27d4a' '427ecf06cae11f28f59b1912d659ad5541391682' '3918746524fff30e73dc656754733df5c2c2' - 'db66921c9801ad5930920faf87bd5c313a3fc702') + 'df4cee39e1d49e10f9c075f5e6e9db28e8260926') build() { cd "$srcdir/chromium-$pkgver" + # NaCL build remains faily + cp "$srcdir/nacl.gypi" chrome/ + # Fix build with gcc 4.6 # http://code.google.com/p/chromium/issues/detail?id=80071 patch -Np0 -i "$srcdir/gcc-4.6.patch" @@ -40,10 +43,6 @@ sed -i '/#include / a #include ' \ chrome/browser/ui/webui/print_preview_handler.cc - # Make PulseAudio optional in WebRTC - patch -d third_party/webrtc -Np1 -i \ -"$srcdir/webrtc-r240-r242-make-pulseaudio-optional.patch" - # Use Python 2 find . -type f -exec sed -i -r \ -e 's|/usr/bin/python$|&2|g' \ Added: nacl.gypi === --- nacl.gypi (rev 0) +++ nacl.gypi 2011-10-25 19:20:12 UTC (rev 141194) @@ -0,0 +1,8 @@ +{ + 'targets': [ +{ + 'target_name': 'nacl', + 'type': 'static_library', +}, + ], +} Deleted: webrtc-r240-r242-make-pulseaudio-optional.patch === --- webrtc-r240-r242-make-pulseaudio-optional.patch 2011-10-25 18:48:36 UTC (rev 141193) +++ webrtc-r240-r242-make-pulseaudio-optional.patch 2011-10-25 19:20:12 UTC (rev 141194) @@ -1,122 +0,0 @@ -Index: src/build/common.gypi -=== src/build/common.gypi (revision 239) -+++ src/build/common.gypi (revision 240) -@@ -25,6 +25,13 @@ - 'direct_show_base_classes': - 'C:/Program Files/Microsoft SDKs/Windows/v7.1/Samples/multimedia/directshow/baseclasses/', - }], -+ ['build_with_chromium==1', { -+# Exclude pulse audio on Chromium since its prerequisites don't -+# include pulse audio. -+'include_pulse_audio%': 0, -+ }, { -+'include_pulse_audio%': 1, -+ }], - ], # conditions - }, - 'target_defaults': { -Index: src/modules/audio_device/main/source/audio_device.gyp -=== src/modules/audio_device/main/source/audio_device.gyp (revision 239) -+++ src/modules/audio_device/main/source/audio_device.gyp (revision 240) -@@ -52,18 +52,12 @@ - 'Linux/alsasymboltable.h', - 'Linux/audio_device_linux_alsa.cc', - 'Linux/audio_device_linux_alsa.h', --'Linux/audio_device_linux_pulse.cc', --'Linux/audio_device_linux_pulse.h', - 'Linux/audio_device_utility_linux.cc', - 'Linux/audio_device_utility_linux.h', - 'Linux/audio_mixer_manager_linux_alsa.cc', - 'Linux/audio_mixer_manager_linux_alsa.h', --'Linux/audio_mixer_manager_linux_pulse.cc', --'Linux/audio_mixer_manager_linux_pulse.h', - 'Linux/latebindingsymboltable.cc', - 'Linux/latebindingsymboltable.h', --'Linux/pulseaudiosymboltable.cc', --'Linux/pulseaudiosymboltable.h', - 'Mac/audio_device_mac.cc', - 'Mac/audio_device_mac.h', - 'Mac/audio_device_utility_mac.cc', -@@ -89,16 +83,10 @@ - 'Linux/alsasymboltable.h', - 'Linux/audio_device_linux_alsa.cc', - 'Linux/audio_device_linux_alsa.h', --'Linux/audio_device_linux_pulse.cc', --'Linux/audio_device_linux_pulse.h', - 'Linux/audio_mixer_manager_linux_alsa.cc', - 'Linux/audio_mixer_manager_linux_al
[arch-commits] Commit in chromium/trunk (3 files)
Date: Thursday, July 14, 2011 @ 19:30:37 Author: foutrelis Revision: 131773 upgpkg: chromium 12.0.742.124-1 New upstream release. Added: chromium/trunk/make-hash-tools-use-if-instead-of-switch.patch Modified: chromium/trunk/PKGBUILD chromium/trunk/gcc-4.6.patch + PKGBUILD | 18 +++ gcc-4.6.patch | 29 -- make-hash-tools-use-if-instead-of-switch.patch | 37 +++ 3 files changed, 49 insertions(+), 35 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-07-14 19:07:30 UTC (rev 131772) +++ PKGBUILD2011-07-14 23:30:37 UTC (rev 131773) @@ -5,7 +5,7 @@ # Contributor: Daniel J Griffiths pkgname=chromium -pkgver=12.0.742.112 +pkgver=12.0.742.124 pkgrel=1 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" arch=('i686' 'x86_64') @@ -22,12 +22,14 @@ chromium.desktop chromium.sh gcc-4.6.patch -glibc-2.14.patch) -md5sums=('8a5b7b4b30f5fe8de10fcf7d984321b8' +glibc-2.14.patch +make-hash-tools-use-if-instead-of-switch.patch) +md5sums=('37a53e0dd2ba031c508cdd4f94b4912e' '075c3c2fa5902e16b8547dd31d437191' '096a46ef386817988250d2d7bddd1b34' - 'fb4b7b6871876a9180215c580fcf2cf5' - '543a32b09f138fd47858b9a4a7c82dfb') + 'ec0b4e4ca4cf970a18a080ec2776c252' + '543a32b09f138fd47858b9a4a7c82dfb' + '9d9e66c8365d7333e55305796b49fd77') build() { cd "$srcdir/chromium-$pkgver" @@ -37,11 +39,15 @@ # http://code.google.com/p/chromium/issues/detail?id=70746 # http://code.google.com/p/chromium/issues/detail?id=46411 patch -Np0 -i "$srcdir/gcc-4.6.patch" - + # Fix build with glibc 2.14 # http://code.google.com/p/chromium/issues/detail?id=86646 patch -Np2 -i "$srcdir/glibc-2.14.patch" + # Fix build with Perl 5.14 + patch -d third_party/WebKit -Np2 -i \ +"$srcdir/make-hash-tools-use-if-instead-of-switch.patch" + ### Configure # Use Python 2 Modified: gcc-4.6.patch === --- gcc-4.6.patch 2011-07-14 19:07:30 UTC (rev 131772) +++ gcc-4.6.patch 2011-07-14 23:30:37 UTC (rev 131773) @@ -129,32 +129,3 @@ #include #include "ppapi/cpp/point.h" -Index: Source/WebCore/ChangeLog -=== third_party/WebKit/Source/WebCore/ChangeLog(revision 84120) -+++ third_party/WebKit/Source/WebCore/ChangeLog(revision 84123) -@@ -1,2 +1,24 @@ -+2011-04-17 Thierry Reding -+ -+Reviewed by Adam Barth. -+ -+Fix build with GCC 4.6. -+ -+* dom/make_names.pl: Execute preprocessor without the -P option. The -+preprocessor in GCC 4.6 eats empty lines, effectively breaking the -+parsing performed by this script. Dropping the -P option when invoking -+the preprocessor keeps the empty lines but as a side-effect also adds -+additional linemarkers. -+ -+From the cpp manpage: -+ -+ -P Inhibit generation of linemarkers in the output from the -+ preprocessor. This might be useful when running the preprocessor -+ on something that is not C code, and will be sent to a program -+ which might be confused by the linemarkers. -+ -+The linemarkers are not problematic, however, because the script -+properly handles them by ignoring all lines starting with a #. -+ - 2011-04-17 David Kilzer - Added: make-hash-tools-use-if-instead-of-switch.patch === --- make-hash-tools-use-if-instead-of-switch.patch (rev 0) +++ make-hash-tools-use-if-instead-of-switch.patch 2011-07-14 23:30:37 UTC (rev 131773) @@ -0,0 +1,37 @@ +Index: /trunk/Source/WebCore/make-hash-tools.pl +=== +--- /trunk/Source/WebCore/make-hash-tools.pl (revision 72664) /trunk/Source/WebCore/make-hash-tools.pl (revision 89265) +@@ -21,5 +21,4 @@ + + use strict; +-use Switch; + use File::Basename; + +@@ -29,7 +28,5 @@ + + +-switch ($option) { +- +-case "DocTypeStrings" { ++if ($option eq "DocTypeStrings") { + + my $docTypeStringsGenerated= "$outdir/DocTypeStrings.cpp"; +@@ -39,7 +36,5 @@ + system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?"; + +-} # case "DocTypeStrings" +- +-case "ColorData" { ++} elsif ($option eq "ColorData") { + + my $colorDataGenerated = "$outdir/ColorData.cpp"; +@@ -49,5 +44,5 @@ + system("gperf --key-positions=\"*\" -D -s 2 $colorDataGperf > $colorDataGenerated") ==
[arch-commits] Commit in chromium/trunk (3 files)
Date: Saturday, April 30, 2011 @ 14:01:22 Author: pierre Revision: 121333 upgpkg: chromium 11.0.696.57-1 upstream update Added: chromium/trunk/gcc-4.6.patch Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium-webkit-version.patch ---+ PKGBUILD | 15 ++- chromium-webkit-version.patch | 40 - gcc-4.6.patch | 171 3 files changed, 180 insertions(+), 46 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-04-30 15:35:02 UTC (rev 121332) +++ PKGBUILD2011-04-30 18:01:22 UTC (rev 121333) @@ -4,7 +4,7 @@ # Maintainer: Daniel J Griffiths pkgname=chromium -pkgver=10.0.648.205 +pkgver=11.0.696.57 pkgrel=1 pkgdesc='The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser.' arch=('i686' 'x86_64') @@ -16,17 +16,20 @@ conflicts=('chromium-browser') install=chromium.install source=("http://build.chromium.org/buildbot/official/chromium-${pkgver}.tar.bz2"; -'chromium.desktop' 'chromium.sh' chromium-webkit-version.patch) -md5sums=('4ec08f2718d43038b88487034a96c8f5' +'chromium.desktop' 'chromium.sh' 'gcc-4.6.patch') +md5sums=('f17a37a2d4a2f344f0a11288600e296c' '075c3c2fa5902e16b8547dd31d437191' '096a46ef386817988250d2d7bddd1b34' - 'dee3e8798f8916d23fce203478094822') + 'ab7934b4a57206707cca69be0d18638e') build() { cd ${srcdir}/chromium-${pkgver} - #http://code.google.com/p/chromium/issues/detail?id=70537 - patch -Np1 -i ${srcdir}/chromium-webkit-version.patch + # patches to fix gcc 4.6 compilation from + # http://code.google.com/p/chromium/issues/detail?id=80071 + # http://code.google.com/p/chromium/issues/detail?id=70746 + # http://code.google.com/p/chromium/issues/detail?id=46411 + patch -p0 -i ${srcdir}/gcc-4.6.patch ### Configure Deleted: chromium-webkit-version.patch === --- chromium-webkit-version.patch 2011-04-30 15:35:02 UTC (rev 121332) +++ chromium-webkit-version.patch 2011-04-30 18:01:22 UTC (rev 121333) @@ -1,40 +0,0 @@ -Index: webkit/build/webkit_version.py -diff --git a/webkit/build/webkit_version.py b/webkit/build/webkit_version.py -index 58110727fee9250058c4318e8f50eb402008f741..f488a2ed8242891542925b6aa21e38748268b253 100755 a/webkit/build/webkit_version.py -+++ b/webkit/build/webkit_version.py -@@ -45,21 +45,24 @@ def GetWebKitRevision(webkit_dir, version_file): - - # "svn info" tells us what we want, but third_party/WebKit does *not* - # point at the upstream repo. So instead we run svn info on the directory -- # containing the versioning file (which is some subdirectory of WebKit), -- # then strip that path back off of the resulting URL. -+ # containing the versioning file (which is some subdirectory of WebKit). - version_file_dir = os.path.dirname(version_file) - version_info = lastchange.FetchVersionInfo( - default_lastchange=None, - directory=os.path.join(webkit_dir, version_file_dir)) - -- # Now compute the real WebKit URL by stripping off the version file -- # directory from the URL we get out of version_info. -- # Further, we want to strip off the "http://svn..."; from the left. -- # This is the root URL from the repository. -- assert version_info.url.startswith(version_info.root) -- assert version_info.url.endswith(version_file_dir) -- webkit_url = version_info.url[len(version_info.root):-len(version_file_dir)] -- webkit_url = webkit_url.strip('/') -+ if (version_info.url.startswith(version_info.root) and -+ version_info.url.endswith(version_file_dir)): -+# Now compute the real WebKit URL by stripping off the version file -+# directory from the URL we get out of version_info. -+# Further, we want to strip off the "http://svn..."; from the left. -+# This is the root URL from the repository. -+webkit_url = version_info.url[len(version_info.root):-len(version_file_dir)] -+webkit_url = webkit_url.strip('/') -+ else: -+# The data isn't as we expect: perhaps they're using git without svn? -+# Just dump the output directly. -+webkit_url = version_info.url - - return "%s@%s" % (webkit_url, version_info.revision) - Added: gcc-4.6.patch === --- gcc-4.6.patch (rev 0) +++ gcc-4.6.patch 2011-04-30 18:01:22 UTC (rev 121333) @@ -0,0 +1,171 @@ +diff -u -r chrome/browser/search_engines/template_url_prepopulate_data.h chrome/browser/search_engines/template_url_prepopulate_data.h +--- chrome/browser/search_engines/template_url_prepopulate_data.h 2011-04-13 13:23:41.0 +0400 chrome/browser/search_engines/template_url_prepopulate_data.h 2011-04-20 19:32:58.0 +0400 +@@ -7,
[arch-commits] Commit in chromium/trunk (3 files)
Date: Thursday, December 17, 2009 @ 03:10:37 Author: pierre Revision: 61502 Update to Beta 2 Modified: chromium/trunk/PKGBUILD chromium/trunk/drop_sse2.patch chromium/trunk/ffmpeg_branding_mime.patch + PKGBUILD | 19 --- drop_sse2.patch| 32 +++- ffmpeg_branding_mime.patch |2 +- 3 files changed, 16 insertions(+), 37 deletions(-) Modified: PKGBUILD === --- PKGBUILD2009-12-17 00:34:12 UTC (rev 61501) +++ PKGBUILD2009-12-17 08:10:37 UTC (rev 61502) @@ -2,13 +2,13 @@ # Maintainer: Pierre Schmitz pkgname=chromium -pkgver=4.0.249.30 -pkgrel=2 +pkgver=4.0.249.43 +pkgrel=1 pkgdesc='An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web' arch=('i686' 'x86_64') url='http://www.chromium.org/' license=('BSD') -depends=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme') +depends=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'bzip2' 'libxslt') makedepends=('python' 'perl' 'gperf') provides=('chromium-browser') conflicts=('chromium-browser') @@ -18,11 +18,11 @@ source=("ftp://ftp.archlinux.org/other/chromium/chromium-${pkgver}.tar.xz"; 'chromium.desktop' 'chromium.sh' 'drop_sse2.patch' 'ffmpeg_branding_mime.patch') -md5sums=('59d316bd0f319178e1faffce7b2c81d2' +md5sums=('c8a5b5f918a0ea8a56f9c74bce2524f2' '897de25e9c25a01f8b1b67abe554a6b7' '93cd6f5f53b15546dc9d3de49118534c' - 'a4a920d7b198c0a2f6e39d60ec75abd5' - '5e36845dd9e053da3bf5fc814e502d68') + 'ddc1d741d50e8d46765a6b76e8faad32' + '95567a364197237dcefa3fabb5631822') build() { cd ${srcdir}/chromium-${pkgver} @@ -34,7 +34,12 @@ linux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ linux_strip_binary=1 \ release_extra_cflags='${CFLAGS}' \ - ffmpeg_branding=Chrome" + ffmpeg_branding=Chrome \ + use_system_libjpeg=1 \ + use_system_libxml=1 \ + use_system_libxslt=1 \ + use_system_bzip2=1 \ + use_system_libpng=1" patch -p0 -i ${srcdir}/ffmpeg_branding_mime.patch || return 1 Modified: drop_sse2.patch === --- drop_sse2.patch 2009-12-17 00:34:12 UTC (rev 61501) +++ drop_sse2.patch 2009-12-17 08:10:37 UTC (rev 61502) @@ -1,17 +1,6 @@ - build/common.gypi | 19 ++- - 1 file changed, 10 insertions(+), 9 deletions(-) - -Index: src/build/common.gypi -=== src.orig/build/common.gypi -+++ src/build/common.gypi -@@ -386,25 +386,26 @@ - # - # -mfpmath=sse -msse2 makes the compiler use SSE instructions - # which keep floating-point values in SSE registers in its - # native precision (32-bit for single precision, and 64-bit for - # double precision values). This means the floating-point value +--- src/build/common.gypi 2009-12-17 01:57:20.0 +0100 src/build/common.gypi 2009-12-17 02:37:05.663568345 +0100 +@@ -652,15 +652,6 @@ # used during computation does not change depending on how the # compiler optimized the code, since the value is always kept # in its specified precision. @@ -24,21 +13,6 @@ -], - }], -], -+# Disabled: see http://code.google.com/p/chromium/issues/detail?id=9007 -+# 'conditions': [ -+# ['branding=="Chromium"', { -+# 'cflags': [ -+# '-march=pentium4', -+# '-msse2', -+# '-mfpmath=sse', -+# ], -+# }], -+# ], 'cflags': [ '-m32', ], - 'ldflags': [ - '-m32', - ], - }], - ], Modified: ffmpeg_branding_mime.patch === --- ffmpeg_branding_mime.patch 2009-12-17 00:34:12 UTC (rev 61501) +++ ffmpeg_branding_mime.patch 2009-12-17 08:10:37 UTC (rev 61502) @@ -1,4 +1,4 @@ src/net/base/mime_util.cc.orig 2009-12-13 19:09:26.467781732 +0100 +--- src/net/base/mime_util.cc 2009-12-13 19:09:26.467781732 +0100 +++ src/net/base/mime_util.cc 2009-12-13 19:10:14.967931404 +0100 @@ -188,7 +188,6 @@ "audio/ogg",
[arch-commits] Commit in chromium/trunk (3 files)
Date: Sunday, December 13, 2009 @ 14:13:26 Author: pierre Revision: 61235 Added: chromium/trunk/ffmpeg_branding_mime.patch Modified: chromium/trunk/PKGBUILD (contents, properties) chromium/trunk/chromium.sh + PKGBUILD | 31 +++ chromium.sh|2 +- ffmpeg_branding_mime.patch | 29 + 3 files changed, 49 insertions(+), 13 deletions(-) Modified: PKGBUILD === --- PKGBUILD2009-12-13 18:56:23 UTC (rev 61234) +++ PKGBUILD2009-12-13 19:13:26 UTC (rev 61235) @@ -1,9 +1,9 @@ -# $Id: $ +# $Id$ # Maintainer: Pierre Schmitz pkgname=chromium pkgver=4.0.249.30 -pkgrel=1 +pkgrel=2 pkgdesc='An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web' arch=('i686' 'x86_64') url='http://www.chromium.org/' @@ -16,27 +16,32 @@ # downgrade from 4.0.267.0-2 options=('force') source=("ftp://ftp.archlinux.org/other/chromium/chromium-${pkgver}.tar.xz"; -'chromium.desktop' 'chromium.sh' 'drop_sse2.patch') +'chromium.desktop' 'chromium.sh' +'drop_sse2.patch' 'ffmpeg_branding_mime.patch') md5sums=('59d316bd0f319178e1faffce7b2c81d2' '312df68330d6e288cbb2260bad620a32' - 'a2fbdd2744e2dd92d3fa480815485725' - 'a4a920d7b198c0a2f6e39d60ec75abd5') + '2689154f4a41511e136d9594a0086aa0' + 'a4a920d7b198c0a2f6e39d60ec75abd5' + '5e36845dd9e053da3bf5fc814e502d68') build() { cd ${srcdir}/chromium-${pkgver} - export GYP_GENERATORS="make" - export BUILDTYPE="Release" - export GYP_DEFINES='gcc_version=44 no_strict_aliasing=1 linux_sandbox_path=/usr/lib/chromium/chromium-sandbox' + export GYP_GENERATORS='make' + export BUILDTYPE='Release' + export GYP_DEFINES="gcc_version=44 \ + no_strict_aliasing=1 \ + linux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ + linux_strip_binary=1 \ + release_extra_cflags='${CFLAGS}' \ + ffmpeg_branding=Chrome" + patch -p0 -i ${srcdir}/ffmpeg_branding_mime.patch || return 1 + # i686 does not include SSE2 # see http://code.google.com/p/chromium/issues/detail?id=9007 patch -p0 -i ${srcdir}/drop_sse2.patch || return 1 - if [ "${CARCH}" = 'x86_64' ]; then - GYP_DEFINES="${GYP_DEFINES} target_arch=x64" - fi - export PATH=./depot_tools/:$PATH gclient runhooks --force || return 1 @@ -115,6 +120,8 @@ find . -name '.svn' -type d -exec rm -rf {} \; find . -iname '*.dll' -delete find . -iname '*.exe' -delete + find . -iname '*.o' -delete + find . -iname '*.nexe' -delete cd .. bsdtar cvJf $_current/chromium-$pkgver.tar.xz chromium-$pkgver Property changes on: chromium/trunk/PKGBUILD ___ Added: svn:keywords + Id Modified: chromium.sh === --- chromium.sh 2009-12-13 18:56:23 UTC (rev 61234) +++ chromium.sh 2009-12-13 19:13:26 UTC (rev 61235) @@ -2,4 +2,4 @@ export PATH=$PATH:/usr/lib/chromium export CHROME_WRAPPER=/usr/lib/chromium/chromium export CHROME_DESKTOP=chromium.desktop -/usr/lib/chromium/chromium $@ +exec /usr/lib/chromium/chromium $@ Added: ffmpeg_branding_mime.patch === --- ffmpeg_branding_mime.patch (rev 0) +++ ffmpeg_branding_mime.patch 2009-12-13 19:13:26 UTC (rev 61235) @@ -0,0 +1,29 @@ +--- src/net/base/mime_util.cc.orig 2009-12-13 19:09:26.467781732 +0100 src/net/base/mime_util.cc 2009-12-13 19:10:14.967931404 +0100 +@@ -188,7 +188,6 @@ + "audio/ogg", + "application/ogg", + +-#if defined(GOOGLE_CHROME_BUILD) + // MPEG-4. + "video/mp4", + "video/x-m4v", +@@ -198,7 +197,6 @@ + // MP3. + "audio/mp3", + "audio/x-mp3", +-#endif + }; + + // List of supported codecs when passed in with . +@@ -206,10 +204,8 @@ + // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support + // for more information. + static const char* const supported_media_codecs[] = { +-#if defined(GOOGLE_CHROME_BUILD) + "avc1", + "mp4a", +-#endif + "theora", + "vorbis", + };