diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-20 11:38:06 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-21 21:36:18 +0200 |
| commit | 754aaadc7f0a1c98a4895899617afbaef0f1cdfa (patch) | |
| tree | a417716816e08846114d65394239c309bc129dbd /recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch | |
| parent | f636eb7444a3454f2a25275a07e414d7409734d7 (diff) | |
qt5: upgrade to latest revision in 5.6 branch
* qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
and
qtwebkit/0004-Fix-linking-with-libpthread.patch
were resolved upstream
* all patches were refreshed with:
git format-patch --no-numbered --no-signature -NUMBER
to remove numbering from Subject (it's good enough in filename) and to
remove git version from signature (so it doesn't look differently when
generated on different hosts with different git version).
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch index 62e8a0d9..2fab8884 100644 --- a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch +++ b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch @@ -1,8 +1,7 @@ -From 0cac609e192c303e26d139b4a7d5b35897a020a8 Mon Sep 17 00:00:00 2001 +From 6a0d4af2083dbacddb98245c0b4b83c6e014a1ae Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 8 Jun 2015 13:59:25 -0700 -Subject: [PATCH 07/10] linux-oe-g++: Invert conditional for defining - QT_SOCKLEN_T +Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T This helps to make sure that QT_SOCKLEN_T is defined to be 'int' only when its glibc < 2 and not also for the libraries which may define @@ -31,6 +30,3 @@ index dd12003..8623651 100644 #endif #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) --- -2.7.1 - |