[go: nahoru, domu]

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update chromium in morty to match what is in master #33

Conversation

andrey-konovalov
Copy link
Contributor

Could you please update chromium in morty to be in sync with current master?

I've cherry picked from master all the commits which changed chromium and which are not in morty.
Tested by building and running on HiKey (aarch64).

jaragunde and others added 13 commits April 17, 2017 21:33
That is the latest version of Chromium that has been made work with
the Ozone-Wayland project.

Patches have been rebased and configure flags were changed because
existing ones were causing conflicts in the new version. An extra
patch was added to prevent the build from failing when building
without X11 libs present due to an unnecessary inclusion.

Signed-off-by: Jacobo Aragunde Pérez <jaragunde@igalia.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Chromium and chromium-wayland recipes cannot share this patch any
more due to diverging code bases. We create a new version of the
patch only for chromium-wayland and revert the existing patch to
its previous state to be used by chromium recipe.

Signed-off-by: Jacobo Aragunde Pérez <jaragunde@igalia.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Certain build configurations enable a code path that includes
keyboard_code_conversion_xkb.cc, but it eventually fails in non-X11
environments because of a missing patch that is present upstream.

This commit adds the missing patch from
https://codereview.chromium.org/2239833003

There are two versions of the patch in the code review URL above.
The first version fixes the problem both under the gyp and GN build
systems. That patch was rejected because gyp is considered deprecated
upstream. The second version fixes the problem only on GN and it was
merged upstream. We are picking the first version because our recipes
still use gyp to build.

Signed-off-by: Jacobo Aragunde Pérez <jaragunde@igalia.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* chromium-wayland fails with:
  http://errors.yoctoproject.org/Errors/Details/132852/
  FAILED: gen/blink/platform/ColorData.cpp
  cd ../../third_party/WebKit/Source/platform; gperf "--key-positions=*"   -D -s 2 ColorData.gperf   "--output-file=../../../../out/Release/gen/blink/platform/ColorData.cpp"
  /bin/sh: 1: gperf: not found

* chromium fails with:
  http://errors.yoctoproject.org/Errors/Details/132851/
FAILED: gen/blink/core/CSSValueKeywords.cpp gen/blink/core/CSSValueKeywords.h
cd ../../third_party/WebKit/Source/core; python ../build/scripts/make_css_value_keywords.py css/CSSValueKeywords.in css/SVGCSSValueKeywords.in --output_dir ../../../../out/Release/gen/blink/core --gperf gperf
Traceback (most recent call last):
  File "../build/scripts/make_css_value_keywords.py", line 177, in <module>
    in_generator.Maker(CSSValueKeywordsWriter).main(sys.argv)
  File "TOPDIR/tmp-glibc/work/core2-64-oe-linux/chromium/52.0.2743.76-r0/chromium-52.0.2743.76/third_party/WebKit/Source/build/scripts/in_generator.py", line 95, in main
    writer.write_files(options.output_dir)
  File "TOPDIR/tmp-glibc/work/core2-64-oe-linux/chromium/52.0.2743.76-r0/chromium-52.0.2743.76/third_party/WebKit/Source/build/scripts/in_generator.py", line 71, in write_files
    self._write_file_if_changed(output_dir, generator(), file_name)
  File "../build/scripts/make_css_value_keywords.py", line 172, in generate_implementation
    gperf = subprocess.Popen(gperf_args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=True)
  File "TOPDIR/tmp-glibc/work/core2-64-oe-linux/chromium/52.0.2743.76-r0/recipe-sysroot-native/usr/lib/python2.7/subprocess.py", line 711, in __init__
    errread, errwrite)
  File "TOPDIR/tmp-glibc/work/core2-64-oe-linux/chromium/52.0.2743.76-r0/recipe-sysroot-native/usr/lib/python2.7/subprocess.py", line 1343, in _execute_child
    raise child_exception
OSError: [Errno 2] No such file or directory

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Chromium-wayland fails with:
  http://errors.yoctoproject.org/Errors/Build/32356/

Build problems happen to both qemux86 and intel-core2-32 builds.
Root cause seems to be ICU mixing host and target architectures,
same as in: https://bugreports.qt.io/browse/QTBUG-57705

Signed-off-by: Jacobo Aragunde Pérez <jaragunde@igalia.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Apart from gcc complaining about conflicting -march and -mcpu flags, chromium
builds and runs fine as-is on 32-bit Raspberry Pi for X11.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Add '--incognito' to kiosk mode flags to avoid "restore pages?" message in the
event of unplanned power cycles.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Tested by building for and running on:
- minnow
- raspi3 (32-bit)
- qemux86
- bbb

On-target testing includes:
- playing a video from youtube[1]
- running (and passing) the octane tests (js)[2]

Verified chromium-wayland still builds.

[1] http://youtube.com
[2] http://chromium.github.io/octane

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
This patch prevents "Aw Snap" error when loading a page with JavaScript.

Tested by running:
- chromium-wayland on Beagle X15
- chromium-wayland on HiKey (with a separate patch to enable aarch64 build)
- cromium on dragonboard-410c (with a separate patch to enable aarch64 build)

Based on the fix for Gentoo's bug 588596:
https://bugs.gentoo.org/show_bug.cgi?id=588596#c10

Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
The patch (0001-Remove-accelerated-Canvas-support-from-blacklist.patch)
associated with the ignore-lost-context PACKAGECONFIG needs to be tweaked for
chromium vs chromium-wayland.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
@otavio
Copy link
Member
otavio commented Apr 20, 2017

Sorry but no; this changes the upstream release and breaks some BSP layers.

@otavio otavio closed this Apr 20, 2017
@andrey-konovalov
Copy link
Contributor Author

I see. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants