summaryrefslogtreecommitdiffstats
path: root/package/qt5/qt5base/5.11.1
diff options
context:
space:
mode:
Diffstat (limited to 'package/qt5/qt5base/5.11.1')
-rw-r--r--package/qt5/qt5base/5.11.1/0001-qtbase-Fix-build-error-when-using-EGL.patch37
-rw-r--r--package/qt5/qt5base/5.11.1/0002-double-conversion-enable-for-aarch64_be.patch26
-rw-r--r--package/qt5/qt5base/5.11.1/0003-double-conversion-enable-for-or1k.patch27
-rw-r--r--package/qt5/qt5base/5.11.1/0004-double-conversion-enable-for-microblaze.patch27
4 files changed, 0 insertions, 117 deletions
diff --git a/package/qt5/qt5base/5.11.1/0001-qtbase-Fix-build-error-when-using-EGL.patch b/package/qt5/qt5base/5.11.1/0001-qtbase-Fix-build-error-when-using-EGL.patch
deleted file mode 100644
index 6876498022..0000000000
--- a/package/qt5/qt5base/5.11.1/0001-qtbase-Fix-build-error-when-using-EGL.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c11299086b7718332e2b4fbc37ce6f6ff427c5ba Mon Sep 17 00:00:00 2001
-From: Yuqing Zhu <carol.zhu@nxp.com>
-Date: Mon, 27 Mar 2017 15:33:35 +0800
-Subject: [PATCH] qtbase: Fix build error when using EGL
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-A build error was occurring due to missing EGL configuration.
-
-Fixed by adding the necessary ties to the EGL pkg-config.
-
-Task-number: QTBUG-61712
-Change-Id: I87190ea39392b4604c563cf9d89edb85068d85fc
-Upstream-Status: Pending
-Signed-off-by: Gaƫl PORTAY <gael.portay@savoirfairelinux.com>
----
- mkspecs/features/egl.prf | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf
-index 9fa0c9e219..85d5852ba6 100644
---- a/mkspecs/features/egl.prf
-+++ b/mkspecs/features/egl.prf
-@@ -1,3 +1,9 @@
-+# egl headers need a definition
-+PKG_CONFIG = $$pkgConfigExecutable()
-+PKGCONFIG_CFLAGS = $$system($$PKG_CONFIG --cflags egl)
-+PKGCONFIG_CFLAGS = $$find(PKGCONFIG_CFLAGS, ^-D.*)
-+QMAKE_CFLAGS_EGL = $$PKGCONFIG_CFLAGS
-+
- INCLUDEPATH += $$QMAKE_INCDIR_EGL
- LIBS_PRIVATE += $$QMAKE_LIBS_EGL
- QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL
---
-2.16.1
-
diff --git a/package/qt5/qt5base/5.11.1/0002-double-conversion-enable-for-aarch64_be.patch b/package/qt5/qt5base/5.11.1/0002-double-conversion-enable-for-aarch64_be.patch
deleted file mode 100644
index 838f4dd7ad..0000000000
--- a/package/qt5/qt5base/5.11.1/0002-double-conversion-enable-for-aarch64_be.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e81ba4e0de16ff741417ae7ed7dfe7b5a83d66e2 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Mon, 13 Aug 2018 20:15:05 +0200
-Subject: [PATCH] double-conversion: enable for aarch64_be
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- .../double-conversion/include/double-conversion/utils.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h
-index 20bfd36c84..77baa2861a 100644
---- a/src/3rdparty/double-conversion/include/double-conversion/utils.h
-+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h
-@@ -65,7 +65,7 @@
- defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
- defined(__SH4__) || defined(__alpha__) || \
- defined(_MIPS_ARCH_MIPS32R2) || \
-- defined(__AARCH64EL__)
-+ defined(__AARCH64EL__) || defined(__AARCH64EB__)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
- #if defined(_WIN32)
---
-2.18.0
-
diff --git a/package/qt5/qt5base/5.11.1/0003-double-conversion-enable-for-or1k.patch b/package/qt5/qt5base/5.11.1/0003-double-conversion-enable-for-or1k.patch
deleted file mode 100644
index 53c5a31832..0000000000
--- a/package/qt5/qt5base/5.11.1/0003-double-conversion-enable-for-or1k.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f9920819e6600a68829fb4600f11b70ebc2a33e7 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Sat, 18 Aug 2018 23:44:20 +0200
-Subject: [PATCH] double-conversion: enable for or1k
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- .../double-conversion/include/double-conversion/utils.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h
-index 77baa2861a..b0a7d5d4f4 100644
---- a/src/3rdparty/double-conversion/include/double-conversion/utils.h
-+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h
-@@ -65,7 +65,8 @@
- defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
- defined(__SH4__) || defined(__alpha__) || \
- defined(_MIPS_ARCH_MIPS32R2) || \
-- defined(__AARCH64EL__) || defined(__AARCH64EB__)
-+ defined(__AARCH64EL__) || defined(__AARCH64EB__) || \
-+ defined(__or1k__)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
- #if defined(_WIN32)
---
-2.18.0
-
diff --git a/package/qt5/qt5base/5.11.1/0004-double-conversion-enable-for-microblaze.patch b/package/qt5/qt5base/5.11.1/0004-double-conversion-enable-for-microblaze.patch
deleted file mode 100644
index 2d7164b67c..0000000000
--- a/package/qt5/qt5base/5.11.1/0004-double-conversion-enable-for-microblaze.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 372d33fbe549ea73318c187505716ac99fbf3054 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Tue, 21 Aug 2018 21:11:40 +0200
-Subject: [PATCH] double-conversion: enable for microblaze
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- .../double-conversion/include/double-conversion/utils.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h
-index b0a7d5d4f4..485f680180 100644
---- a/src/3rdparty/double-conversion/include/double-conversion/utils.h
-+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h
-@@ -66,7 +66,8 @@
- defined(__SH4__) || defined(__alpha__) || \
- defined(_MIPS_ARCH_MIPS32R2) || \
- defined(__AARCH64EL__) || defined(__AARCH64EB__) || \
-- defined(__or1k__)
-+ defined(__or1k__) || \
-+ defined(__microblaze__)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
- #if defined(_WIN32)
---
-2.18.0
-
OpenPOWER on IntegriCloud