basesystem-jjsandbox/ToshikazuOhiwa/master-jj

recipes

2 files changed, 23 insertions, 40 deletions

diff --git a/external/meta-qt5/recipes-qt/qt5/qtconnectivity/0001-Add-missing-header-for-errno.patch b/external/meta-qt5/recipes-qt/qt5/qtconnectivity/0001-Add-missing-header-for-errno.patch
new file mode 100644
index 00000000..72afac30
--- /dev/null
+++ b/external/meta-qt5/recipes-qt/qt5/qtconnectivity/0001-Add-missing-header-for-errno.patch
@@ -0,0 +1,23 @@
+From 000075567007d0ef76ef3c782fc4060f8ff8e647 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 29 Jan 2019 20:29:19 -0800
+Subject: [PATCH] Add missing header for errno
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/bluetooth/bluez/bluetoothmanagement.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/bluetooth/bluez/bluetoothmanagement.cpp b/src/bluetooth/bluez/bluetoothmanagement.cpp
+index 31d3dc02..75d762e5 100644
+--- a/src/bluetooth/bluez/bluetoothmanagement.cpp
++++ b/src/bluetooth/bluez/bluetoothmanagement.cpp
+@@ -45,6 +45,7 @@
+ #include "bluez_data_p.h"
+ #include "../qbluetoothsocketbase_p.h"
+ 
++#include <errno.h>
+ #include <unistd.h>
+ #include <sys/prctl.h>
+ #include <sys/syscall.h>
diff --git a/external/meta-qt5/recipes-qt/qt5/qtconnectivity/0001-Ignore-clang-warning-about-address-of-temp-in-config.patch b/external/meta-qt5/recipes-qt/qt5/qtconnectivity/0001-Ignore-clang-warning-about-address-of-temp-in-config.patch
deleted file mode 100644
index a0c2ee72..00000000
--- a/external/meta-qt5/recipes-qt/qt5/qtconnectivity/0001-Ignore-clang-warning-about-address-of-temp-in-config.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 162749d36f4bdea62d456516ae2bbcdc84b9ba87 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 6 Dec 2018 13:21:23 -0800
-Subject: [PATCH] Ignore clang warning about address of temp in
- config.tests/bluez
-
-There is a similar error with gcc which is suppressed by using
--fpermissive, clang however is more concerned and has specific flag for
-it, this flag is not implemented in gcc so we can not use it via general
-cmdline options to compiler, so resort to using diagnostic pragma
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- config.tests/bluez/main.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/config.tests/bluez/main.cpp b/config.tests/bluez/main.cpp
-index 3fe5ee09..8d1c968a 100644
---- a/config.tests/bluez/main.cpp
-+++ b/config.tests/bluez/main.cpp
-@@ -30,11 +30,14 @@
- 
- int main()
- {
-+#pragma clang diagnostic push
-+#pragma clang diagnostic ignored "-Waddress-of-temporary"
- #ifdef BDADDR_NONE
-     bacmp(BDADDR_ANY, BDADDR_NONE);
- #else
-     bacmp(BDADDR_ANY, BDADDR_LOCAL);
- #endif
-+#pragma clang diagnostic pop
- 
-     return 0;
- }
--- 
-2.19.2
-