Commit Graph

68 Commits

Author SHA1 Message Date
Khem Raj
05b3e648ec qtwebkit: Switch to 5.212 branch
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>
2020-04-21 16:49:36 +02:00
Andreas Müller
c8cd55b030 qtwebkit: build with python3
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-02-06 13:59:16 +01:00
Martin Jansa
239147405e Revert "qtwebkit: remove"
This reverts commit a35403dcf6.

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>
2020-02-03 13:38:06 +01:00
Martin Jansa
a35403dcf6 qtwebkit: remove
* 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>
2020-01-24 11:57:45 +01:00
Martin Jansa
a797f85c6f python-pyqt5, qtwebengine, qtwebkit, qt-kiosk-browser: skip without meta-python2
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>
2020-01-24 11:57:37 +01:00
Martin Jansa
b1f4f1fdd0 Revert "recipes: Use python3 during build"
This reverts commit 47fb26dedd.

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

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>
2020-01-24 11:56:35 +01:00
Khem Raj
47fb26dedd recipes: Use python3 during build
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2020-01-20 10:42:50 +01:00
Khem Raj
a4db065bed qtwebkit: Fix linking errors on clang/mips/ppc
Disable JIT on mips32/ppc as well

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-12-18 16:52:52 -08:00
Christopher Larson
4f3ed3ed49 qtwebkit: add missing flex-native dep
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
2019-11-28 04:55:13 +01:00
Martin Jansa
81156172a8 qt5: Upgrade to Qt 5.13.2
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-10-31 15:26:55 +00:00
Khem Raj
be8bc9f575 qtwebkit: Disable JIT for mips64
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>
2019-01-10 09:56:35 +00:00
Khem Raj
ba03a767a4 qtwebkit: Fix build with clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-12-20 00:55:36 +00:00
Martin Jansa
2109ff6e37 qt: use single -dev and -staticdev package
* don't create separate examples-dev and examples-staticdev for all modules

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-09-26 19:12:10 +00:00
Khem Raj
d498eb6075 qtwebkit: Use relative paths for pri files when cross compile
This helps in compiling examples etc. without hardcoded headers

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-09-25 09:22:19 +00:00
Lei Maohui
a8832a7f4f qtwebkit: Make qtwebkit support arm32 BE.
* 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>
2018-09-19 09:55:38 +00:00
Martin Jansa
edf1e43494 qtwebkit: add patches to meta-qt5 fork
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-09-19 09:55:34 +00:00
Khem Raj
a307eb0ede qtwebkit: Fix conflicts with -I and -isystem
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-09-19 09:55:34 +00:00
Khem Raj
3e4141cfbb qtwebkit: Fix build with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-09-19 09:55:34 +00:00
Manjukumar Matha
1fb8affa94 qtwebkit_git.bb: Fix configure failure on bison
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>
2018-08-17 21:11:55 +02:00
Martin Jansa
70ce9802e4 qtwebengine: add -fpermissive
* 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>
2018-06-06 19:37:45 +00:00
Andreas Müller
29445f6e37 qtwebkit: do not skip build - use cmake as build system
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>
2018-06-05 13:50:55 +00:00
Martin Jansa
f33be06035 qt5: upgrade to 5.11 Alpha
* use qtwebkit and qtwebkit-examples from dev branch, because there is
  no 5.11 branch (there isn't 5.10 as well, but because nobranch=1 in
  qt5-git.inc nobody noticed).
* qtbase: drop qml-debug options
  removed from qtbase in:
  commit 525f8516c2580018f910cfb99ab5e0e36bd55ab1
  Author: Ulf Hermann <ulf.hermann@qt.io>
  Date:   Fri Oct 6 16:27:09 2017 +0200
  Subject: Remove qml-debug configure flag and feature
* qtgraphicaleffects, qtquickcontrols2, qtquickcontrols,
  qtvirtualkeyboard: add qtdeclarative-native dependency
  needed for qmlcachegen binary
* qtwebkit: update LIC_FILES_CHKSUM and remove PACKAGECONFIGs
  referenced files disappered in:
  commit 6882a04fb36642862b11efe514251d32070c3d65
  Author: Konstantin Tokarev <annulen@yandex.ru>
  Date:   Thu Aug 25 19:20:41 2016 +0300
  Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-04-20 10:06:37 +00:00
Khem Raj
1ce10cfcba qtwebkit: Update to latest on 5.9 branch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-04-18 11:55:36 +00:00
Khem Raj
4d0975195e qtwebkit: Fix build on armv7ve (rpi)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-04-18 11:55:08 +00:00
Martin Jansa
9ed1897bf7 qt5-git.inc: drop nobranch=1
* sneaked in with:
  commit 333949a823
  Author: Samuli Piippo <samuli.piippo@qt.io>
  Date:   Thu Jan 26 16:54:50 2017 +0200

    Upgrade to Qt 5.8
* use 5.10.1 branch by defaut and fix QT_MODULE_BRANCH
  in qtknx, qtmqtt, qtwebkit-examples, qtwebkit which don't
  have 5.10.1 branch at all

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-04-06 12:44:47 +00:00
Martin Jansa
ce76637443 qt: refresh remaining patches and tags in meta-qt5 repos
* update tag name to match the patches in meta-qt5 repository
  where the meta-qt5 .patch files are maintained, so that it's
  more clear from where these changes are exported (with:
  git format-patch --no-numbered --no-signature)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-01-16 14:21:42 +00:00
Martin Jansa
9c7507ef15 qt: upgrade to latest revision in 5.9 branch
* 3 patches were included upstream

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-08-22 17:33:38 +02:00
Martin Jansa
2d14d9956f qt: refresh remaining patches and add links to meta-qt5 repos
* remove
  qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch
  qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch
  which is already applied and fuzzy patch just apply the same section
  twice

* restore
  qttools/0001-add-noqtwebkit-configuration.patch
  which was removed from SRC_URI in 5.9 upgrade

* add comment with link to meta-qt5 repository where the meta-qt5 .patch
  files are maintained, include branch and tag name so that it's more
  clear from where these changes are exported (with:
  git format-patch --no-numbered --no-signature)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-08-20 19:30:06 +02:00
Samuli Piippo
969f1f80bf Upgrade to Qt 5.9.0
* adapt QtWebEngine recipe to use GN instead of GYP
* add QtRemoteObjects and QtWebView as a new Qt modules
* update available QtBase configure arguments
* remove obsolete patches
* patch all .pc files to remove build paths
* include generated QML cache files in packages
* the patch "configure paths for target qmake properly" could not
  be applied anymore and support must be done differently

* QtWebEngine now requires gcc-multilib to be installed on the host
  system, because the host tools are built to the same bitness as
  the target (arm -> x86, aarch64 -> x86-64)

* refresh the patches to match with b5.9* branches on:
  https://github.com/meta-qt5/qtbase
  https://github.com/meta-qt5/qtwebengine
  and 56-based branch on
  https://github.com/meta-qt5/qtwebengine-chromium

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-08-20 19:30:05 +02:00
Khem Raj
3963daa20d qtwebkit: Backport a patch to fix build with icu-59
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Tested-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-08-10 18:27:44 +02:00
Gordan Markuš
8ba28144d5 qtwebkit: depends on gperf-native
Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-07 12:55:53 +01:00
Samuli Piippo
333949a823 Upgrade to Qt 5.8
The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain
the contents of an environment value when qmake is run instead of when
Makefile is processed. All OE_QMAKE_xxx variables need to be exported
for qmake to find them. configure's setBootstrapVariable function needs
to change $$(..) to normal $(...) operator to work with qmake's Makefile.

qt.conf generation for qtbase recipes is not needed, as configure will
generate its own version based on configure arguments. Skip running
qmake, since configure is now automatically invoked when it's run in
qtbase's root folder.

Update PACKAGECONFIGs for qtbase to match current configure options.

The new Qt configuration system [1] can be used with a new variable
EXTRA_QMAKEVARS_CONFIGURE, which takes both command line and feature
arguments.

Merge the two qtwayland recipes to one that supports all three targets
(target, native, nativesdk) without need for additional patch.

Recipes for new Qt modules: QtSCXML, QtNetworkAuth, QtGamepad.
Removes qtdeclarative-render2d

[1] https://www.mail-archive.com/development@qt-project.org/msg25257.html

Change-Id: Ib37c4d7323e8b45aa2b171e8427b6ec15aaee213
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-01-26 16:18:39 +01:00
Andreas Oberritter
4b5f80c1f6 qtwebkit: Always enable icu in QT_CONFIG
Allow qtwebkit to be built even if qtbase was configured without icu.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-12-17 09:18:59 +01:00
Martin Jansa
1a42aa78af qt5: upgrade to latest revisions in 5.7 branch
* LIC_FILES_CHKSUM were changed because of this small change:
    commit 4343c4e731c3268614fc79c9c42b4e5e4d59d7e6
    Author: Sze Howe Koh <szehowe.koh@gmail.com>
    Date:   Tue Jun 14 19:12:35 2016 +0800

        Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"

* -no-nis option was removed from qtbase in:
    commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db
    Author: Ralf Nolden <nolden@kde.org>
    Date:   Fri May 20 22:03:39 2016 +0200

        Cleanup NIS support leftover from Qt 3/4

* allow to disable eglfs independently from gles2, because eglfs-egldevice
  may be autodetected when libdrm was built before qtbase since this
  upstream commit:
    commit 5c6d27b8dfa695ab04766a1711b00421dba9c7d0
    Author: Ralf Nolden <nolden@kde.org>
    Date:   Tue May 17 12:38:44 2016 +0200

        Make eglfs-egldevice check work with pkgconfig as well

  and then it fails to build, because libdrm could be removed from sysroot
  and drm.h is missing.

* recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch
  was resolved in upstream commit:
    commit 26229cfa0b729313893af5674d604e8692dbb946
    Author: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
    Date:   Tue Apr 26 15:08:34 2016 +0200

        QDeclarativeTextInput: update API to use setBlinkingCursorEnabled

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-08-05 11:03:12 +02:00
Martin Jansa
0e5756c97a qtwebkit: add PACKAGECONFIGs for libxcomposite, libxrender, fontconfig
* fixes following QA:
  WARNING: qtwebkit-5.6.99+5.7.0-alpha+gitAUTOINC+e9b369b16f-r0 do_package_qa: QA Issue: qtwebkit rdepends on libxcomposite, but it isn't a build dependency? [build-deps]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:48:05 +02:00
Martin Jansa
bf2cafa909 qt5: upgrade to latest revisions in 5.7 branches
* these revisions are after v5.7.0-beta1 tags where available
* it's highly recommended to read:
  http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
  to find out how you're affected check which files/tools are
  included in your builds, e.g. for qtwebengine:
  OE @ ~/projects/qt-project/qtwebengine $ git grep QT_BEGIN_LICENSE | sed 's/^[^:]*://g' | sort | uniq -c
     11 ## $QT_BEGIN_LICENSE:GPL-EXCEPT$
     67 ** $QT_BEGIN_LICENSE:BSD$
     17 ** $QT_BEGIN_LICENSE:FDL$
     61 ** $QT_BEGIN_LICENSE:GPL-EXCEPT$
    261 ** $QT_BEGIN_LICENSE:LGPL$
* change in chromium's LICENSE is only copyright year update

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-02 15:16:18 +02:00
Martin Jansa
754aaadc7f qt5: upgrade to latest revision in 5.6 branch
* qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
  and
  qtwebkit/0004-Fix-linking-with-libpthread.patch
  were resolved upstream
* all patches were refreshed with:
  git format-patch --no-numbered --no-signature -NUMBER
  to remove numbering from Subject (it's good enough in filename) and to
  remove git version from signature (so it doesn't look differently when
  generated on different hosts with different git version).

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-04-21 21:36:18 +02:00
Andreas Müller
f636eb7444 qt5: set SRCREVs,PVs to 5.6.0
* qtquick1: LICENSE.LGPLv3: I checked git repository.
  To be honest: I have no idea what caused checksum change.
  JaMa: it was modified in this change:
  OE @ ~/projects/qt-project/qtquick1 $ git log --oneline 87f2415adf34da08e6cd58f5da6f6a7d0d9cf141..dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295 -- LICENSE.LGPLv3
  cd50897 Add the GPLv3 license text
  diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3
  index 8fbb743..4d67bac 100644
  --- a/LICENSE.LGPLv3
  +++ b/LICENSE.LGPLv3
  @@ -5,6 +5,8 @@

    You may use, distribute and copy the Qt GUI Toolkit under the terms of
    GNU Lesser General Public License version 3, which is displayed below.
  + This license makes reference to the version 3 of the GNU General
  + Public License, which you can find in the LICENSE.GPLv3 file.

* in some cases this is actually older SRCREV than what was
  used before (because normally the recipes use latest revision
  in stable - e.g. 5.6 branches, not the actuall tags). I'll
  upgrade to latest 5.6 revisions in follow-up commit (together
  with refreshing the .patch files and github.com/meta-qt5/qt*
  repositories to apply cleanly)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-04-20 10:58:33 +02:00
Martin Jansa
9dc60fe10f recipes: use new PACKAGECONFIG_CONFARGS instead of EXTRA_OECONF
* this fixes builds for DISTROs which include no-static-libraries.inc
* this change depends on oe-core change:
  http://patchwork.openembedded.org/patch/116719/
  which was merged in this form:
  http://patchwork.openembedded.org/patch/120513/
  to Yocto 2.1, if you want to use latest meta-qt5 with older oe-core
  you need to append EXTRA_OECONF to PACKAGECONFIG_CONFARGS

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-04-20 10:49:26 +02:00
Jonathan Liu
dc6360b0a1 qtwebkit: backport patch to fix linking with qtwebkit
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-27 20:58:51 +01:00
Martin Jansa
1fea2d7b4c qtwebkit: Fix QA Warning
* there are multiple -L paths to workdir, causing QA warning like this:
  ERROR: qtwebkit-5.5.99+5.6.0-rc+gitAUTOINC+d2ff5a0855-r0 do_populate_sysroot: QA Issue: Qt5WebKit.pc failed sanity test
  (tmpdir) in path qtwebkit/5.5.99+5.6.0-rc+gitAUTOINC+d2ff5a0855-r0/sysroot-destdir//usr/lib/pkgconfig [pkgconfig]
* qtwebkit is dead, so hack it with simple sed, feel free to fix it in
  mkspecs if you want

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-20 14:45:14 +01:00
Martin Jansa
e434995a73 qt5: upgrade to latest revisions in 5.6 branch (5.6 RC)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-20 14:45:09 +01:00
Andreas Müller
511a376450 qtscript/qtwebkit: disable thumb for armv4 and armv5 only to fix segfault on armv7
We have a simple application containing a QWebView which segfaulted during
loading a page on a CortexA9 (armv7 thumb2). After enabling debug information
for qtwebkit and remote debug session the point of segfault was detected in

Source/JavaScriptCore/llint/LowLevelInterpreter.asm:1082
  callSlowPath(_llint_slow_path_new_func_exp)

Further digging around lead to similar source in:

* qtwebkit: Source/JavaScriptCore/assembler/ARMv7Assembler.h
* qtscript: src/3rdparty/javascriptcore/JavaScriptCore/assembler/ARMv7Assembler.h

In these files a class ARMThumbImmediate is declared and used in many places.
This lead me to the suspicion that compiligng for armv7 expects thumb support.

The following tests were performed:

* our application is working fine again
* qtscript and qtwebkit were build with
  'ARM_INSTRUCTION_SET = "thumb"' => TUNE_FEATURES = "arm armv5 thumb dsp"
  for qemuarm without issues

This is a partial/rebased revert of:
commit 932b32c1c9
Author: Martin Jansa <Martin.Jansa@gmail.com>
Date:   Wed Apr 22 15:33:01 2015 +0200

    qtscript,qtwebking: disable thumb

    * qemuarm builds fail when thumb is enabled

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

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-01-14 11:13:58 +01:00
Martin Jansa
178a817e6f qt5: upgrade to latest revision in 5.6 branch (5.6.0-alpha1+)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-11-11 13:24:53 +01:00
Martin Jansa
8f765ed711 qt5: upgrade to latest revision in 5.5 branches
* qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-09-25 14:24:08 +02:00
Samuli Piippo
5147e23178 qtwebkit: do not redefine all PACKAGES
Modify qtwebkit recipe so that it removes the conflicting {PN}-examples*
packages, instead of redefining all packages again.

Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-09-21 11:56:52 +02:00
Martin Jansa
18741e4838 recipes-git: upgrade to 5.5
* based on my WIP patch + fixes from John Mullen
* I was trying to get rhid of 0003-Add-external-hostbindir-option.patch
  and 0010-Add-external-hostbindir-option-for-native-sdk.patch by using
  upstream configure parameter added in some previous version, but I've
  failed, so now good-old -external-hostbindir parameter is back

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-08-18 12:07:34 +02:00
Andre McCurdy
2066c0beab qtwebkit: remove false dependency on leveldb
The qtwebkit configure test never succeeds in finding system leveldb
(ie qtwebkit internal copy of leveldb is always used) so leveldb is a
false dependency.

This change allows qtwebkit to be built in a disto which enables
security_flags.inc (it's otherwise blocked since the leveldb recipe
fails to build when security_flags.inc is used).

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-07-02 12:24:35 +02:00
Khem Raj
eedb3e6413 qtwebkit: Fix build with musl
Make backtrace() API conditional to glibc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-07-02 12:23:26 +02:00
Martin Jansa
82b211aa42 qt5: upgrade to latest revision in 5.4 branches
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-06-04 12:24:48 +02:00