Commit Graph

984 Commits

Author SHA1 Message Date
Martin Jansa
000e298b58 qtbase: add libxext dependency for xcb PACKAGECONFIG
* with new Qt, qtbase fails to build with x11 DISTRO_FEATURES
  ERROR: Feature 'xcb-xlib' was enabled, but the pre-condition 'features.xlib && libs.xcb_xlib' failed.

  Trying source 0 (type makeSpec) of library xlib ...
  None of [libXext.so libXext.a] found in [] and global paths.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-05-14 10:38:56 +00:00
Philip Balister
ba08444f42 python-pyqt5: Update to version 5.12.1.
Signed-off-by: Philip Balister <philip@opensdr.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-05-12 10:03:00 +00:00
Philip Balister
6a1a387a50 python-pyqt: Fix annoying problems.
* Python ABI only applies to include files.

Signed-off-by: Philip Balister <philip@opensdr.com>
2019-05-12 10:01:39 +00:00
Johannes Pointner
c7e0ba566f qtwebengine: arm: use OE specified -mcpu option
OE-Core sets -mcpu option, which is equivalent to -march and -mtune
combination. Therefore don't set -march and -mtune in chromium.

Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
2019-05-06 18:52:02 +00:00
Kurt Kiefer
9c62c01bc2 qtbase-tools: Fix error during pkg_postinst
When staging the sdk, the following error is seen:
sed: can't read <path-to-work>/sdk/image/usr/local/oecore-x86_64/sysroots/aarch64-oe-linux/usr/bin/qt.conf: No such file or directory
because the qt.conf file moved from /usr/bin/qt.conf to
/usr/bin/qt5/qt.conf

This change locates the qt.conf file during pkg_postinst using the
OE_QMAKE_PATH_BINS variable, just as when the file is created.
2019-05-02 21:28:17 +00:00
Martin Jansa
f4531ec860 qtwebengine: restore the fix for build with clang/libc++ on aarch64/arm
* it was fixed in:
  5be2654885
* but then when upgrading to 5.12.3 from meta-qt5/qtwebengine I've accidentally overwritten
  this one with the older version in:
  e2707a016c

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-05-02 18:36:25 +00:00
Martin Jansa
8586caf2f2 qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch
* v5.12.3 tags in qt3d, qtknx, qtmqtt, qtopcua, qttools, qtremoteobjects are fine now

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-04-26 06:31:50 +00:00
Martin Jansa
7dc422d94a qtwayland: check also that the destination for private headers exists before installing them
* it looks like with 5.12 the QtCompositor headers are actually in QtWaylandCompositor directory
  and ${D}${includedir}/QtCompositor/${SHRT_VER}/QtCompositor/private/ doesn't exist causing
  do_install to fail

$ ls /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtwayland/5.12.3+gitAUTOINC+bcdc00bcdc-r0/image/usr/include/QtWaylandCompositor/5.12.3/QtWaylandCompositor/private/
qtwaylandcompositor-config_p.h     qwaylandpointer_p.h                        qwayland-server-wayland.h                     qwaylandxdgdecorationv1_p.h            qwldatadevice_p.h                       wayland-hardware-integration-server-protocol.h
qtwaylandcompositorglobal_p.h      qwaylandqtwindowmanager_p.h                qwayland-server-xdg-decoration-unstable-v1.h  qwaylandxdgshellintegration_p.h        qwldataoffer_p.h                        wayland-ivi-application-server-protocol.h
qwaylandcompositorextension_p.h    qwaylandquickhardwarelayer_p.h             qwayland-server-xdg-shell.h                   qwaylandxdgshell_p.h                   qwldatasource_p.h                       wayland-qt-key-unstable-v1-server-protocol.h
qwaylandcompositor_p.h             qwaylandquickitem_p.h                      qwayland-server-xdg-shell-unstable-v5_p.h     qwaylandxdgshellv5integration_p.h      qwlhardwarelayerintegrationfactory_p.h  wayland-qt-windowmanager-server-protocol.h
qwaylanddestroylistener_p.h        qwaylandquickshellsurfaceitem_p.h          qwayland-server-xdg-shell-unstable-v6.h       qwaylandxdgshellv5_p.h                 qwlhardwarelayerintegration_p.h         wayland-server-buffer-extension-server-protocol.h
qwaylandinputmethodcontrol_p.h     qwaylandseat_p.h                           qwaylandshell_p.h                             qwaylandxdgshellv6integration_p.h      qwlhardwarelayerintegrationplugin_p.h   wayland-text-input-unstable-v2-server-protocol.h
qwaylandiviapplication_p.h         qwayland-server-hardware-integration.h     qwaylandsurface_p.h                           qwaylandxdgshellv6_p.h                 qwlhwintegration_p.h                    wayland-touch-extension-server-protocol.h
qwaylandivisurfaceintegration_p.h  qwayland-server-ivi-application.h          qwaylandtextinputmanager_p.h                  qwlbuffermanager_p.h                   qwlqtkey_p.h                            wayland-wayland-server-protocol.h
qwaylandivisurface_p.h             qwayland-server-qt-key-unstable-v1.h       qwaylandtextinput_p.h                         qwlclientbufferintegrationfactory_p.h  qwlqttouch_p.h                          wayland-xdg-decoration-unstable-v1-server-protocol.h
qwaylandkeyboard_p.h               qwayland-server-qt-windowmanager.h         qwaylandtouch_p.h                             qwlclientbufferintegration_p.h         qwlregion_p.h                           wayland-xdg-shell-server-protocol.h
qwaylandkeymap_p.h                 qwayland-server-server-buffer-extension.h  qwaylandview_p.h                              qwlclientbufferintegrationplugin_p.h   qwlserverbufferintegrationfactory_p.h   wayland-xdg-shell-unstable-v5-server-protocol_p.h
qwaylandoutputmode_p.h             qwayland-server-text-input-unstable-v2.h   qwaylandwlshellintegration_p.h                qwlclientbuffer_p.h                    qwlserverbufferintegration_p.h          wayland-xdg-shell-unstable-v6-server-protocol.h
qwaylandoutput_p.h                 qwayland-server-touch-extension.h          qwaylandwlshell_p.h                           qwldatadevicemanager_p.h               qwlserverbufferintegrationplugin_p.h

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-04-22 20:09:04 +00:00
Martin Jansa
84d647afc8 qtwayland: improve manual header installation
* allow to disable this completely with
  QTWAYLAND_INSTALL_PRIVATE_HEADERS_MANUALLY
  e.g. in case you already have your own bbappend resolving this
  differently
* use SHRT_VER variable and allow to change it in .bbappend
  e.g. in webOS we have different version with different format
  without "+git" and 5.11.3-2 ended in upstream_pv which caused
  do_install to fail because
  ${D}${includedir}/QtWaylandClient/5.11.3-2
  doesn't exist, split the PV by + as well - to cover both schemes
  and allow users to set SHRT_VER to something else if they have
  even weirder PV
* install the QtCompositor headers in the same way as QtWaylandClient
  we have custom compositor and with 5.11 it was failing to build
  because of missing headers, so I had this in .bbappend already
  (I thought it was only our issue, because we were using 5.4 based
  QtWayland with 5.11, but the same happends with 5.6 based one and
  probably newer as well (I don't know what qtwayland version Andreas
  was using when first sending the previous qtwayland patch).
* with 5.4 QtWayland and 5.11, I've updated sync.profile with
  %inject_headers and @private_headers
  built even with this sync.profile change the syncqt.pl in do_install
  doesn't install these 5.4 specific profile headers and qtwayland-webos
  and luna-surfacemanager fail to build.

  This is the diff between:
  recipe-sysroot-native/usr/bin/syncqt.pl -version 4.5.2 -showonly
  with Qt 5.6 and 5.11

  @@ -1,6 +1,5 @@
  -<srcbase> = BUILD/work/qemux86-webos-linux/qtwayland/5.4.2-119-r0/git
  -<bldbase> = BUILD/work/qemux86-webos-linux/qtwayland/5.4.2-119-r0/git
  -<outbase> = BUILD/work/qemux86-webos-linux/qtwayland/5.4.2-119-r0/git
  +<srcbase> = BUILD/work/qemux86-webos-linux/qtwayland/5.4.2-119-r0/git
  +<outbase> = BUILD/work/qemux86-webos-linux/qtwayland/5.4.2-119-r0/git
   pmtrace_qtwaylandclient_provider.h [QtWaylandClient]
   qtwaylandclienttracer.h [QtWaylandClient]
   qwaylandabstractdecoration_p.h [QtWaylandClient]
  @@ -34,34 +33,6 @@
   qwaylandwlshellsurface_p.h [QtWaylandClient]
   qwaylandxdgshell_p.h [QtWaylandClient]
   qwaylandxdgsurface_p.h [QtWaylandClient]
  -qwayland-hardware-integration.h [QtWaylandClient]
  -qwayland-output-extension.h [QtWaylandClient]
  -qwayland-qt-windowmanager.h [QtWaylandClient]
  -qwayland-qtkey-extension.h [QtWaylandClient]
  -qwayland-server-buffer-extension.h [QtWaylandClient]
  -qwayland-sub-surface-extension.h [QtWaylandClient]
  -qwayland-surface-extension.h [QtWaylandClient]
  -qwayland-text.h [QtWaylandClient]
  -qwayland-text-input-unstable-v2.h [QtWaylandClient]
  -qwayland-touch-extension.h [QtWaylandClient]
  -qwayland-wayland.h [QtWaylandClient]
  -qwayland-windowmanager.h [QtWaylandClient]
  -qwayland-xdg-shell-unstable-v6.h [QtWaylandClient]
  -qwayland-xdg-shell.h [QtWaylandClient]
  -wayland-hardware-integration-client-protocol.h [QtWaylandClient]
  -wayland-output-extension-client-protocol.h [QtWaylandClient]
  -wayland-qt-windowmanager-client-protocol.h [QtWaylandClient]
  -wayland-qtkey-extension-client-protocol.h [QtWaylandClient]
  -wayland-server-buffer-extension-client-protocol.h [QtWaylandClient]
  -wayland-sub-surface-extension-client-protocol.h [QtWaylandClient]
  -wayland-surface-extension-client-protocol.h [QtWaylandClient]
  -wayland-text-client-protocol.h [QtWaylandClient]
  -wayland-text-input-unstable-v2-client-protocol.h [QtWaylandClient]
  -wayland-touch-extension-client-protocol.h [QtWaylandClient]
  -wayland-wayland-client-protocol.h [QtWaylandClient]
  -wayland-windowmanager-client-protocol.h [QtWaylandClient]
  -wayland-xdg-shell-client-protocol.h [QtWaylandClient]
  -wayland-xdg-shell-unstable-v6-client-protocol.h [QtWaylandClient]
   qwaylandclientbufferintegration_p.h [QtWaylandClient]
   qwaylandclientbufferintegrationfactory_p.h [QtWaylandClient]
   qwaylandclientbufferintegrationplugin_p.h [QtWaylandClient]
  @@ -84,38 +55,6 @@
   SYMBOL: QWaylandEglWindow
   qwaylandglcontext.h [QtWaylandClient]
   SYMBOL: QWaylandGLContext
  -qwayland-server-wayland.h [QtCompositor]
  -qwayland-server-hardware-integration.h [QtCompositor]
  -qwayland-server-input-method.h [QtCompositor]
  -qwayland-server-ivi-application.h [QtCompositor]
  -qwayland-server-output-extension.h [QtCompositor]
  -qwayland-server-qt-windowmanager.h [QtCompositor]
  -qwayland-server-qtkey-extension.h [QtCompositor]
  -qwayland-server-server-buffer-extension.h [QtCompositor]
  -qwayland-server-sub-surface-extension.h [QtCompositor]
  -qwayland-server-surface-extension.h [QtCompositor]
  -qwayland-server-text.h [QtCompositor]
  -qwayland-server-text-input-unstable-v2.h [QtCompositor]
  -qwayland-server-touch-extension.h [QtCompositor]
  -qwayland-server-windowmanager.h [QtCompositor]
  -qwayland-server-xdg-shell-unstable-v6.h [QtCompositor]
  -qwayland-server-xdg-shell.h [QtCompositor]
  -wayland-hardware-integration-server-protocol.h [QtCompositor]
  -wayland-input-method-server-protocol.h [QtCompositor]
  -wayland-ivi-application-server-protocol.h [QtCompositor]
  -wayland-output-extension-server-protocol.h [QtCompositor]
  -wayland-qt-windowmanager-server-protocol.h [QtCompositor]
  -wayland-qtkey-extension-server-protocol.h [QtCompositor]
  -wayland-server-buffer-extension-server-protocol.h [QtCompositor]
  -wayland-sub-surface-extension-server-protocol.h [QtCompositor]
  -wayland-surface-extension-server-protocol.h [QtCompositor]
  -wayland-text-input-unstable-v2-server-protocol.h [QtCompositor]
  -wayland-text-server-protocol.h [QtCompositor]
  -wayland-touch-extension-server-protocol.h [QtCompositor]
  -wayland-wayland-server-protocol.h [QtCompositor]
  -wayland-windowmanager-server-protocol.h [QtCompositor]
  -wayland-xdg-shell-server-protocol.h [QtCompositor]
  -wayland-xdg-shell-unstable-v6-server-protocol.h [QtCompositor]
   pmtrace_qtwayland_provider.h [QtCompositor]
   qtwaylandtracer.h [QtCompositor]
   qwaylandbufferref.h [QtCompositor]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-04-22 12:39:19 +00:00
Andreas Müller
3d60f9a404 qtwayland: workaround upstream bug: install missing headers manually
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-04-22 12:39:16 +00:00
Martin Jansa
eb5d6daa35 qtwayland: disable gold for all archs like in qtbase
* like xlib configure test in qtbase fails to link with gold when full path to libm is being used:
  | linking ../../../../../plugins/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so
  | /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtwayland/5.12.3+gitAUTOINC+bcdc00bcdc-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.3.0/ld: error: cannot open /lib/libm.so.6: No such file or directory
  | /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtwayland/5.12.3+gitAUTOINC+bcdc00bcdc-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.3.0/ld: error: cannot open /usr/lib/libmvec_nonshared.a: No such file or directory
  | /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtwayland/5.12.3+gitAUTOINC+bcdc00bcdc-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.3.0/ld: error: cannot open /lib/libmvec.so.1: No such file or directory
  | collect2: error: ld returned 1 exit status
  | Makefile:83: recipe for target '../../../../../plugins/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so' failed

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-04-18 23:07:00 +00:00
Martin Jansa
e2707a016c qt5: upgrade to 5.12.3
* be aware that in 3 qt* project the v5.12.3 tag wasn't created yet:
  qtknx_git.bb:# v5.12.3 tag wasn't created yet
  qtmqtt_git.bb:# v5.12.3 tag wasn't created yet
  qtopcua_git.bb:# v5.12.3 tag wasn't created yet

* and qttools, qt3d, qtremoteobjects v5.12.3 tag isn't in 5.12 branch

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-04-18 23:04:41 +00:00
Martin Jansa
07784245c1 qtbase: disable gold for all archs not just x86
* enabling xlib in x86_64 build was failing with:
  ERROR: Feature 'xcb-xlib' was enabled, but the pre-condition 'features.xlib && libs.xcb_xlib' failed.
* the root cause is linking with full path libm.so in my case:
  /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.12.3+gitAUTOINC+b527725766-r0/recipe-sysroot/usr/lib/libm.so
  which with gold fails with:
  /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.12.3+gitAUTOINC+b527725766-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.3.0/ld: error: cannot open /lib/libm.so.6: No such file or directory
  /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.12.3+gitAUTOINC+b527725766-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.3.0/ld: error: cannot open /usr/lib/libmvec_nonshared.a: No such file or directory
  /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.12.3+gitAUTOINC+b527725766-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.3.0/ld: error: cannot open /lib/libmvec.so.1: No such file or directory
  collect2: error: ld returned 1 exit status
* not linking with libm at all in xcb test makes it pass, or linking
  with -lm as before works as well, but to be safe lets disable gold
  everywhere until it's resolved in upstream Qt
* also reported in the 5.12.2 upgrade PR:
  https://github.com/meta-qt5/meta-qt5/pull/181#issuecomment-484425112

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-04-18 09:55:22 +00:00
Martin Jansa
4303873091 qtbase-native: use QT_CONFIG_FLAGS variable like qtbase and nativesdk-qtbase
* instead of using PACKAGECONFIG_CONFARGS directly

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-04-17 23:34:33 +00:00
Andreas Müller
8895ea3b63 qtbase: Fix build with recent oe-core/pseudo on hosts with glibc >= 2.28
Recently pseudo changed to not support reanameeat2 as glibc wrapper [1]. This
causes massive failures at do_install [2] on qtbase.

To work around tell Qt build configuration not to use ranameat2 independent
of glibc version.

Target qtbase does not require this adjustment - there is no pseudo on target.

[1] https://git.openembedded.org/openembedded-core/commit/?id=0fb257121b68f38b40c078150db8f7d0979b7ea5
[2] https://github.com/meta-qt5/meta-qt5/issues/187

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-04-17 23:34:33 +00:00
Martin Jansa
95974f44f1 qtbase, qtmultimedia: refresh patches to apply cleanly and update them on github.com/meta-qt5 forks
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-04-04 14:05:30 +00:00
Samuli Piippo
a4bf2402c1 qtbase-native: add native libdir to search path
After commit 521a85395, Qt uses global search paths to resolve each library
path, but because we are using -no-gcc-sysroot the native libdir is not part
of the search path. Add the native libdir to search path so that we don't
depend on host libraries for locating zlib.

Fixes "ERROR: Feature 'system-zlib' was enabled, but the pre-condition
'libs.zlib' failed."

Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-04-03 14:10:43 +00:00
Samuli Piippo
adf7f60587 qt5: patch build paths from installed files
All 3rdparty libs and includes are now resolved into full filepaths,
which means build paths to the yocto build environment are in module's
prl, pri, pc and cmake files.

Move existing patching from qtbase to the bbclass so that it's applied
to all modules. -L paths are no longer included in the .pc files, remove
unneeded patching for those.

Task-number: QTBUG-72903
Change-Id: Iae5d150593aef153c46aaf8a3ba22fbafcc9b818
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
2019-04-03 14:10:43 +00:00
Mikko Gronoff
28d4bfdf74 Upgrade to 5.12.2
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
2019-04-03 14:10:43 +00:00
Khem Raj
5a32838312 layer.conf: Add warrior to compatible release series
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-04-02 14:54:39 -03:00
Francesco Giancane
0b0a608ddc qtbase: let user decide how to link openssl to Qt5 libraries
Switch from the configure script was extended from -openssl to -openssl-{linked,runtime} so that one can select whether to enable ssl library at linking time or runtime (with dlopen()), or letting the build system decide if no flag is specified.

Now with the OPENSSL_LINKING_MODE variable, it is possible to decide which linking mode to be used.

Signed-off-by: Francesco Giancane <francesco.giancane@polito.it>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-03-18 11:26:44 +00:00
Andreas Müller
47d1132b1d qtbase: fix target mkspec adjustment
mkspecs are not part of qtbase-tools

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-18 11:26:32 +00:00
Samuli Piippo
87f04621f3 qttools/cmake: use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS in Linguist cmake file similarly
to qtbase's cmake files. This fixes usage in external toolchain.

Task-number: QTBUG-73758
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
2019-03-07 23:54:18 +00:00
Samuli Piippo
fe88b99ad3 nativesdk-qtbase: use rpath for nativesdk Qt tools
rpath is needed to be able to run qt tools from the sdk without
having the sdk's lib dir explicitly in LD_LIBRARY_PATH or relying
on host libraries. Qt uses relative rpaths, so the build directories
are not used there.

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
2019-03-07 23:54:18 +00:00
Samuli Piippo
92c34de4bb qt5: cleanup mkspecs
QMAKE_COMPILER is not meant to be the actual compiler, but a compiler
type (gcc, clang, mingw). For both mkspecs it's already set in the
common includes. Remove wayland and debug settings from the clang
mkspec as they are already removed from the gcc mkspec.

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
2019-03-07 23:54:18 +00:00
Khem Raj
e117b58d16 qtbase: Fix test builds with clang/x86_64
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-03-07 23:54:18 +00:00
Martin Jansa
6280befe6c qtscript: add fix for build with gcc 8.3
* fixes issue introduced with gcc upgrade to 8.3:

| /OE/build/luneos-master/webos-ports/tmp-glibc/work/i586-webos-linux/qtscript/5.12.0+gitAUTOINC+0be84da600-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp:157:5: error: expected '(' before 'volatile'
|  asm volatile (
|      ^~~~~~~~
|      (
| /OE/build/luneos-master/webos-ports/tmp-glibc/work/i586-webos-linux/qtscript/5.12.0+gitAUTOINC+0be84da600-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp:158:1: error: expected unqualified-id before string constant
|  ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
|  ^~~~~~~~~

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-03-07 23:54:05 +00:00
Andreas Müller
77ed8fb225 qtbase: Adjust target mkspec settings
* linux-oe-g++ won't work use linux-g++ by default
* we doe not cross compile on target
* adjustment are done at postinst to keep build sysroots unmodified

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-07 23:51:33 +00:00
Andreas Müller
75c7d00e10 qt5-creator: Do not ship two desktop files
These days qtcreator ships desktop file - so use that.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-24 09:51:40 +00:00
Andreas Müller
6629131e77 packagegroup-qt5-toolchain-target: add qtbase-tools
From Qt perspective qmake/moc and friends are part of the toolchain

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-24 09:51:40 +00:00
Martin Jansa
fb71293f25 qtwebengine: drop 0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch
* with 5.12 it looks like it's not needed anymore, it causes following error instead:
  linking ../../lib/libQt5WebEngineCore.so.5.12.0
  ../../../../git/src/3rdparty/chromium/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc:79: error: undefined reference to 'content::GetFontFamilies_SlowBlocking(std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >*)'
  ../../../../git/src/3rdparty/chromium/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc:93: error: undefined reference to 'content::GetFontsInFamily_SlowBlocking(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<ppapi::proxy::SerializedTrueTypeFontDesc, std::allocator<ppapi::proxy::SerializedTrueTypeFontDesc> >*)'
  collect2: error: ld returned 1 exit status
  Makefile.core_module:74: recipe for target '../../lib/libQt5WebEngineCore.so.5.12.0' failed

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-02-14 17:40:27 +00:00
Andreas Müller
38ec325560 qwt-qt5: upgrade 6.1.3 -> 6.1.4
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-14 17:40:27 +00:00
Andreas Müller
e2d9845b05 qwt-qt5: Fix multilib install
| ERROR: qwt-qt5-6.1.3-r0 do_package: QA Issue: qwt-qt5: Files/directories were installed but not shipped in any package:
|   /usr/lib/libqwt.so.6
|   /usr/lib/libqwt.so.6.1
|   /usr/lib/libqwt.so
|   /usr/lib/libqwt.so.6.1.3
|   /usr/lib/pkgconfig
|   /usr/lib/pkgconfig/Qt5Qwt6.pc
| Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-14 17:40:27 +00:00
Khem Raj
5be2654885 qtwebengine: Fix build with clang/libc++ on aarch64/arm
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-02-14 17:40:27 +00:00
Khem Raj
cb1b472126 qtbase: Export host compiler and linker
Certain portions of qtwebengine build involves building native tools
using host compiler/linker, this however currently uses gcc and when we
build with clang to compile the target pieces, chromium configures for
clang and rightly so, but then does not have a way to define flags for
host and target separately, and it ends up supplying same flags for both
host and target builds, the trouble is that the options between clang
and gcc are not always same in some cases, they dont understand each
others options. So build starts to fail due to these errors about
unknown cmdline options.

This makes sure we inject CC_host, CXX_host, LD_host into qmake.conf so
they can be used in such packages

We use clang to do host builds when TOOLCHAIN = "clang" is used
otherwise default to gcc as it was the case

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-02-14 17:40:27 +00:00
Khem Raj
6d919b0bf1 qt5-plugin-generic-vboxtouch: Fix build with clang/libc++
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-02-14 17:40:27 +00:00
Khem Raj
6713882563 maliit-framework,maliit-plugins: Fix build with libc++
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-02-14 17:40:27 +00:00
Khem Raj
9a83f2d9a6 qtconnectivity: Fix build with clang/libc++
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-02-14 17:40:27 +00:00
Andreas Müller
080cc294b7 qtwayland: workaround upstream bug: install missing headers manually
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-14 17:40:27 +00:00
Marco Felsch
f6f61b07a4 gstreamer1.0-plugins-good: fix qt5 dependency
Commit 73f99f2 ("gstreamer1.0-plugins-{good,bad}: move the qt5
PACKAGECONFIG from bad to good bbappend") just copied the bbappend file
without checking the dependencies.

The qt5 plugin needs the gl plugin which was moved in gstreamer 1.14
from bad to base. So the pyhton() function checking the PACKAGECONFIG_GL
isn't needed here, furthermore it causes bitbake errors:

     0013:        gl_packageconfig = d.getVar('PACKAGECONFIG_GL', expand=True)
     0014:        with open("/tmp/marcotest", "w") as f:
     0015:            print(gl_packageconfig, file=f)
     0016:        d.appendVar('PACKAGECONFIG', ' ' + gl_packageconfig)
 *** 0017:}
Exception: TypeError: can only concatenate str (not "NoneType") to str

The patch removes the python() function to fix this and adds the
gstreamer1.0-plugins-base dependency to have access to the gl plugin.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
2019-02-08 22:18:59 +00:00
Alistair Francis
d055d6a279 qtbase: Update the PACKAGECONFIG_KDE to enable more
Update PACKAGECONFIG_KDE to ensure that all required packages are
enabled.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
2019-02-08 22:18:25 +00:00
Martin Jansa
82abc2bb38 qtbase: fix incomplete recipe changes from previous commit
* the patches were renamed, but I forgot to amend the SRC_URI modifications

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-01-12 17:58:58 +00:00
Khem Raj
f4c8cef858 qtbase: Fix qtopcua issue on bigendian systems
See
http://errors.yoctoproject.org/Errors/Details/213681/

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-01-10 09:56:37 +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
Martin Jansa
51e07805e0 qtbase: replace the fix for gcc-4.8 with the one from upstream
* fixes:
| In file included from ../include/QtCore/qendian.h:1:0,
|                  from /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+13ed06640c-r0/git/src/corelib/codecs/qutfcodec.cpp:43:
| ../include/QtCore/../../../git/src/corelib/global/qendian.h: In instantiation of �constexpr Float qbswapFloatHelper(Float) [with Float = qfloat16]�:
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:167:36:   required from here
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:163:1: error: body of constexpr function �constexpr Float qbswapFloatHelper(Float) [with Float = qfloat16]� not a return-statement
|  }
|  ^
| ../include/QtCore/../../../git/src/corelib/global/qendian.h: In instantiation of �constexpr Float qbswapFloatHelper(Float) [with Float = float]�:
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:172:29:   required from here
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:163:1: error: body of constexpr function �constexpr Float qbswapFloatHelper(Float) [with Float = float]� not a return-statement
| ../include/QtCore/../../../git/src/corelib/global/qendian.h: In instantiation of �constexpr Float qbswapFloatHelper(Float) [with Float = double]�:
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:177:29:   required from here
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:163:1: error: body of constexpr function �constexpr Float qbswapFloatHelper(Float) [with Float = double]� not a return-statement

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-12-24 08:43:51 +00:00
Khem Raj
c67abd66ff qtbase: Fix build with gcc 4.8
Fixes errors like

In file included from ../include/QtCore/qendian.h:1:0,
                 from TOPDIR/build/tmp/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+13ed06640c-r0/git/src/corelib/codecs/qutfcodec.cpp:43:
../include/QtCore/../../../git/src/corelib/global/qendian.h:165:61: error: redeclaration ‘constexpr T qbswap(T) [with T = qfloat16]’ differs in ‘constexpr’

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-12-24 08:29:40 +00:00
Khem Raj
f69fc4063c qtwebengine: Fix build with musl/gcc9
Provide couple of patches to fix build with x86_64/musl and a new
bug found lss via gcc9

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-12-24 07:18:56 +00:00
Martin Jansa
7cc177d116 qtwebkit-examples: drop recipe
* it's not supported by upstream

* it's broken again with 5.12.0:
  http://errors.yoctoproject.org/Errors/Build/74151/
  make[3]: Entering directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/simpleselector'
  make[3]: *** No rule to make target 'QtWebKit/QWebView', needed by '.uic/ui_window.h'.  Stop.
  make[3]: Leaving directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/simpleselector'
...
  make[3]: Entering directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/domtraversal'
  make[3]: *** No rule to make target 'QtWebKitWidgets/QWebView', needed by '.uic/ui_window.h'.  Stop.
  make[3]: Leaving directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/domtraversal'
...
  make[3]: Entering directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/formextractor'
  make[3]: *** No rule to make target 'QtWebKit/QWebView', needed by '.uic/ui_formextractor.h'.  Stop.
  make[3]: Leaving directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/formextractor'
...
  make[3]: Entering directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/previewer'
  make[3]: *** No rule to make target 'QtWebKit/QWebView', needed by '.uic/ui_previewer.h'.  Stop.
  make[3]: Leaving directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/previewer'

* nobody was interested in fixing it last time it got broken with 5.11
  upgrade:
  https://patchwork.openembedded.org/patch/151399/

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-12-23 19:40:35 +00:00
Martin Jansa
1b755b2e05 qttranslations, packagegroup-qt5-toolchain-target: drop qmlviewer
* it was removed from qttranslations in upstream commit:
  commit c49e22e0b3a48b67f481f7362b74d90e6596b60f
  Author: Kai Koehne <kai.koehne@qt.io>
  Date:   Mon Dec 3 14:44:42 2018 +0100

    Drop qtquick1 module

    qtquick1 has been removed from Qt in 5.6. The qtquick1 got removed
    from the supermodule in qt 5.11.2 (see change
    d60ef0b20247 in qt5.git). So it's high time to also remove the
    qtquick1 and qmlviewer translation logic from qttranslations.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-12-23 19:40:35 +00:00
Martin Jansa
5443af98f1 qtwayland: revert one patch from 5.12 branch to make it compatible with 5.12.0 qtbase
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-12-23 19:40:35 +00:00