summaryrefslogtreecommitdiffstats
path: root/package/qt5/qt5base
diff options
context:
space:
mode:
Diffstat (limited to 'package/qt5/qt5base')
-rw-r--r--package/qt5/qt5base/0001-Simplify-use-of-__has_include-in-qlogging.cpp.patch54
-rw-r--r--package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch48
-rw-r--r--package/qt5/qt5base/Config.in5
-rw-r--r--package/qt5/qt5base/qt5base.hash8
-rw-r--r--package/qt5/qt5base/qt5base.mk4
5 files changed, 110 insertions, 9 deletions
diff --git a/package/qt5/qt5base/0001-Simplify-use-of-__has_include-in-qlogging.cpp.patch b/package/qt5/qt5base/0001-Simplify-use-of-__has_include-in-qlogging.cpp.patch
new file mode 100644
index 0000000000..d54ef79404
--- /dev/null
+++ b/package/qt5/qt5base/0001-Simplify-use-of-__has_include-in-qlogging.cpp.patch
@@ -0,0 +1,54 @@
+0002-logging-Fix-build-with-uClibc.patch depends on this upstream patch.
+
+Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
+
+From d1d3c36e876464a9bae42565f086ded268ab5118 Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira@intel.com>
+Date: Wed, 17 Dec 2014 20:24:04 -0800
+Subject: [PATCH] Simplify use of __has_include in qlogging.cpp
+
+Easier to just #define it to 0
+
+Change-Id: Ife99fdca6564077762fa67c6d7a5becaf48655d8
+Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
+---
+ src/corelib/global/qlogging.cpp | 21 +++++++++------------
+ 1 file changed, 9 insertions(+), 12 deletions(-)
+
+diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
+index 0271573..50d35a6 100644
+--- a/src/corelib/global/qlogging.cpp
++++ b/src/corelib/global/qlogging.cpp
+@@ -72,20 +72,17 @@
+ # include "private/qcore_unix_p.h"
+ #endif
+
+-#if !defined QT_NO_REGULAREXPRESSION && !defined(QT_BOOTSTRAPPED)
+-#ifdef __has_include
+-#if __has_include(<cxxabi.h>) && __has_include(<execinfo.h>)
+-#define QLOGGING_HAVE_BACKTRACE
+-#endif
+-#elif defined(__GLIBCXX__) && defined(__GLIBC__) // (because older version of gcc don't have __has_include)
+-#define QLOGGING_HAVE_BACKTRACE
++#ifndef __has_include
++# define __has_include(x) 0
+ #endif
+
+-#ifdef QLOGGING_HAVE_BACKTRACE
+-#include <qregularexpression.h>
+-#include <cxxabi.h>
+-#include <execinfo.h>
+-#endif
++#if !defined QT_NO_REGULAREXPRESSION && !defined(QT_BOOTSTRAPPED)
++# if (defined(__GLIBC__) && defined(__GLIBCXX__)) || (__has_include(<cxxabi.h>) && __has_include(<execinfo.h>))
++# define QLOGGING_HAVE_BACKTRACE
++# include <qregularexpression.h>
++# include <cxxabi.h>
++# include <execinfo.h>
++# endif
+ #endif
+
+ #include <stdio.h>
+--
+1.9.1
+
diff --git a/package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch b/package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch
new file mode 100644
index 0000000000..7d884adc74
--- /dev/null
+++ b/package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch
@@ -0,0 +1,48 @@
+From 9f03adc74fa06e9559e8bb85f1cfd942397328b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
+Date: Wed, 24 Dec 2014 17:29:11 +0200
+Subject: [PATCH] logging: Check if uClibc has backtrace support
+
+execinfo.h is optional in uClibc. We need to check
+__UCLIBC_HAS_BACKTRACE__ if uClibc is used.
+
+Change-Id: Ie28be85b0b70472df1fc4a208581bb66ad34229e
+Sent-Upstream: https://codereview.qt-project.org/#/c/102628/
+Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
+---
+ src/corelib/global/qlogging.cpp | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
+index 50d35a6..fa897d6 100644
+--- a/src/corelib/global/qlogging.cpp
++++ b/src/corelib/global/qlogging.cpp
+@@ -77,14 +77,21 @@
+ #endif
+
+ #if !defined QT_NO_REGULAREXPRESSION && !defined(QT_BOOTSTRAPPED)
+-# if (defined(__GLIBC__) && defined(__GLIBCXX__)) || (__has_include(<cxxabi.h>) && __has_include(<execinfo.h>))
++# ifdef __UCLIBC__
++# if __UCLIBC_HAS_BACKTRACE__
++# define QLOGGING_HAVE_BACKTRACE
++# endif
++# elif (defined(__GLIBC__) && defined(__GLIBCXX__)) || (__has_include(<cxxabi.h>) && __has_include(<execinfo.h>))
+ # define QLOGGING_HAVE_BACKTRACE
+-# include <qregularexpression.h>
+-# include <cxxabi.h>
+-# include <execinfo.h>
+ # endif
+ #endif
+
++#ifdef QLOGGING_HAVE_BACKTRACE
++# include <qregularexpression.h>
++# include <cxxabi.h>
++# include <execinfo.h>
++#endif
++
+ #include <stdio.h>
+
+ QT_BEGIN_NAMESPACE
+--
+1.9.1
+
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 30f9a49dfa..59fc4e0460 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -24,10 +24,9 @@ config BR2_PACKAGE_QT5BASE_LICENSE_APPROVED
By doing this you will not be asked while the library is compiled.
Please read and understand the license terms before approving this.
- LGPL v2.1: http://qt-project.org/doc/qt-5.0/qtdoc/lgpl.html
- GPL v3.0: http://qt-project.org/doc/qt-5.0/qtdoc/gpl.html
+ LGPL: http://doc.qt.io/qt-5/lgpl.html
- See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
+ See also http://doc.qt.io/qt-5/licensing.html
config BR2_PACKAGE_QT5BASE_EXAMPLES
bool "Compile and install examples (with code)"
diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash
index 9aad1a91a4..b91b0a92a4 100644
--- a/package/qt5/qt5base/qt5base.hash
+++ b/package/qt5/qt5base/qt5base.hash
@@ -1,4 +1,4 @@
-# Hashes from: http://download.qt-project.org/official_releases/qt/5.3/5.3.2/submodules/qtbase-opensource-src-5.3.2.tar.xz.mirrorlist
-sha256 9a16095ac46dae99d6ddab8bc07065fbe1c36501ed194a3191d07347d7826cb8 qtbase-opensource-src-5.3.2.tar.xz
-sha1 faf4f33aa7e8dabcdcdf5f10824263beebbccd96 qtbase-opensource-src-5.3.2.tar.xz
-md5 563e2b10274171f1184b3fd7260b4991 qtbase-opensource-src-5.3.2.tar.xz
+# Hashes from: http://download.qt-project.org/official_releases/qt/5.4/5.4.0/submodules/qtbase-opensource-src-5.4.0.tar.xz.mirrorlist
+sha256 daea240ba5e77bc2d78ec21a2cb664eed83b3d4ad409b6277a6f7d4c0c8e91d1 qtbase-opensource-src-5.4.0.tar.xz
+sha1 2e3d32f32e36a92782ca66c260940824746900bd qtbase-opensource-src-5.4.0.tar.xz
+md5 eaaa72a5cb25713ca8d17f3a8d149765 qtbase-opensource-src-5.4.0.tar.xz
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index a36359d4fc..90b5a6f5b9 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -50,8 +50,8 @@ endif
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
-QT5BASE_LICENSE = LGPLv2.1 or GPLv3.0
-QT5BASE_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
+QT5BASE_LICENSE = LGPLv2.1 with exception or LGPLv3
+QT5BASE_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
else
QT5BASE_LICENSE = Commercial license
QT5BASE_REDISTRIBUTE = NO
OpenPOWER on IntegriCloud