Commits · e551f7b3014f93c71adc897d7f3b399de6faa001 · wanghuo-open / meta-qt5

12 Apr, 2023 1 commit

qtwebkit: Fix build with gcc-13 · e551f7b3

Martin Jansa authored 2 years ago


* there are few newer commits since the SRCREV used in this recipe
  it might be useful if someone is still using this (I don't, so
  I'll just fix the build failure with gcc-13 and cleanup the .patch files):

$ git log --oneline 10cd6a106..origin/5.212
ac8ebc6c3 (origin/5.212) Enable QML tests
5a99e5d4c Import QtWebKit commit 5d89eef9bc689abb59ef799b445c35b1e322b3f1
685ed792f Import QtWebKit commit 143b469188bde226d5e70cff5f01699b8a29d865
8967b4f87 Import QtWebKit commit 6faf5d547055321f0d518fe83766499cac5d8664
08eaf858c Import QtWebKit commit cf37bc44f798d3c5a26d17086ada92688b9bfe6d
412e257d0 Workaround for Windows Store python3.exe
e16357a52 Import QtWebKit commit f966d667c14ddcfe983f4a31fc80a1edbb6ada10
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

e551f7b3

07 Jan, 2023 2 commits

qtwebkit: Add packageconfig to build tools · 1d1b19ff

Khem Raj authored 2 years ago


Keep it disabled by default
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

1d1b19ff

qtwebkit: Fix build with ruby 3.2+ · 88c8564e

Khem Raj authored 2 years ago


Ruby 3.2 removes Object#=~ completely
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

88c8564e

10 Mar, 2022 1 commit

qtwebkit: Fix build when x11 is not in distro features · 32e6203c

Khem Raj authored 3 years ago

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

32e6203c

22 Feb, 2022 1 commit

meta: update license names · cc3d1c0c

Martin Jansa authored 3 years ago


* openembedded-core/scripts/contrib/convert-spdx-licenses.py .
  ...
  All files processed with version 0.01
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

cc3d1c0c

11 Feb, 2022 1 commit

recipes-qt: update ambiguous "BSD" license with "BSD-3-Clause" · f23d41fe

Denys Dmytriyenko authored 3 years ago


OE-Core recently removed ambiguous "BSD" license in order for recipes to be
more specific and use the exact variants of BSD. Update meta-qt5 recipes
with "BSD-3-Clause" as that was the previous default.
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

f23d41fe

13 Nov, 2021 1 commit
- qtwebkit: Fix build on mips/clang · 287f7d1e
  Khem Raj authored 3 years ago
```
Signed-off-by: Khem Raj <raj.khem@gmail.com>
```
  287f7d1e
27 Sep, 2021 1 commit

qtwebkit: Inherit pkgconfig · b6680da3

Khem Raj authored 3 years ago


Fixes
  Could NOT find LibXslt: Found unsuitable version "", but required is at
Signed-off-by: Khem Raj <raj.khem@gmail.com>

b6680da3

03 Aug, 2021 1 commit

Convert to new override syntax · a6bee8ea

Martin Jansa authored 3 years ago


This is the result of automated script (0.9.0) conversion:

oe-core/scripts/contrib/convert-overrides.py .

converting the metadata to use ":" as the override character instead of "_".
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

a6bee8ea

09 Apr, 2021 1 commit

qtwebkit: Disable bmalloc on mips/ppc/riscv · fd463388

Khem Raj authored 4 years ago

This is needed along when JIT is disabled see
https://bugs.webkit.org/attachment.cgi?id=342881&action=diff

Signed-off-by: Khem Raj <raj.khem@gmail.com>

fd463388

10 Mar, 2021 2 commits

qtwebkit: Fix build with gcc11/riscv · 324843cb
Khem Raj authored 4 years ago
```
Signed-off-by: Khem Raj <raj.khem@gmail.com>
```
324843cb

qtwebkit: Disable gold linker for riscv/ppc/mips · 9e17c61b

Khem Raj authored 4 years ago


gold linker seems to not link the shared lib properly as it results in
textrels on these arches. So fallback to bfd linker.
Signed-off-by: Khem Raj <raj.khem@gmail.com>

9e17c61b

02 Mar, 2021 1 commit
- qtwebkit: Do not use gold with riscv64 · 1bc37d0f
  Khem Raj authored 4 years ago
```
gold is not support with riscv
Signed-off-by: Khem Raj <raj.khem@gmail.com>
```
  1bc37d0f
22 Jan, 2021 3 commits

QTWebkit: Support RISC-V ISA on QTwebkit · cad441b3

Chenxi Mao authored 5 years ago

There are 3 changes to support RISC-V
1. Add a patch to support RISC-V CPU
2. Disable JIT as mips/ppc did

cad441b3

QtWebkit: Set release build by default · 31c137e5

Chenxi Mao authored 5 years ago


Current Qtwebkit configuration is debug build by default.
Change it to release build to have better performance.

Change-Id: Ib5e10bfd62edf79ddc304332ff10fdbe3abf58f0
Reviewed-by: Chenxi Mao <chenxi.mao2013@gmail.com>
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

31c137e5

qtwebkit: fix build with icu >= 68 · 2c2403e2
Andreas Müller authored 4 years ago
```
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
```
2c2403e2

03 Nov, 2020 2 commits
- qtwebkit: Fix build with python 3.9 · a72c04ee
  Khem Raj authored 4 years ago
```
backport a fix to build with python 3.9
Signed-off-by: Khem Raj <raj.khem@gmail.com>
```
  a72c04ee
- qtwebkit: Fix build when Qt is configured without SSL · 1d946dc8
  Khem Raj authored 4 years ago
```
backport a patch to fix the build error
Signed-off-by: Khem Raj <raj.khem@gmail.com>
```
  1d946dc8
08 Sep, 2020 1 commit

qtwebkit: Add patch to fix build with bison 3.7 · 04a6fa63

Andreas Müller authored 4 years ago


Fixes:
|... /build/DerivedSources/WebCore/XPathGrammar.cpp:120:10: fatal error: XPathGrammar.hpp: No such file or directory
|   120 | #include "XPathGrammar.hpp"
|       |          ^~~~~~~~~~~~~~~~~~
| ...
| .../build/DerivedSources/WebCore/CSSGrammar.cpp:160:10: fatal error: CSSGrammar.hpp: No such file or directory
|   160 | #include "CSSGrammar.hpp"
|       |          ^~~~~~~~~~~~~~~~
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>

04a6fa63

21 Apr, 2020 1 commit

qtwebkit: Switch to 5.212 branch · 05b3e648

Khem Raj authored 5 years ago


Drop py3 support patch as its no longer needed on this branch
This is more uptodate branch and has needed fixes to work with Qt 5.15
Signed-off-by: Khem Raj <raj.khem@gmail.com>

05b3e648

06 Feb, 2020 1 commit
- qtwebkit: build with python3 · c8cd55b0
  Andreas Müller authored 5 years ago
```
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
```
  c8cd55b0
03 Feb, 2020 1 commit

Revert "qtwebkit: remove" · 23914740

Martin Jansa authored 5 years ago

This reverts commit a35403dc.

But keep the dependency from packagegroup-qt5-toolchain-target, qt5-creator
removed as most people won't really need this. Andreas and meta-qt5-extra
still need qtwebkit as reported here:
https://github.com/meta-qt5/meta-qt5/pull/273#issuecomment-578536852

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

23914740

24 Jan, 2020 3 commits

qtwebkit: remove · a35403dc

Martin Jansa authored 5 years ago


* it wasn't updated for very long time and I assume that all users already migrated to qtwebengine
  if not let me know that you'll start maintaining this recipe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

a35403dc

python-pyqt5, qtwebengine, qtwebkit, qt-kiosk-browser: skip without meta-python2 · a797f85c

Martin Jansa authored 5 years ago

Neither of these actually builds with python3, skip them when
meta-python2 isn't included until real fix is available.

qtwebkit might not get the support for python3 at all

qtwebengine I have some changes for the initial build, but there
are many more needed as shown in upstream chromium:
https://bugs.chromium.org/p/chromium/issues/detail?id=942720
https://bugs.chromium.org/p/chromium/issues/list?q=label%3AProj-Python3Migration&can=2

python-pyqt5 is already blacklisted because of sip

qtwebengine with python3 shows in log.do_configure that it won't actually
build qtwebengine, but it doesn't fail. do_compile fails but with a bit
misleading error:

ERROR: qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 do_compile: oe_runmake failed
ERROR: qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 do_compile: Execution of '/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/temp/run.do_compile.16479' failed with exit code 1:
cd src/ && ( test -e Makefile || /home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot-native/usr/bin/qmake -o Makefile /home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/git/src/src.pro CONFIG+=force_debug_info QT_BUILD_PARTS-=examples QT_BUILD_PARTS-=tests 'QMAKE_CXX=x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot' 'QMAKE_CC=x86_64-webos-linux-gcc -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot' 'QMAKE_LINK=x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot' 'QMAKE_CFLAGS= -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0=/usr/src/debug/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0=/usr/src/debug/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot= -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot-native= ' 'QMAKE_CXXFLAGS= -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0=/usr/src/debug/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0=/usr/src/debug/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot= -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot-native= -fvisibility-inlines-hidden' -after ) && make -f Makefile
make[1]: Entering directory '/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/build/src'
/bin/sh: 1: Syntax error: "(" unexpected
Makefile:295: recipe for target 'errorbuild' failed
make[1]: *** [errorbuild] Error 2
make[1]: Leaving directory '/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/build/src'
Makefile:48: recipe for target 'sub-src-make_first' failed
make: *** [sub-src-make_first] Error 2
WARNING: exit code 1 from a shell command.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

a797f85c

Revert "recipes: Use python3 during build" · b1f4f1fd

Martin Jansa authored 5 years ago

This reverts commit 47fb26de.

Neither of these actually builds with python3, it's good fix to
start parsing the layer again, but better to just skip them when
meta-python2 isn't available until real fix is available.

qtwebkit might not get the support for python3 at all

python-pyqt5 is already blacklisted because of sip

qtwebengine with python3 shows in log.do_configure that it won't actually
build qtwebengine, but it doesn't fail. do_compile fails but with a bit
misleading error:

b1f4f1fd

20 Jan, 2020 1 commit

recipes: Use python3 during build · 47fb26de

Khem Raj authored 5 years ago

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

47fb26de

19 Dec, 2019 1 commit
- qtwebkit: Fix linking errors on clang/mips/ppc · a4db065b
  Khem Raj authored 5 years ago
```
Disable JIT on mips32/ppc as well
Signed-off-by: Khem Raj <raj.khem@gmail.com>
```
  a4db065b
28 Nov, 2019 1 commit
- qtwebkit: add missing flex-native dep · 4f3ed3ed
  Christopher Larson authored 5 years ago
```
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
```
  4f3ed3ed
31 Oct, 2019 1 commit
- qt5: Upgrade to Qt 5.13.2 · 81156172
  Martin Jansa authored 5 years ago
```
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
```
  81156172
10 Jan, 2019 1 commit

qtwebkit: Disable JIT for mips64 · be8bc9f5

Khem Raj authored 6 years ago


It does not build with JIT

git/Source/JavaScriptCore/assembler/MacroAssembler.h:64:2: error: #error "The MacroAssembler is not supported on this platform."
   64 | #error "The MacroAssembler is not supported on this platform."
      |  ^~~~~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

be8bc9f5

20 Dec, 2018 1 commit
- qtwebkit: Fix build with clang · ba03a767
  Khem Raj authored 6 years ago
```
Signed-off-by: Khem Raj <raj.khem@gmail.com>
```
  ba03a767
26 Sep, 2018 1 commit

qt: use single -dev and -staticdev package · 2109ff6e

Martin Jansa authored 6 years ago


* don't create separate examples-dev and examples-staticdev for all modules
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

2109ff6e

25 Sep, 2018 1 commit

qtwebkit: Use relative paths for pri files when cross compile · d498eb60

Khem Raj authored 6 years ago


This helps in compiling examples etc. without hardcoded headers
Signed-off-by: Khem Raj <raj.khem@gmail.com>

d498eb60

19 Sep, 2018 4 commits
- qtwebkit: Make qtwebkit support arm32 BE. · a8832a7f
  Lei Maohui authored 6 years ago
```
* It can work on arm32 BE.
* MJ: modified to apply correctly
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
```
  a8832a7f
- qtwebkit: add patches to meta-qt5 fork · edf1e434
  Martin Jansa authored 6 years ago
```
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
```
  edf1e434
- qtwebkit: Fix conflicts with -I and -isystem · a307eb0e
  Khem Raj authored 6 years ago
```
Signed-off-by: Khem Raj <raj.khem@gmail.com>
```
  a307eb0e
- qtwebkit: Fix build with musl · 3e4141cf
  Khem Raj authored 6 years ago
```
Signed-off-by: Khem Raj <raj.khem@gmail.com>
```
  3e4141cf
17 Aug, 2018 1 commit

qtwebkit_git.bb: Fix configure failure on bison · 1fb8affa

Manjukumar Matha authored 6 years ago


Fix the following error during do_configure

| CMake Error at
|   Could NOT find BISON (missing: BISON_EXECUTABLE) (Required is at
least
|   version "2.1")
| Call Stack (most recent call first):

Add dependency to bison-native to fix the above error
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>

1fb8affa

06 Jun, 2018 1 commit

qtwebengine: add -fpermissive · 70ce9802

Martin Jansa authored 7 years ago

* http://errors.yoctoproject.org/Errors/Details/179245/
  just use -fpermissive in this case like fedora did:
  https://bugzilla.redhat.com/show_bug.cgi?id=1582954

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

70ce9802

05 Jun, 2018 1 commit

qtwebkit: do not skip build - use cmake as build system · 29445f6e

Andreas Müller authored 7 years ago


log.do_configure says:

| The WebKit build was disabled for the following reasons:
|     * cross-compilation of QtWebKit with qmake is not supported yet
|    * Missing cmake from PATH
|    * Using cmake version , but at least cmake 2.8.12 is required to build QtWebKit.

and build was finished without errors (but surprisingly fast). Looking into
qtwebkit, it seems they have changed to cmake build system and Webkit.pro is
just a wrapper for preparing and running cmake.

For the transition the packageconfigs were translated as close as possible.
'libxcomposite' and 'libxrender' were merged to 'x11' - there is only one
option 'ENABLE_X11_TARGET' available for both.
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

29445f6e