diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-09 20:42:22 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-11 12:55:06 +0000 |
commit | d4b9962a4ca37bc42b6ffdcac923e4ecd0bb8169 (patch) | |
tree | 6c810c8520ebcb9637578e478815bc5081dafc1f /recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-VirtualboxTouchScreenHandler-initialize-m_mouse.patch | |
parent | f705a8a47e542a5819380f024c92e43eebf08f5e (diff) | |
parent | 51e07805e0cf8f53bc9609854d1afd5e51494151 (diff) | |
download | meta-qt5-d4b9962a4ca37bc42b6ffdcac923e4ecd0bb8169.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.12
In addition to commits below, fixed PV value to "5.12.1" in qt5-git.inc
* upstream/master:
51e0780 qtbase: replace the fix for gcc-4.8 with the one from upstream
c67abd6 qtbase: Fix build with gcc 4.8
f69fc40 qtwebengine: Fix build with musl/gcc9
7cc177d qtwebkit-examples: drop recipe
1b755b2 qttranslations, packagegroup-qt5-toolchain-target: drop qmlviewer
5443af9 qtwayland: revert one patch from 5.12 branch to make it compatible with 5.12.0 qtbase
bd9d830 qt3d-runtime: drop patch resolved upstream
44f4fc3 qt5everywheredemo: add dependency on qtxmlpatterns
77edae5 qtconnectivity: drop patch resolved upstream
d45b966 qtwebengine: update chromium musl patchset
8c7797b qtbase: add env variable for host bin suffix
f1a5e8a qtwebengine: include sources in the debug package, add x11 PACKAGECONFIG
2be2731 libqofono: add dependency on qtxmlpatterns
725fc1f qtxmlpatterns: add qtdeclarative PACKAGECONFIG
b7b0a78 qtdeclarative: remove qtxmlpatterns PACKAGECONFIG
57aab31 qtwayland: update PACKAGECONFIG options
299a326 qtbase: update xinput PACKAGECONFIG
6531fa7 qtbase: use v5.12.0 as base
c8d5ef5 qt5: upgrade to latest revision in 5.12
c6be23d qt5: upgrade to latest revision in 5.12
201fcf2 qt5-plugin-generic-vboxtouch: fix segfault
5b35f89 qtwebengine: refresh .patch files, meta-qt5/qt* repos and their tags in recipes
808d65c qt5: refresh .patch files, meta-qt5/qt* repos and their tags in recipes
a55a993 libconnman-qt5: Don't harcode libdir to fix multilib build
c483f15 qtbase: Fix build with gcc9
b725e6d qtbase: Consider clang when computing QMAKE_CXX.COMPILER_MACROS
7016481 qt5-creator: Enable clang plugin support when clang is used as toolchain
ba03a76 qtwebkit: Fix build with clang
7223816 maliit: Disable tests
4c3d66f qtbase: Drop QMAKE_WAYLAND_SCANNER from clang mkspecs file
f2d7b94 qtconnectivity: Ignore -Waddress-of-temporary when using clang
b8fade9 qtbase: Fix build with clang/musl
0cdf727 qt5: upgrade to 5.11.3
9fc65c0 qtwebengine: Configure Ninja to honor PARALLEL_MAKE
010a29e qmllive: add new recipe
f227502 python-pyqt5: MAKEFLAGS pass -j 1 via MAKEFLAGS during do_install
fe453ec packagegroup-qt5-toolchain-target: Skip qtwebkit if opengl not found
18f82a8 python-pyqt5: Disable parallel install
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qt5-git.inc
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcanvas3d_git.bb
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdatavis3d_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtgamepad_git.bb
recipes-qt/qt5/qtgraphicaleffects_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtknx_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmqtt_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtnetworkauth_git.bb
recipes-qt/qt5/qtopcua_git.bb
recipes-qt/qt5/qtpurchasing_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtremoteobjects_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtvirtualkeyboard_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebchannel_git.bb
recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch
recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch
recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch
recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch
recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-include-fcntl.h-for-loff_t.patch
recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-linux-glibc-make-the-distinction.patch
recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch
recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch
recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebglplugin_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtwebview_git.bb
recipes-qt/qt5/qtx11extras_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: Ic896ea4ae0f64daaedc43a6736fc0243599f05f6
Diffstat (limited to 'recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-VirtualboxTouchScreenHandler-initialize-m_mouse.patch')
-rw-r--r-- | recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-VirtualboxTouchScreenHandler-initialize-m_mouse.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-VirtualboxTouchScreenHandler-initialize-m_mouse.patch b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-VirtualboxTouchScreenHandler-initialize-m_mouse.patch new file mode 100644 index 00000000..283601af --- /dev/null +++ b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-VirtualboxTouchScreenHandler-initialize-m_mouse.patch | |||
@@ -0,0 +1,74 @@ | |||
1 | From 29665ab1a97bb0ca4b74275f5526e9afe09ccc64 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Tue, 18 Dec 2018 17:38:21 +0000 | ||
4 | Subject: [PATCH] VirtualboxTouchScreenHandler initialize m_mouse | ||
5 | |||
6 | * make sure m_mouse is initialized for cases where shutdown is called before: | ||
7 | m_mouse = EvdevMouseHandler::create(evdev_device, specification); | ||
8 | e.g. with following ioctl fails with vboxguest driver from vanila 4.19 kernel: | ||
9 | ioctl(m_fd, _IOWR('V', 10, features), &features); | ||
10 | |||
11 | * fixes following crash: | ||
12 | (gdb) set args -plugin evdevkeyboard -plugin vboxtouch | ||
13 | (gdb) r | ||
14 | Starting program: /usr/sbin/luna-next -plugin evdevkeyboard -plugin vboxtouch | ||
15 | warning: File "/usr/lib/libstdc++.so.6.0.25-gdb.py" auto-loading has been declined by your `auto-load safe-path' set to "$debugdir:$datadir/auto-load". | ||
16 | To enable execution of this file add | ||
17 | add-auto-load-safe-path /usr/lib/libstdc++.so.6.0.25-gdb.py | ||
18 | line to your configuration file "/media/internal/.gdbinit". | ||
19 | To completely disable this security protection add | ||
20 | set auto-load safe-path / | ||
21 | line to your configuration file "/media/internal/.gdbinit". | ||
22 | For more information about this security protection see the | ||
23 | "Auto-loading safe path" section in the GDB manual. E.g., run from the shell: | ||
24 | info "(gdb)Auto-loading safe path" | ||
25 | [Thread debugging using libthread_db enabled] | ||
26 | Using host libthread_db library "/lib/libthread_db.so.1". | ||
27 | ** Message: 17:05:20.472: App to allow in Low memory: org.webosports.app.phone | ||
28 | ** Message: 17:05:20.479: App to allow in Low memory: org.webosports.app.contacts | ||
29 | ** Message: 17:05:20.479: App to allow in Low memory: org.webosports.app.messaging | ||
30 | |||
31 | ** (process:993): WARNING **: 17:05:20.485: Settings::load(): 6 application paths defined: | ||
32 | ** Message: 17:05:20.487: Running on authenticamd with hardware type emulator | ||
33 | pci id for fd 7: 80ee:beef, driver (null) | ||
34 | BFD: error: /usr/lib/llvm6.0/.debug/libLLVM-6.0.so(.debug_info) is too large (0x2a793ad1 bytes) | ||
35 | warning: Can't read data for section '.debug_info' in file '/usr/lib/llvm6.0/.debug/libLLVM-6.0.so' | ||
36 | [New Thread 0xafe21b40 (LWP 997)] | ||
37 | [New Thread 0xaf620b40 (LWP 998)] | ||
38 | BFD: error: /usr/lib/.debug/libQt5Quick.so.5.11.3(.debug_info) is too large (0x5a05c4d bytes) | ||
39 | warning: Can't read data for section '.debug_info' in file '/usr/lib/.debug/libQt5Quick.so.5.11.3' | ||
40 | DEBUG: 17:05:39.393: vboxtouch: Using vbox device /dev/vboxguest | ||
41 | WARNING: 17:05:39.402: vboxtouch setpointershape: ioctl error: Invalid argument | ||
42 | WARNING: 17:05:39.403: vboxtouch init: ioctl error: Invalid argument | ||
43 | DEBUG: 17:05:39.403: shutting down vboxtouch | ||
44 | |||
45 | Thread 1 "luna-next" received signal SIGSEGV, Segmentation fault. | ||
46 | 0xaee18e1c in VirtualboxTouchScreenHandler::shutdown (this=0x80da570) at /usr/src/debug/qt5-plugin-generic-vboxtouch/1.1.4+gitrAUTOINC+3f2bdb5a1d-r0/git/vboxtouch/vboxtouch.cpp:179 | ||
47 | 179 delete m_mouse; | ||
48 | (gdb) bt | ||
49 | #0 0xaee18e1c in VirtualboxTouchScreenHandler::shutdown (this=0x80da570) at /usr/src/debug/qt5-plugin-generic-vboxtouch/1.1.4+gitrAUTOINC+3f2bdb5a1d-r0/git/vboxtouch/vboxtouch.cpp:179 | ||
50 | #1 0xaee19319 in VirtualboxTouchScreenHandler::VirtualboxTouchScreenHandler (this=0x80da570, specification=..., parent=0x0) at /usr/src/debug/qt5-plugin-generic-vboxtouch/1.1.4+gitrAUTOINC+3f2bdb5a1d-r0/git/vboxtouch/vboxtouch.cpp:122 | ||
51 | #2 0xaee1877b in VirtualboxTouchScreenPlugin::create (this=0x80d7a30, key=..., specification=...) at /usr/src/debug/qt5-plugin-generic-vboxtouch/1.1.4+gitrAUTOINC+3f2bdb5a1d-r0/git/vboxtouch/main.cpp:51 | ||
52 | #3 0xb7afc6c1 in qLoadPlugin<QObject, QGenericPlugin, QString const&> (key=..., loader=<optimized out>) at ../../include/QtCore/../../../git/src/corelib/kernel/qobject.h:499 | ||
53 | |||
54 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
55 | --- | ||
56 | vboxtouch/vboxtouch.cpp | 2 +- | ||
57 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
58 | |||
59 | diff --git a/vboxtouch/vboxtouch.cpp b/vboxtouch/vboxtouch.cpp | ||
60 | index 6e0aac8..345fdcb 100644 | ||
61 | --- a/vboxtouch/vboxtouch.cpp | ||
62 | +++ b/vboxtouch/vboxtouch.cpp | ||
63 | @@ -82,7 +82,7 @@ const static vbox_mouse_status_request blank_mouse_status_request = { | ||
64 | #define VBOXMOUSE_IS_ABSOLUTE 2 | ||
65 | |||
66 | VirtualboxTouchScreenHandler::VirtualboxTouchScreenHandler(const QString &specification, QObject *parent) | ||
67 | - : QObject(parent), m_fd(-1), m_notifier(0), m_device(0), m_failures(0), | ||
68 | + : QObject(parent), m_fd(-1), m_notifier(0), m_device(0), m_failures(0), m_mouse(0), | ||
69 | m_button(false), m_x(0), m_y(0) | ||
70 | { | ||
71 | setObjectName("Virtualbox Touch Handler"); | ||
72 | -- | ||
73 | 2.17.1 | ||
74 | |||