qtbase: refresh the patches
PATCH 1/4 qtbase: refresh the patches
* upload the patches to b5.8* branches on:
https://github.com/meta-qt5/qtbase
* refresh the patches
* notice that some patches were in section which is meant to be common for target, native and nativesdk qtbase but were added only in target recipe, I've updated them to be included in all 3, hopefully they can be used in all 3 (I don't use nativesdk at all)
---
recipes-qt/qt5/nativesdk-qtbase_git.bb | 7 +++++--
recipes-qt/qt5/qtbase-native_git.bb | 7 +++++--
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 16 ++++++++--------
...aryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | 6 ++----
.../qt5/qtbase/0003-Add-external-hostbindir-option.patch | 8 ++++----
...t_module-Fix-pkgconfig-and-libtool-replacements.patch | 8 ++++----
...gure-bump-path-length-from-256-to-512-character.patch | 6 +++---
...e-all-unknown-features-instead-of-erroring-out.patch} | 9 +++------
...d-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch} | 6 +++---
....patch => 0008-Delete-qlonglong-and-qulonglong.patch} | 7 ++-----
...tring-Disable-Wformat-security-with-clang-as-w.patch} | 8 ++------
...=> 0010-Replace-pthread_yield-with-sched_yield.patch} | 5 +----
recipes-qt/qt5/qtbase/0011-Always-build-uic.patch | 6 +++---
...0011-configure-paths-for-target-qmake-properly.patch} | 12 ++++++------
recipes-qt/qt5/qtbase_git.bb | 12 ++++++------
15 files changed, 57 insertions(+), 66 deletions(-)
rename recipes-qt/qt5/qtbase/{0009-Disable-all-unknown-features-instead-of-erroring-out.patch => 0006-Disable-all-unknown-features-instead-of-erroring-out.patch} (85%)
rename recipes-qt/qt5/qtbase/{0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch => 0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch} (94%)
rename recipes-qt/qt5/qtbase/{0001-Delete-qlonglong-and-qulonglong.patch => 0008-Delete-qlonglong-and-qulonglong.patch} (87%)
rename recipes-qt/qt5/qtbase/{0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch => 0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch} (84%)
rename recipes-qt/qt5/qtbase/{0011-Replace-pthread_yield-with-sched_yield.patch => 0010-Replace-pthread_yield-with-sched_yield.patch} (96%)
rename recipes-qt/qt5/qtbase/{0008-configure-paths-for-target-qmake-properly.patch => 0011-configure-paths-for-target-qmake-properly.patch} (87%)recipes-qt/qt5/nativesdk-qtbase_git.bb +5 -2
@@ -31,8 +31,11 @@ SRC_URI += "\ file://0003-Add-external-hostbindir-option.patch \ file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ file://0005-configure-bump-path-length-from-256-to-512-character.patch \ - file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ - file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ + file://0006-Disable-all-unknown-features-instead-of-erroring-out.patch \ + file://0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ + file://0008-Delete-qlonglong-and-qulonglong.patch \ + file://0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \ + file://0010-Replace-pthread_yield-with-sched_yield.patch \ " # common for qtbase-native and nativesdk-qtbase
recipes-qt/qt5/qtbase-native_git.bb +5 -2
@@ -26,8 +26,11 @@ SRC_URI += "\ file://0003-Add-external-hostbindir-option.patch \ file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ file://0005-configure-bump-path-length-from-256-to-512-character.patch \ - file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ - file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ + file://0006-Disable-all-unknown-features-instead-of-erroring-out.patch \ + file://0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ + file://0008-Delete-qlonglong-and-qulonglong.patch \ + file://0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \ + file://0010-Replace-pthread_yield-with-sched_yield.patch \ " # common for qtbase-native and nativesdk-qtbase
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +8 -8
@@ -1,4 +1,4 @@ -From 2784921c40d0b523c75e613e48b7fd1e90ba3ef1 Mon Sep 17 00:00:00 2001 +From 805b338154ed0262a7b8bf5c582ff5b193a55492 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform
@@ -30,10 +30,10 @@ Signed-off-by: Martin Jansa <[email protected]> create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 789ba4c..59cce01 100755 +index bc18e614d2..579a96d787 100755 --- a/configure +++ b/configure -@@ -1624,7 +1624,7 @@ fi +@@ -1614,7 +1614,7 @@ fi # is where the resulting variable is written to setBootstrapVariable() {
@@ -43,10 +43,10 @@ index 789ba4c..59cce01 100755 # build qmake diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index f275e3a..5aa15f5 100644 +index 4ca7c6ba07..5b5ac13f1d 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf -@@ -37,14 +37,14 @@ defineTest(qtCompileTest) { +@@ -44,14 +44,14 @@ defineTest(qtCompileTest) { } # Clean up after previous run
@@ -64,7 +64,7 @@ index f275e3a..5aa15f5 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 708815d..097ac49 100644 +index 999cd18154..2ac91ba519 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -67,7 +67,7 @@ defineTest(qtHaveModule) {
@@ -78,7 +78,7 @@ index 708815d..097ac49 100644 cmd = perl -w $$system_path($${cmd}.pl) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000..c1837e6 +index 0000000000..c1837e6d55 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf @@ -0,0 +1,43 @@
@@ -127,7 +127,7 @@ index 0000000..c1837e6 +load(qt_config) diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h new file mode 100644 -index 0000000..5d22fb4 +index 0000000000..5d22fb4101 --- /dev/null +++ b/mkspecs/linux-oe-g++/qplatformdefs.h @@ -0,0 +1 @@
recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +2 -4
@@ -1,4 +1,4 @@ -From e5f8607cfa1d2bcc798686cdf7c87ea0c6577d30 Mon Sep 17 00:00:00 2001 +From 18e2f4368f22bf5ac8b2a36c30a7ad39ed97bf49 Mon Sep 17 00:00:00 2001 From: Holger Freyther <[email protected]> Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
@@ -19,7 +19,7 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 27fe10a..29ffcda 100644 +index 27fe10a79e..29ffcda203 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -164,7 +164,10 @@ void QLibrarySettings::load()
@@ -34,5 +34,3 @@ index 27fe10a..29ffcda 100644 if (QFile::exists(qtconfig)) return new QSettings(qtconfig, QSettings::IniFormat); #else --- -2.9.3
recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +4 -4
@@ -1,4 +1,4 @@ -From 502b95b840a5f79e5a68e9bd5b10dbdc92485f1f Mon Sep 17 00:00:00 2001 +From 67977e16e5d0aecd931d8e4355c12cc907df592f Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH] Add -external-hostbindir option
@@ -19,7 +19,7 @@ Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index a5ed8b2..0e11a1e 100644 +index 545b9a3d1e..c991a9ba41 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
@@ -50,7 +50,7 @@ index a5ed8b2..0e11a1e 100644 _qt5_Core_check_file_exists(${imported_location}) diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d94715..301af8f 100644 +index 1d947159e2..301af8f1b2 100644 --- a/src/dbus/Qt5DBusConfigExtras.cmake.in +++ b/src/dbus/Qt5DBusConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
@@ -72,7 +72,7 @@ index 1d94715..301af8f 100644 _qt5_DBus_check_file_exists(${imported_location}) diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index 99d87e2..5621dc0 100644 +index 99d87e2e46..5621dc0fae 100644 --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in +++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic)
recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +4 -4
@@ -1,4 +1,4 @@ -From bf1498618415e7b1e57b54881b1e56d74f2cdf6b Mon Sep 17 00:00:00 2001 +From fe9cfbde28c651d00b8f5fda7dc85a97af0c50a1 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 27 Apr 2013 23:15:37 +0200 Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements
@@ -68,10 +68,10 @@ Signed-off-by: Jonathan Liu <[email protected]> 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 0c5f080..a6e4f09 100644 +index 98f794c485..bd8b7b52e4 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) { +@@ -315,6 +315,19 @@ contains(TEMPLATE, .*app) { QTPLUGIN = $$manualplugs $$autoplugs }
@@ -92,7 +92,7 @@ index 0c5f080..a6e4f09 100644 qtConfig(static) { QT_PLUGIN_VERIFY += QTPLUGIN diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index e754a17..4c1530e 100644 +index d30983f62b..6da07e032c 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -37,7 +37,7 @@ contains(TEMPLATE, .*lib) {
recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch +3 -3
@@ -1,4 +1,4 @@ -From 60f490b57faf979a912074506a75c74767a27d3b Mon Sep 17 00:00:00 2001 +From be9179d2cbb9009794940092d30dac7800708964 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <[email protected]> Date: Tue, 25 Aug 2015 10:05:15 -0400 Subject: [PATCH] configure: bump path length from 256 to 512 characters
@@ -14,10 +14,10 @@ Signed-off-by: Denys Dmytriyenko <[email protected]> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure -index 1fcbb3a..f49a674 100755 +index 579a96d787..5af98cd77e 100755 --- a/configure +++ b/configure -@@ -3847,10 +3847,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ +@@ -1551,10 +1551,10 @@ cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; /* Installation Info */
recipes-qt/qt5/qtbase/0006-Disable-all-unknown-features-instead-of-erroring-out.patch renamed from recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch +3 -6
@@ -1,4 +1,4 @@ -From 9eb81e3bdeda4f90e5f2942400aef38b51a356bd Mon Sep 17 00:00:00 2001 +From 8acdd69a4083080f4dd40001eee30209ec5de0b2 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <[email protected]> Date: Mon, 24 Oct 2016 09:45:18 +0300 Subject: [PATCH] Disable all unknown features instead of erroring out
@@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf -index e8fa0c6..0ca5670 100644 +index eaaa161270..fa3addae11 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf -@@ -1009,7 +1009,8 @@ defineReplace(qtConfEvaluateSingleExpression) { +@@ -1035,7 +1035,8 @@ defineReplace(qtConfEvaluateSingleExpression) { error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") return($$result) }
@@ -23,6 +23,3 @@ index e8fa0c6..0ca5670 100644 } !qtConfCheckFeature($$feature): \ error("Expression '$$1' is accessing non-emitted feature $${feature}.") --- -1.9.1 -
recipes-qt/qt5/qtbase/0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch renamed from recipes-qt/qt5/qtbase/0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch +3 -3
@@ -1,4 +1,4 @@ -From b397a71531e31383ee86135e21072d033480f5bc Mon Sep 17 00:00:00 2001 +From 5316b420dc408d3a47daa3ba854a7883c911f6b9 Mon Sep 17 00:00:00 2001 From: Pascal Bach <[email protected]> Date: Wed, 11 May 2016 15:20:41 +0200 Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
@@ -30,7 +30,7 @@ Signed-off-by: Pascal Bach <[email protected]> 2 files changed, 10 insertions(+) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index d2358ca..feb73c0 100644 +index d2358cae4b..feb73c02a5 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
@@ -46,7 +46,7 @@ index d2358ca..feb73c0 100644 !!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") diff --git a/src/corelib/Qt5Config.cmake.in b/src/corelib/Qt5Config.cmake.in -index a872d0e..233d663 100644 +index 75b53485b7..ed31888c93 100644 --- a/src/corelib/Qt5Config.cmake.in +++ b/src/corelib/Qt5Config.cmake.in @@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 2.8.9)
recipes-qt/qt5/qtbase/0008-Delete-qlonglong-and-qulonglong.patch renamed from recipes-qt/qt5/qtbase/0001-Delete-qlonglong-and-qulonglong.patch +2 -5
@@ -1,4 +1,4 @@ -From c67a4af2e5db4c1e2213961e6392b59affd1959f Mon Sep 17 00:00:00 2001 +From 2755a80114433e75f08fbb0df0fee9f7526172aa Mon Sep 17 00:00:00 2001 From: Huang Qiyu <[email protected]> Date: Wed, 7 Jun 2017 21:00:49 +0900 Subject: [PATCH] Delete qlonglong and qulonglong
@@ -9,7 +9,7 @@ Signed-off-by: Huang Qiyu <[email protected]> 1 file changed, 2 deletions(-) diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro -index 09458bd..59a120e 100644 +index 09458bd9c3..59a120eb26 100644 --- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro +++ b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro @@ -5,10 +5,8 @@ SUBDIRS=\
@@ -23,6 +23,3 @@ index 09458bd..59a120e 100644 schar \ short \ uchar \ --- -2.7.4 -
recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch renamed from recipes-qt/qt5/qtbase/0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch +2 -6
@@ -1,8 +1,7 @@ -From 8284ebfe59c0011db71df7fb143b8e6a99f6952e Mon Sep 17 00:00:00 2001 +From 7bab0171601bc769403be62d145164137f1b7b66 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Tue, 25 Jul 2017 19:40:52 -0700 -Subject: [PATCH 10/10] tst_qstring: Disable Wformat-security with clang as - well +Subject: [PATCH] tst_qstring: Disable Wformat-security with clang as well Currently, its only disabled for gcc, but we need to disable it with clang as well in order to compile it successfully with
@@ -27,6 +26,3 @@ index a0a872710c..20a9a9f9db 100644 void tst_QString::isNull() { --- -2.13.3 -
recipes-qt/qt5/qtbase/0010-Replace-pthread_yield-with-sched_yield.patch renamed from recipes-qt/qt5/qtbase/0011-Replace-pthread_yield-with-sched_yield.patch +1 -4
@@ -1,4 +1,4 @@ -From d1d4b520e29b58e427fc7bd336d34b82d0d2b1f3 Mon Sep 17 00:00:00 2001 +From bbe822066913c0908b6366009517c19e828e1458 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 27 Jul 2017 08:02:51 -0700 Subject: [PATCH] Replace pthread_yield with sched_yield
@@ -58,6 +58,3 @@ index fe1057bdde..e23e97b259 100644 #endif if (!sock->waitForConnected()) { networkTimeout = true; --- -2.13.3 -
recipes-qt/qt5/qtbase/0011-Always-build-uic.patch +3 -3
@@ -1,4 +1,4 @@ -From 1b94b0f2579edcf870bc953f820af8fb2ec4376f Mon Sep 17 00:00:00 2001 +From 7c42f9b42c34d75f6c8e21e55af9b0e58f5743cc Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src.pro b/src/src.pro -index 3d18540..d128b3a 100644 +index 90d7e2b76c..4ca6b0bd01 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -195,7 +195,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent +@@ -188,7 +188,7 @@ qtConfig(gui) { } } }
recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch renamed from recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch +6 -6
@@ -1,4 +1,4 @@ -From cc926956758bf8170c4e49c66e1066524b43f65f Mon Sep 17 00:00:00 2001 +From b8e94df3d49be69659e8dfb0809c614f73c21706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Fri, 13 Nov 2015 12:36:11 +0100 Subject: [PATCH] configure paths for target qmake properly
@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/configure b/configure -index 8b33c5b..1df248f 100755 +index 5af98cd77e..34dedafe91 100755 --- a/configure +++ b/configure -@@ -1545,8 +1545,13 @@ if [ -z "$QT_REL_HOST_DATA" ]; then +@@ -1500,8 +1500,13 @@ if [ -z "$QT_REL_HOST_DATA" ]; then fi fi
@@ -38,7 +38,7 @@ index 8b33c5b..1df248f 100755 QT_CONFIGURE_STR_OFF=0 -@@ -1579,7 +1584,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS +@@ -1534,7 +1539,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS QT_CONFIGURE_STR_OFFSETS= QT_CONFIGURE_STRS=
@@ -51,7 +51,7 @@ index 8b33c5b..1df248f 100755 addConfStr "$QT_REL_HOST_BINS" addConfStr "$QT_REL_HOST_LIBS" addConfStr "$QT_REL_HOST_DATA" -@@ -1591,6 +1600,12 @@ addConfStr "$shortspec" +@@ -1546,6 +1555,12 @@ addConfStr "$shortspec" #------------------------------------------------------------------------------- [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
@@ -64,7 +64,7 @@ index 8b33c5b..1df248f 100755 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF /* Installation date */ static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; -@@ -1599,7 +1614,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 +@@ -1554,7 +1569,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; #ifdef QT_BUILD_QMAKE static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
recipes-qt/qt5/qtbase_git.bb +6 -6
@@ -21,11 +21,11 @@ SRC_URI += "\ file://0003-Add-external-hostbindir-option.patch \ file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ file://0005-configure-bump-path-length-from-256-to-512-character.patch \ - file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ - file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ - file://0001-Delete-qlonglong-and-qulonglong.patch \ - file://0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \ - file://0011-Replace-pthread_yield-with-sched_yield.patch \ + file://0006-Disable-all-unknown-features-instead-of-erroring-out.patch \ + file://0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ + file://0008-Delete-qlonglong-and-qulonglong.patch \ + file://0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \ + file://0010-Replace-pthread_yield-with-sched_yield.patch \ file://run-ptest \ "
@@ -33,7 +33,7 @@ inherit ptest # only for target qtbase SRC_URI += "\ - file://0008-configure-paths-for-target-qmake-properly.patch \ + file://0011-configure-paths-for-target-qmake-properly.patch \ " # LGPL-3.0 is used only in src/plugins/platforms/android/extract.cpp
Signature · 1 line
2.14.0
PATCH 2/4 qtwebengine: refresh patches
* upload the patches to b5.8 branch on:
https://github.com/meta-qt5/qtwebengine
and 53-based on:
https://github.com/meta-qt5/qtwebengine-chromium
* refresh the patches
---
...se.gypi-include-atomicops_internals_x86_g.patch | 9 ++---
...rf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | 6 ++--
...ange-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch | 7 ++--
...rf-Make-sure-we-only-use-the-file-name-to.patch | 6 ++--
.../0003-chromium-v8-fix-build-with-gcc7.patch | 7 ++--
...s.prf-allow-build-for-linux-oe-g-platform.patch | 6 ++--
...quickwebengineview_p_p.h-add-include-QCol.patch | 6 ++--
.../0004-chromium-WebKit-fix-build-with-gcc7.patch | 7 ++--
.../0004-include-fcntl.h-for-loff_t.patch | 25 --------------
...-dependency-to-QCoreApplication-translate.patch | 4 +--
...l-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch} | 18 +++++-----
...l-Avoid-mallinfo-APIs-on-non-glibc-linux.patch} | 27 +++++++--------
...-chromium-musl-include-fcntl.h-for-loff_t.patch | 22 +++++++++++++
...l-use-off64_t-instead-of-the-internal-__.patch} | 17 ++++------
...um-musl-linux-glibc-make-the-distinction.patch} | 17 ++++------
...l-allocator-Do-not-include-glibc_weak_sy.patch} | 20 +++++-------
...l-Use-correct-member-name-__si_fields-fr.patch} | 18 +++++-----
...romium-musl-Match-syscalls-to-match-musl.patch} | 21 +++++-------
...l-Define-res_ninit-and-res_nclose-for-no.patch} | 38 ++++++++++------------
...3-include-asm-generic-ioctl.h-for-TCGETS2.patch | 25 --------------
...romium-musl-Do-not-define-__sbrk-on-musl.patch} | 17 ++++------
...m-musl-Adjust-default-pthread-stack-size.patch} | 30 ++++++++---------
...sl-include-asm-generic-ioctl.h-for-TCGETS.patch | 22 +++++++++++++
...omium-musl-link-with-libexecinfo-on-musl.patch} | 17 ++++------
...l-tcmalloc-Use-off64_t-insread-of-__off6.patch} | 17 ++++------
recipes-qt/qt5/qtwebengine_git.bb | 28 ++++++++--------
26 files changed, 193 insertions(+), 244 deletions(-)
delete mode 100644 recipes-qt/qt5/qtwebengine/0004-include-fcntl.h-for-loff_t.patch
rename recipes-qt/qt5/qtwebengine/{0001-sandbox-Define-TEMP_FAILURE_RETRY-if-not-defined.patch => 0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch} (61%)
rename recipes-qt/qt5/qtwebengine/{0003-Avoid-mallinfo-APIs-on-non-glibc-linux.patch => 0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch} (60%)
create mode 100644 recipes-qt/qt5/qtwebengine/0007-chromium-musl-include-fcntl.h-for-loff_t.patch
rename recipes-qt/qt5/qtwebengine/{0005-use-off64_t-instead-of-the-internal-__off64_t.patch => 0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch} (80%)
rename recipes-qt/qt5/qtwebengine/{0006-linux-glibc-make-the-distinction.patch => 0009-chromium-musl-linux-glibc-make-the-distinction.patch} (62%)
rename recipes-qt/qt5/qtwebengine/{0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch => 0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch} (53%)
rename recipes-qt/qt5/qtwebengine/{0008-Use-correct-member-name-__si_fields-from-LinuxSigInf.patch => 0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch} (59%)
rename recipes-qt/qt5/qtwebengine/{0009-Match-syscalls-to-match-musl.patch => 0012-chromium-musl-Match-syscalls-to-match-musl.patch} (56%)
rename recipes-qt/qt5/qtwebengine/{0010-Define-res_ninit-and-res_nclose-for-non-glibc-platfo.patch => 0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch} (59%)
delete mode 100644 recipes-qt/qt5/qtwebengine/0013-include-asm-generic-ioctl.h-for-TCGETS2.patch
rename recipes-qt/qt5/qtwebengine/{0011-Do-not-define-__sbrk-on-musl.patch => 0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch} (53%)
rename recipes-qt/qt5/qtwebengine/{0012-Adjust-default-pthread-stack-size.patch => 0015-chromium-musl-Adjust-default-pthread-stack-size.patch} (57%)
create mode 100644 recipes-qt/qt5/qtwebengine/0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
rename recipes-qt/qt5/qtwebengine/{0014-link-with-libexecinfo-on-musl.patch => 0017-chromium-musl-link-with-libexecinfo-on-musl.patch} (53%)
rename recipes-qt/qt5/qtwebengine/{0018-tcmalloc-Use-off64_t-insread-of-__off64_t.patch => 0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch} (56%)recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch +3 -6
@@ -1,8 +1,8 @@ -From 83eee1ff5f9259595b8630e464fa869c6fde8f3c Mon Sep 17 00:00:00 2001 +From d70a7ccba09ba96e0068ad253b3aac7a47125f8e Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Fri, 3 Oct 2014 03:52:11 +0200 -Subject: [PATCH 1/4] <chromium> base.gypi: include - atomicops_internals_x86_gcc.cc when building for x64 arch +Subject: [PATCH] chromium base.gypi: include atomicops_internals_x86_gcc.cc + when building for x64 arch Signed-off-by: Martin Jansa <[email protected]> ---
@@ -22,6 +22,3 @@ index a4da596070..13173d621e 100644 'sources/': [ ['include', 'atomicops_internals_x86_gcc.cc'], ], --- -2.13.2 -
recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +3 -3
@@ -1,4 +1,4 @@ -From 793db05d66b7a92ebe069dc76093487489dd8b69 Mon Sep 17 00:00:00 2001 +From 2f3a16a0efaf02521425da2db7d88710da3074b4 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 30 Jun 2014 20:08:17 +0200 Subject: [PATCH] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
@@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 20fb278..7aa0b4a 100644 +index 236ee8ac..0333bdd1 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -168,9 +168,9 @@ defineReplace(mocOutput) { +@@ -319,9 +319,9 @@ defineReplace(mocOutput) { out = $$1 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one for(ext, $$list($${QMAKE_EXT_CPP})): \
recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch +2 -5
@@ -1,7 +1,7 @@ -From 4aa614106c03793709e5dbd69f45df8a5e5c9fe4 Mon Sep 17 00:00:00 2001 +From 79a62dbe498946f487edcb0228c350d9fe7e4d09 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno <[email protected]> Date: Thu, 24 Dec 2015 12:46:58 -0200 -Subject: [PATCH 2/4] chromium: Change false to FALSE and 1 to TRUE, FIX +Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX qtwebengine compile Signed-off-by: Cleiton Bueno <[email protected]>
@@ -61,6 +61,3 @@ index 6d926378be..738d3fdedf 100644 // we want to always get RGB data out switch (cinfo.jpeg_color_space) { --- -2.13.2 -
recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +3 -3
@@ -1,4 +1,4 @@ -From aa5bb11072bc0e441dc6533f53ed5359c5000088 Mon Sep 17 00:00:00 2001 +From bf7f70ae0bf7345c2546f4f4bc371a9e8eeb0bd3 Mon Sep 17 00:00:00 2001 From: Simon Busch <[email protected]> Date: Tue, 18 Nov 2014 10:38:18 +0100 Subject: [PATCH] functions.prf: Make sure we only use the file name to
@@ -11,10 +11,10 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 7aa0b4a..9b3a639 100644 +index 0333bdd1..687d34f8 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -165,7 +165,8 @@ defineReplace(findIncludedMocFiles) { +@@ -316,7 +316,8 @@ defineReplace(findIncludedMocFiles) { } defineReplace(mocOutput) {
recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch +2 -5
@@ -1,7 +1,7 @@ -From 1a163c0cab05761f269fcb5adad5d40d71200d52 Mon Sep 17 00:00:00 2001 +From 944746d5d04ea8eaf268a97440c98136beae1e47 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Tue, 11 Jul 2017 10:15:41 +0200 -Subject: [PATCH 3/4] chromium: v8 fix build with gcc7 +Subject: [PATCH] chromium: v8 fix build with gcc7 Use the fix from nodejs: https://github.com/nodejs/node/commit/2a2a5565c298639b823250b571101f51210c50e8
@@ -129,6 +129,3 @@ index 7d774beb5b..eda1478766 100644 // Returns a new HashTable object. MUST_USE_RESULT static Handle<Derived> New( --- -2.13.2 -
recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +3 -3
@@ -1,4 +1,4 @@ -From 6918d25c54ec4bc17a9b612c0d24b0f01be3aca1 Mon Sep 17 00:00:00 2001 +From 5ff09196304a38304893e0703a8a7d2df2ec889a Mon Sep 17 00:00:00 2001 From: Frieder Schrempf <[email protected]> Date: Mon, 1 Dec 2014 14:34:40 +0000 Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform
@@ -12,10 +12,10 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 6 insertions(+) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 9b3a639..dc5ed1c 100644 +index 687d34f8..5c0c40fd 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -5,6 +5,12 @@ defineTest(isPlatformSupported) { +@@ -21,6 +21,12 @@ defineTest(isPlatformSupported) { return(false) } gcc:!clang:!isGCCVersionSupported(): return(false)
recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +3 -3
@@ -1,4 +1,4 @@ -From 6ed60f35761ab268004727be544e9ccf70594211 Mon Sep 17 00:00:00 2001 +From 0e1143af443c80cd49663b55128ab4dd8e570ee1 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno <[email protected]> Date: Fri, 25 Dec 2015 18:16:05 -0200 Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
@@ -9,10 +9,10 @@ Signed-off-by: Cleiton Bueno <[email protected]> 1 file changed, 2 insertions(+) diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h -index f13bfd0..0e12244 100644 +index d692140e..58528114 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h -@@ -60,6 +60,8 @@ +@@ -59,6 +59,8 @@ #include <QString> #include <QtCore/qcompilerdetection.h> #include <QtGui/qaccessibleobject.h>
recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch +2 -5
@@ -1,7 +1,7 @@ -From 2be0856e09f47e7f2c35e77d4e000d769c6beaf9 Mon Sep 17 00:00:00 2001 +From f62b851edbcc3ac3da448d7570908ad78ebe77dc Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Tue, 11 Jul 2017 10:18:13 +0200 -Subject: [PATCH 4/4] chromium: WebKit fix build with gcc7 +Subject: [PATCH] chromium: WebKit fix build with gcc7 Based on qtwebengine-opensource-src-5.8.0-wtf-gcc7.patch from http://git.net/ml/scm-fedora-commits/2017-03/msg15697.html
@@ -39,6 +39,3 @@ index e85c72fd65..6f94cd6734 100644 template<typename T, typename U, typename V, typename W> inline void LinkedHashSet<T, U, V, W>::swap(LinkedHashSet& other) { --- -2.13.2 -
recipes-qt/qt5/qtwebengine/0004-include-fcntl.h-for-loff_t.patch deleted +0 -25
@@ -1,25 +0,0 @@ -From a0b40dcdfb3331d2b8351bdfb27f1ba3e8a2c33c Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 7 Jul 2017 14:37:49 -0700 -Subject: [PATCH 04/12] include fcntl.h for loff_t - -Signed-off-by: Khem Raj <[email protected]> ---- - third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -index bdbc4b7e3..b53dd46c5 100644 ---- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -+++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -@@ -151,6 +151,7 @@ extern "C" { - #include <stddef.h> - #include <stdint.h> - #include <string.h> -+#include <fcntl.h> - #include <sys/ptrace.h> - #include <sys/resource.h> - #include <sys/time.h> --- -2.13.2 -
recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch +2 -2
@@ -1,4 +1,4 @@ -From 4105c12d6f91171934f60b4dbb74b1ca7a9a3eb2 Mon Sep 17 00:00:00 2001 +From d8fd8c8388c54a0322e60e8be49236df3862ec56 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno <[email protected]> Date: Thu, 24 Dec 2015 15:59:51 -0200 Subject: [PATCH] Include dependency to QCoreApplication::translate()
@@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno <[email protected]> 1 file changed, 2 insertions(+) diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h -index b13a9da..8a54cce 100644 +index b21d40b8..758d5335 100644 --- a/src/core/media_capture_devices_dispatcher.h +++ b/src/core/media_capture_devices_dispatcher.h @@ -46,6 +46,8 @@
recipes-qt/qt5/qtwebengine/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch renamed from recipes-qt/qt5/qtwebengine/0001-sandbox-Define-TEMP_FAILURE_RETRY-if-not-defined.patch +8 -10
@@ -1,19 +1,20 @@ -From 89d6283c91f2229cc51f473eed344de97d09e946 Mon Sep 17 00:00:00 2001 +From fac50c58630264d67e447c2dcdcf54b4f806d35e Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 7 Jul 2017 14:01:12 -0700 -Subject: [PATCH 01/12] sandbox: Define TEMP_FAILURE_RETRY if not defined +Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not + defined Musl does not define this Macro Signed-off-by: Khem Raj <[email protected]> --- - sandbox/linux/suid/sandbox.c | 9 +++++++++ + chromium/sandbox/linux/suid/sandbox.c | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/sandbox/linux/suid/sandbox.c b/sandbox/linux/suid/sandbox.c -index b655d1c79..3de34e36f 100644 ---- a/sandbox/linux/suid/sandbox.c -+++ b/sandbox/linux/suid/sandbox.c +diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c +index b655d1c79c..3de34e36f2 100644 +--- a/chromium/sandbox/linux/suid/sandbox.c ++++ b/chromium/sandbox/linux/suid/sandbox.c @@ -44,6 +44,15 @@ static bool DropRoot(); #define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x)
@@ -30,6 +31,3 @@ index b655d1c79..3de34e36f 100644 static void FatalError(const char* msg, ...) __attribute__((noreturn, format(printf, 1, 2))); --- -2.13.2 -
recipes-qt/qt5/qtwebengine/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch renamed from recipes-qt/qt5/qtwebengine/0003-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +12 -15
@@ -1,18 +1,18 @@ -From 8defe37306b0d1548592afc12baa45f4aec5375c Mon Sep 17 00:00:00 2001 +From e7e4def6d1422b84a9d6a6f7b285515d96210e87 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 7 Jul 2017 14:09:06 -0700 -Subject: [PATCH 03/12] Avoid mallinfo() APIs on non-glibc/linux +Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux Signed-off-by: Khem Raj <[email protected]> --- - base/trace_event/malloc_dump_provider.cc | 3 ++- - content/child/content_child_helpers.cc | 2 +- + chromium/base/trace_event/malloc_dump_provider.cc | 3 ++- + chromium/content/child/content_child_helpers.cc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -diff --git a/base/trace_event/malloc_dump_provider.cc b/base/trace_event/malloc_dump_provider.cc -index 3b1a933bc..a554d0373 100644 ---- a/base/trace_event/malloc_dump_provider.cc -+++ b/base/trace_event/malloc_dump_provider.cc +diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc +index 3b1a933bce..a554d03739 100644 +--- a/chromium/base/trace_event/malloc_dump_provider.cc ++++ b/chromium/base/trace_event/malloc_dump_provider.cc @@ -103,6 +103,7 @@ MallocDumpProvider::~MallocDumpProvider() {} // the current process. bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
@@ -30,10 +30,10 @@ index 3b1a933bc..a554d0373 100644 return true; } -diff --git a/content/child/content_child_helpers.cc b/content/child/content_child_helpers.cc -index 7ddeb4d16..b8c73b09c 100644 ---- a/content/child/content_child_helpers.cc -+++ b/content/child/content_child_helpers.cc +diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc +index 7ddeb4d16a..b8c73b09c5 100644 +--- a/chromium/content/child/content_child_helpers.cc ++++ b/chromium/content/child/content_child_helpers.cc @@ -25,7 +25,7 @@ namespace content { // though, this provides only a partial and misleading value. // Unfortunately some telemetry benchmark rely on it and these need to
@@ -43,6 +43,3 @@ index 7ddeb4d16..b8c73b09c 100644 size_t GetMemoryUsageKB() { struct mallinfo minfo = mallinfo(); uint64_t mem_usage = --- -2.13.2 -
recipes-qt/qt5/qtwebengine/0007-chromium-musl-include-fcntl.h-for-loff_t.patch new file +22 -0
@@ -0,0 +1,22 @@ +From eac1905c90085d3b9de3764078022643dd1b5ce9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 7 Jul 2017 14:37:49 -0700 +Subject: [PATCH] chromium: musl: include fcntl.h for loff_t + +Signed-off-by: Khem Raj <[email protected]> +--- + chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +index bdbc4b7e3b..b53dd46c57 100644 +--- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h ++++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +@@ -151,6 +151,7 @@ extern "C" { + #include <stddef.h> + #include <stdint.h> + #include <string.h> ++#include <fcntl.h> + #include <sys/ptrace.h> + #include <sys/resource.h> + #include <sys/time.h>
recipes-qt/qt5/qtwebengine/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch renamed from recipes-qt/qt5/qtwebengine/0005-use-off64_t-instead-of-the-internal-__off64_t.patch +7 -10
@@ -1,20 +1,20 @@ -From badea43b85346525b7c43c38c32d150b7eb85b13 Mon Sep 17 00:00:00 2001 +From 1690ac56cc013c3a18aa3c83e0efae47cc9da4f0 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 7 Jul 2017 14:38:37 -0700 -Subject: [PATCH 05/12] use off64_t instead of the internal __off64_t +Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t - only do the glibc 32-bit ABI check for mmap/mmap64 on gnu libc. musl does not support the 32-bit ABI. Signed-off-by: Khem Raj <[email protected]> --- - third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++----- + .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -diff --git a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -index 715c045f6..edc8cf2db 100644 ---- a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -+++ b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +index 715c045f66..edc8cf2db7 100644 +--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h ++++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h @@ -77,7 +77,7 @@ typedef off64_t __off64_t; static inline void* do_mmap64(void *start, size_t length,
@@ -60,6 +60,3 @@ index 715c045f6..edc8cf2db 100644 extern "C" void* mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset) __THROW { --- -2.13.2 -
recipes-qt/qt5/qtwebengine/0009-chromium-musl-linux-glibc-make-the-distinction.patch renamed from recipes-qt/qt5/qtwebengine/0006-linux-glibc-make-the-distinction.patch +7 -10
@@ -1,17 +1,17 @@ -From 4913850cd644e1fd44ecade5e9faa460de35a7d6 Mon Sep 17 00:00:00 2001 +From 71072da07e963ae1b05f9d956ef715de8d249c5d Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 7 Jul 2017 14:54:38 -0700 -Subject: [PATCH 06/12] linux != glibc, make the distinction +Subject: [PATCH] chromium: musl: linux != glibc, make the distinction Signed-off-by: Khem Raj <[email protected]> --- - base/allocator/allocator_check.cc | 2 +- + chromium/base/allocator/allocator_check.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/base/allocator/allocator_check.cc b/base/allocator/allocator_check.cc -index 5a0564d2f..8c2dc6491 100644 ---- a/base/allocator/allocator_check.cc -+++ b/base/allocator/allocator_check.cc +diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc +index 5a0564d2f3..8c2dc6491d 100644 +--- a/chromium/base/allocator/allocator_check.cc ++++ b/chromium/base/allocator/allocator_check.cc @@ -21,7 +21,7 @@ bool IsAllocatorInitialized() { #if defined(OS_WIN) && defined(ALLOCATOR_SHIM) // Set by allocator_shim_win.cc when the shimmed _set_new_mode() is called.
@@ -21,6 +21,3 @@ index 5a0564d2f..8c2dc6491 100644 !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. // TODO(primiano): replace with an include once base can depend on allocator. --- -2.13.2 -
recipes-qt/qt5/qtwebengine/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch renamed from recipes-qt/qt5/qtwebengine/0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch +9 -11
@@ -1,18 +1,19 @@ -From 482e77e9562b8a158b5b212e9f1c83c697fed2e2 Mon Sep 17 00:00:00 2001 +From 43384ce7ab1d3b14820cb9bc0698130be9291a8e Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 7 Jul 2017 15:09:02 -0700 -Subject: [PATCH 07/12] allocator: Do not include glibc_weak_symbols for musl +Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols + for musl Signed-off-by: Khem Raj <[email protected]> --- - base/allocator/allocator_shim.cc | 2 +- + chromium/base/allocator/allocator_shim.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/base/allocator/allocator_shim.cc b/base/allocator/allocator_shim.cc -index 57a398aaa..54c79063a 100644 ---- a/base/allocator/allocator_shim.cc -+++ b/base/allocator/allocator_shim.cc -@@ -263,7 +263,7 @@ void ShimFree(void* address) { +diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc +index af08ec039f..15070b9a13 100644 +--- a/chromium/base/allocator/allocator_shim.cc ++++ b/chromium/base/allocator/allocator_shim.cc +@@ -244,7 +244,7 @@ void ShimFree(void* address) { // In the case of tcmalloc we also want to plumb into the glibc hooks // to avoid that allocations made in glibc itself (e.g., strdup()) get // accidentally performed on the glibc heap instead of the tcmalloc one.
@@ -21,6 +22,3 @@ index 57a398aaa..54c79063a 100644 #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h" #endif --- -2.13.2 -
recipes-qt/qt5/qtwebengine/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch renamed from recipes-qt/qt5/qtwebengine/0008-Use-correct-member-name-__si_fields-from-LinuxSigInf.patch +8 -10
@@ -1,17 +1,18 @@ -From 3d12eb821e105111cbd88f5598746bd77c3a9ef0 Mon Sep 17 00:00:00 2001 +From 701bb2640d5e5b03e8e019600a076c93508e1541 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 7 Jul 2017 15:12:39 -0700 -Subject: [PATCH 08/12] Use correct member name __si_fields from LinuxSigInfo +Subject: [PATCH] chromium: musl: Use correct member name __si_fields from + LinuxSigInfo Signed-off-by: Khem Raj <[email protected]> --- - sandbox/linux/seccomp-bpf/trap.cc | 2 +- + chromium/sandbox/linux/seccomp-bpf/trap.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/sandbox/linux/seccomp-bpf/trap.cc b/sandbox/linux/seccomp-bpf/trap.cc -index 003708d2c..0fef3148f 100644 ---- a/sandbox/linux/seccomp-bpf/trap.cc -+++ b/sandbox/linux/seccomp-bpf/trap.cc +diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc +index 003708d2c8..0fef3148f9 100644 +--- a/chromium/sandbox/linux/seccomp-bpf/trap.cc ++++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc @@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { // most versions of glibc don't include this information in siginfo_t. So, // we need to explicitly copy it into a arch_sigsys structure.
@@ -21,6 +22,3 @@ index 003708d2c..0fef3148f 100644 #if defined(__mips__) // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the --- -2.13.2 -
recipes-qt/qt5/qtwebengine/0012-chromium-musl-Match-syscalls-to-match-musl.patch renamed from recipes-qt/qt5/qtwebengine/0009-Match-syscalls-to-match-musl.patch +9 -12
@@ -1,18 +1,18 @@ -From 5843df01580b0fb956ee4b7e1a60c0130c8c90f9 Mon Sep 17 00:00:00 2001 +From ad184ecc5e5e67d1f3862e9ed3f767dff9bbc414 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 7 Jul 2017 15:24:49 -0700 -Subject: [PATCH 09/12] Match syscalls to match musl +Subject: [PATCH] chromium: musl: Match syscalls to match musl Signed-off-by: Khem Raj <[email protected]> --- - third_party/lss/linux_syscall_support.h | 16 ++++++++++++++++ + chromium/third_party/lss/linux_syscall_support.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h -index 9dbd2391b..a715de177 100644 ---- a/third_party/lss/linux_syscall_support.h -+++ b/third_party/lss/linux_syscall_support.h -@@ -793,6 +793,14 @@ struct kernel_statfs { +diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h +index 8a42c1c868..8e878c70f2 100644 +--- a/chromium/third_party/lss/linux_syscall_support.h ++++ b/chromium/third_party/lss/linux_syscall_support.h +@@ -717,6 +717,14 @@ struct kernel_statfs { #endif
@@ -27,7 +27,7 @@ index 9dbd2391b..a715de177 100644 #if defined(__x86_64__) #ifndef ARCH_SET_GS #define ARCH_SET_GS 0x1001 -@@ -1210,6 +1218,14 @@ struct kernel_statfs { +@@ -1134,6 +1142,14 @@ struct kernel_statfs { #ifndef __NR_fallocate #define __NR_fallocate 285 #endif
@@ -42,6 +42,3 @@ index 9dbd2391b..a715de177 100644 /* End of x86-64 definitions */ #elif defined(__mips__) #if _MIPS_SIM == _MIPS_SIM_ABI32 --- -2.13.2 -
recipes-qt/qt5/qtwebengine/0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch renamed from recipes-qt/qt5/qtwebengine/0010-Define-res_ninit-and-res_nclose-for-non-glibc-platfo.patch +18 -20
@@ -1,20 +1,21 @@ -From df3fd62f7f0c51c11e7f715c2523418c31eb6b0f Mon Sep 17 00:00:00 2001 +From c892406f07b4e214397c55de62eccac3d558b134 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 7 Jul 2017 15:27:50 -0700 -Subject: [PATCH 10/12] Define res_ninit and res_nclose for non-glibc platforms +Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc + platforms Signed-off-by: Khem Raj <[email protected]> --- - net/dns/dns_config_service_posix.cc | 4 ++++ - net/dns/dns_reloader.cc | 4 ++++ - net/dns/resolv_compat.h | 29 +++++++++++++++++++++++++++++ + chromium/net/dns/dns_config_service_posix.cc | 4 ++++ + chromium/net/dns/dns_reloader.cc | 4 ++++ + chromium/net/dns/resolv_compat.h | 29 ++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) - create mode 100644 net/dns/resolv_compat.h + create mode 100644 chromium/net/dns/resolv_compat.h -diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc -index ba8a36913..e9b40d07f 100644 ---- a/net/dns/dns_config_service_posix.cc -+++ b/net/dns/dns_config_service_posix.cc +diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc +index ba8a369133..e9b40d07fc 100644 +--- a/chromium/net/dns/dns_config_service_posix.cc ++++ b/chromium/net/dns/dns_config_service_posix.cc @@ -25,6 +25,10 @@ #include "net/dns/notify_watcher_mac.h" #include "net/dns/serial_worker.h"
@@ -26,10 +27,10 @@ index ba8a36913..e9b40d07f 100644 #if defined(OS_MACOSX) && !defined(OS_IOS) #include "net/dns/dns_config_watcher_mac.h" #endif -diff --git a/net/dns/dns_reloader.cc b/net/dns/dns_reloader.cc -index 74534e6b1..2780a776e 100644 ---- a/net/dns/dns_reloader.cc -+++ b/net/dns/dns_reloader.cc +diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc +index 74534e6b1b..2780a776e4 100644 +--- a/chromium/net/dns/dns_reloader.cc ++++ b/chromium/net/dns/dns_reloader.cc @@ -9,6 +9,10 @@ #include <resolv.h>
@@ -41,11 +42,11 @@ index 74534e6b1..2780a776e 100644 #include "base/lazy_instance.h" #include "base/logging.h" #include "base/macros.h" -diff --git a/net/dns/resolv_compat.h b/net/dns/resolv_compat.h +diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h new file mode 100644 -index 000000000..4f0e852a1 +index 0000000000..4f0e852a19 --- /dev/null -+++ b/net/dns/resolv_compat.h ++++ b/chromium/net/dns/resolv_compat.h @@ -0,0 +1,29 @@ +#if !defined(__GLIBC__) +/***************************************************************************
@@ -76,6 +77,3 @@ index 000000000..4f0e852a1 + return 0; +} +#endif --- -2.13.2 -
recipes-qt/qt5/qtwebengine/0013-include-asm-generic-ioctl.h-for-TCGETS2.patch deleted +0 -25
@@ -1,25 +0,0 @@ -From d5014cf9a97cf97a6e9bb7f751c7cee3c24e17fd Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 7 Jul 2017 17:15:34 -0700 -Subject: [PATCH 1/2] include asm-generic/ioctl.h for TCGETS2 - -Signed-off-by: Khem Raj <[email protected]> ---- - device/serial/serial_io_handler_posix.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/device/serial/serial_io_handler_posix.cc b/device/serial/serial_io_handler_posix.cc -index 158c374a0..c08fb4a8e 100644 ---- a/device/serial/serial_io_handler_posix.cc -+++ b/device/serial/serial_io_handler_posix.cc -@@ -6,6 +6,7 @@ - - #include <sys/ioctl.h> - #include <termios.h> -+#include <asm-generic/ioctls.h> - - #include "base/posix/eintr_wrapper.h" - #include "build/build_config.h" --- -2.13.2 -
recipes-qt/qt5/qtwebengine/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch renamed from recipes-qt/qt5/qtwebengine/0011-Do-not-define-__sbrk-on-musl.patch +7 -10
@@ -1,20 +1,20 @@ -From 8a6553232988a5bfc8f0c48d4214a3982025fb2c Mon Sep 17 00:00:00 2001 +From be624e7cc1bc18e9e198bba16fcb224a7f9746fc Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 7 Jul 2017 15:39:57 -0700 -Subject: [PATCH 11/12] Do not define __sbrk on musl +Subject: [PATCH] chromium: musl: Do not define __sbrk on musl musl libc does not have sbrk. on musl libc will only work when called with 0 as argument, so we just let it out for now Signed-off-by: Khem Raj <[email protected]> --- - third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +- + chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -index edc8cf2db..a868b50d3 100644 ---- a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h -+++ b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +index edc8cf2db7..a868b50d30 100644 +--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h ++++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h @@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, }
@@ -24,6 +24,3 @@ index edc8cf2db..a868b50d3 100644 // libc's version: extern "C" void* __sbrk(ptrdiff_t increment); --- -2.13.2 -
recipes-qt/qt5/qtwebengine/0015-chromium-musl-Adjust-default-pthread-stack-size.patch renamed from recipes-qt/qt5/qtwebengine/0012-Adjust-default-pthread-stack-size.patch +13 -17
@@ -1,19 +1,18 @@ -From 65d516f64c1cca91868cb26aeb93802382704fd5 Mon Sep 17 00:00:00 2001 +From 295fd835b22203807962a3eea08a12b74ae54c2c Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 7 Jul 2017 16:41:23 -0700 -Subject: [PATCH 1/2] Adjust default pthread stack size +Subject: [PATCH] chromium: musl: Adjust default pthread stack size Signed-off-by: Khem Raj <[email protected]> --- - base/threading/platform_thread_linux.cc | 3 ++- - chrome/browser/chrome_browser_main_posix.cc | 9 +++++++++ - third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 4 ++-- - 3 files changed, 13 insertions(+), 3 deletions(-) + chromium/base/threading/platform_thread_linux.cc | 3 ++- + chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) -diff --git a/base/threading/platform_thread_linux.cc b/base/threading/platform_thread_linux.cc -index 95ed32418..666e85ba3 100644 ---- a/base/threading/platform_thread_linux.cc -+++ b/base/threading/platform_thread_linux.cc +diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc +index 95ed32418f..666e85ba33 100644 +--- a/chromium/base/threading/platform_thread_linux.cc ++++ b/chromium/base/threading/platform_thread_linux.cc @@ -96,7 +96,8 @@ void TerminateOnThread() {} size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
@@ -24,10 +23,10 @@ index 95ed32418..666e85ba3 100644 #else // ThreadSanitizer bloats the stack heavily. Evidence has been that the // default stack size isn't enough for some browser tests. -diff --git a/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp -index 3c0a0395b..2af6073e2 100644 ---- a/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp -+++ b/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp +diff --git a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp +index 3c0a0395b1..2af6073e21 100644 +--- a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp ++++ b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp @@ -73,7 +73,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() // FIXME: On Mac OSX and Linux, this method cannot estimate stack size // correctly for the main thread.
@@ -46,6 +45,3 @@ index 3c0a0395b..2af6073e2 100644 pthread_attr_t attr; int error; #if OS(FREEBSD) --- -2.13.2 -
recipes-qt/qt5/qtwebengine/0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch new file +22 -0
@@ -0,0 +1,22 @@ +From 91d9e3476c6432ae9ea8f8c0a9f6c435be844da0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 7 Jul 2017 17:15:34 -0700 +Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2 + +Signed-off-by: Khem Raj <[email protected]> +--- + chromium/device/serial/serial_io_handler_posix.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc +index 158c374a03..c08fb4a8ec 100644 +--- a/chromium/device/serial/serial_io_handler_posix.cc ++++ b/chromium/device/serial/serial_io_handler_posix.cc +@@ -6,6 +6,7 @@ + + #include <sys/ioctl.h> + #include <termios.h> ++#include <asm-generic/ioctls.h> + + #include "base/posix/eintr_wrapper.h" + #include "build/build_config.h"
recipes-qt/qt5/qtwebengine/0017-chromium-musl-link-with-libexecinfo-on-musl.patch renamed from recipes-qt/qt5/qtwebengine/0014-link-with-libexecinfo-on-musl.patch +7 -10
@@ -1,17 +1,17 @@ -From 4b5aab95e34e1cbebc7566c1267cddc2560601c8 Mon Sep 17 00:00:00 2001 +From a8163b060b699aa6678c45c970f4fbc806a6c198 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 7 Jul 2017 17:41:43 -0700 -Subject: [PATCH 2/2] link with libexecinfo on musl +Subject: [PATCH] chromium: musl: link with libexecinfo on musl Signed-off-by: Khem Raj <[email protected]> --- - base/base.gyp | 1 + + chromium/base/base.gyp | 1 + 1 file changed, 1 insertion(+) -diff --git a/base/base.gyp b/base/base.gyp -index 67e051ae4..7f5dfe214 100644 ---- a/base/base.gyp -+++ b/base/base.gyp +diff --git a/chromium/base/base.gyp b/chromium/base/base.gyp +index 3c3aded640..347b7e7856 100644 +--- a/chromium/base/base.gyp ++++ b/chromium/base/base.gyp @@ -126,6 +126,7 @@ '-lrt', # For 'native_library_linux.cc'
@@ -20,6 +20,3 @@ index 67e051ae4..7f5dfe214 100644 ], }, 'conditions': [ --- -2.13.2 -
recipes-qt/qt5/qtwebengine/0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch renamed from recipes-qt/qt5/qtwebengine/0018-tcmalloc-Use-off64_t-insread-of-__off64_t.patch +7 -10
@@ -1,17 +1,17 @@ -From 1a468dd5239ebdf013d9ffb3a2d181d0434b4c6c Mon Sep 17 00:00:00 2001 +From d05c22bdabe10c0db9b65252e442251efc81a379 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 8 Jul 2017 09:08:23 -0700 -Subject: [PATCH 2/2] tcmalloc: Use off64_t insread of __off64_t +Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t Signed-off-by: Khem Raj <[email protected]> --- - third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 2 +- + chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -index b53dd46c5..58da4d19d 100644 ---- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -+++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +index b53dd46c57..58da4d19d7 100644 +--- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h ++++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h @@ -1930,7 +1930,7 @@ typedef unsigned long int ulong; #if defined(__x86_64__) /* Need to make sure __off64_t isn't truncated to 32-bits under x32. */
@@ -21,6 +21,3 @@ index b53dd46c5..58da4d19d 100644 LSS_BODY(6, void*, mmap, LSS_SYSCALL_ARG(s), LSS_SYSCALL_ARG(l), LSS_SYSCALL_ARG(p), LSS_SYSCALL_ARG(f), LSS_SYSCALL_ARG(d), (uint64_t)(o)); --- -2.13.2 -
recipes-qt/qt5/qtwebengine_git.bb +14 -14
@@ -133,20 +133,20 @@ SRC_URI += " \ file://0004-chromium-WebKit-fix-build-with-gcc7.patch;patchdir=src/3rdparty \ " SRC_URI_append_libc-musl = "\ - file://0001-sandbox-Define-TEMP_FAILURE_RETRY-if-not-defined.patch;patchdir=src/3rdparty/chromium \ - file://0003-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty/chromium \ - file://0004-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty/chromium \ - file://0005-use-off64_t-instead-of-the-internal-__off64_t.patch;patchdir=src/3rdparty/chromium \ - file://0006-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty/chromium \ - file://0007-allocator-Do-not-include-glibc_weak_symbols-for-musl.patch;patchdir=src/3rdparty/chromium \ - file://0008-Use-correct-member-name-__si_fields-from-LinuxSigInf.patch;patchdir=src/3rdparty/chromium \ - file://0009-Match-syscalls-to-match-musl.patch;patchdir=src/3rdparty/chromium \ - file://0010-Define-res_ninit-and-res_nclose-for-non-glibc-platfo.patch;patchdir=src/3rdparty/chromium \ - file://0011-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty/chromium \ - file://0012-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty/chromium \ - file://0013-include-asm-generic-ioctl.h-for-TCGETS2.patch;patchdir=src/3rdparty/chromium \ - file://0014-link-with-libexecinfo-on-musl.patch;patchdir=src/3rdparty/chromium \ - file://0018-tcmalloc-Use-off64_t-insread-of-__off64_t.patch;patchdir=src/3rdparty/chromium \ + file://0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ + file://0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ + file://0007-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ + file://0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ + file://0009-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ + file://0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ + file://0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ + file://0012-chromium-musl-Match-syscalls-to-match-musl.patch;patchdir=src/3rdparty \ + file://0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ + file://0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ + file://0015-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ + file://0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ + file://0017-chromium-musl-link-with-libexecinfo-on-musl.patch;patchdir=src/3rdparty \ + file://0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ " SRCREV_qtwebengine = "d740d6a7dbfec387752c7bc8a8b06db0e757c9dc"
Signature · 1 line
2.14.0
PATCH 3/4 qt3d: refresh patches
In reply to Martin Jansa--- recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | 6 +++--- .../0002-Fix-BlenderDNA-for-clang-cross-compiler.patch | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-)
recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +3 -3
@@ -1,4 +1,4 @@ -From 64f46f5399627430f9ce1a888fb9212b33977231 Mon Sep 17 00:00:00 2001 +From 22ccc94b5501509b516fce17195a598d04dcc2f3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <[email protected]> Date: Wed, 10 Feb 2016 09:02:09 +0200 Subject: [PATCH] Allow a tools-only build
@@ -9,7 +9,7 @@ Subject: [PATCH] Allow a tools-only build 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/qt3d.pro b/qt3d.pro -index 2cc347a..81cdeef 100644 +index 2cc347a1c..81cdeefb0 100644 --- a/qt3d.pro +++ b/qt3d.pro @@ -1,4 +1,4 @@
@@ -28,7 +28,7 @@ index 2cc347a..81cdeef 100644 + SUBDIRS = sub_tools +} diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri -index 8ba2d9a..e973d93 100644 +index 8ba2d9a41..e973d93dd 100644 --- a/src/3rdparty/assimp/assimp_dependency.pri +++ b/src/3rdparty/assimp/assimp_dependency.pri @@ -1,5 +1,5 @@
recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch +6 -8
@@ -1,14 +1,15 @@ -From b28ad8e101d4e2ffae00e43d53b22ace35f8c308 Mon Sep 17 00:00:00 2001 +From bc5ef10fc6f71cb340ad339bc43f6ce48adb1f59 Mon Sep 17 00:00:00 2001 From: Kim Kulling <[email protected]> Date: Mon, 7 Nov 2016 17:19:49 +0100 Subject: [PATCH] Fix BlenderDNA for clang cross compiler. +Signed-off-by: Martin Jansa <[email protected]> --- src/3rdparty/assimp/code/BlenderDNA.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/3rdparty/assimp/code/BlenderDNA.cpp b/src/3rdparty/assimp/code/BlenderDNA.cpp -index b380fbe8d..437e44349 100644 +index b380fbe8d..3cc27dff1 100644 --- a/src/3rdparty/assimp/code/BlenderDNA.cpp +++ b/src/3rdparty/assimp/code/BlenderDNA.cpp @@ -56,10 +56,10 @@ using namespace Assimp::Formatter;
@@ -19,9 +20,9 @@ index b380fbe8d..437e44349 100644 - (stream).GetI1(), - (stream).GetI1(), - (stream).GetI1() -+ (const char)(stream).GetI1(), -+ (const char)(stream).GetI1(), -+ (const char)(stream).GetI1(), ++ (const char)(stream).GetI1(), ++ (const char)(stream).GetI1(), ++ (const char)(stream).GetI1(), + (const char)(stream).GetI1() }; return (tmp[0]==string[0] && tmp[1]==string[1] && tmp[2]==string[2] && tmp[3]==string[3]);
@@ -41,6 +42,3 @@ index b380fbe8d..437e44349 100644 }; current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1); --- -2.13.3 -
Signature · 1 line
2.14.0
PATCH 4/4 qtbase: use openssl10
In reply to Martin Jansa* fails to build with openssl-1.1
--- recipes-qt/qt5/qtbase_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-qt/qt5/qtbase_git.bb +1 -1
@@ -123,7 +123,7 @@ PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" PACKAGECONFIG[gbm] = "-gbm,-no-gbm,virtual/mesa" PACKAGECONFIG[icu] = "-icu,-no-icu,icu" PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" -PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" +PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl10,libssl" PACKAGECONFIG[widgets] = "-widgets,-no-widgets" PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput"
Signature · 1 line
2.14.0
Re: [meta-qt5][PATCH 4/4] qtbase: use openssl10
Quoted 12 lines · Martin Jansa
* fails to build with openssl-1.1
Signed-off-by Martin Jansa <[email protected]>--- recipes-qt/qt5/qtbase_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)recipes-qt/qt5/qtbase_git.bb +0
-0
recipes-qt/qt5/qtbase_git.bb PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" · line 126
Quoted 5 lines
recipes-qt/qt5/qtbase_git.bb +1
-1@@ -123,7 +123,7 @@ PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" PACKAGECONFIG[gbm] = "-gbm,-no-gbm,virtual/mesa" PACKAGECONFIG[icu] = "-icu,-no-icu,icu" PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" -PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" +PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl10,libssl"
seems good. Push whole series into master or master-next please
Quoted 11 lines
recipes-qt/qt5/qtbase_git.bb +0
-1PACKAGECONFIG[widgets] = "-widgets,-no-widgets" PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" --2.14.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-qt5][PATCH 4/4] qtbase: use openssl10
It's not good, this one was included by accident.
openssl10 is useless, see:
http://lists.openembedded.org/pipermail/openembedded-core/2017-August/140957.html
BTW: it's in jansa/master branch, will push to master-next after more testing (in parallel with 5.9 upgrade test).
Quoted 34 lines · Khem Raj
Quoted 12 lines · Martin Jansa
* fails to build with openssl-1.1
Signed-off-by Martin Jansa <[email protected]>--- recipes-qt/qt5/qtbase_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)recipes-qt/qt5/qtbase_git.bb +0
-0recipes-qt/qt5/qtbase_git.bb PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" · line 126
Quoted 5 lines
recipes-qt/qt5/qtbase_git.bb +1
-1@@ -123,7 +123,7 @@ PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" PACKAGECONFIG[gbm] = "-gbm,-no-gbm,virtual/mesa" PACKAGECONFIG[icu] = "-icu,-no-icu,icu" PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" -PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" +PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl10,libssl"seems good. Push whole series into master or master-next please
Quoted 11 lines
recipes-qt/qt5/qtbase_git.bb +0
-1PACKAGECONFIG[widgets] = "-widgets,-no-widgets" PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" --2.14.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel