summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch25
-rw-r--r--recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb4
-rw-r--r--recipes-connectivity/libqofono/libqofono_git.bb4
-rw-r--r--recipes-qt/examples/qt5everywheredemo_1.0.bb8
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb4
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb6
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtenginio_git.bb2
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch27
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb8
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qtsystems_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch25
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb5
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
-rw-r--r--recipes-qt/qtchooser/qtchooser_git.bb6
-rw-r--r--recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch29
-rw-r--r--recipes-qt/tufao/tufao_1.3.10.bb (renamed from recipes-qt/tufao/tufao_1.2.1.bb)4
43 files changed, 76 insertions, 139 deletions
diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch
index 75943db0..7a67c744 100644
--- a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch
+++ b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch
@@ -1,22 +1,23 @@
1From 46b6456bc8995b8d6249fb008a538222d30716cd Mon Sep 17 00:00:00 2001 1From 827b323ee9a6db04c1f5b644abea0ced2095096a Mon Sep 17 00:00:00 2001
2From: Christophe Chapuis <chris.chapuis@gmail.com> 2From: Christophe Chapuis <chris.chapuis@gmail.com>
3Date: Tue, 26 Jan 2016 18:56:42 +0100 3Date: Tue, 26 Jan 2016 18:56:42 +0100
4Subject: [PATCH] Don't use MeeGo as prefix in order to make this a common 4Subject: [PATCH] Don't use MeeGo as prefix in order to make this a common
5 component 5 component
6 6
7Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com> 7Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
8Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
8--- 9---
9 plugin/components.h | 2 +- 10 plugin/plugin.cpp | 2 +-
10 plugin/plugin.pro | 2 +- 11 plugin/plugin.pro | 2 +-
11 plugin/qmldir | 2 +- 12 plugin/qmldir | 2 +-
12 3 files changed, 3 insertions(+), 3 deletions(-) 13 3 files changed, 3 insertions(+), 3 deletions(-)
13 14
14diff --git a/plugin/components.h b/plugin/components.h 15diff --git a/plugin/plugin.cpp b/plugin/plugin.cpp
15index d4f2bcd..49b7ac2 100644 16index a383482..451c95f 100644
16--- a/plugin/components.h 17--- a/plugin/plugin.cpp
17+++ b/plugin/components.h 18+++ b/plugin/plugin.cpp
18@@ -17,7 +17,7 @@ 19@@ -24,7 +24,7 @@
19 class Components : public QQmlExtensionPlugin 20 class ConnmanPlugin: public QQmlExtensionPlugin
20 { 21 {
21 Q_OBJECT 22 Q_OBJECT
22- Q_PLUGIN_METADATA(IID "MeeGo.Connman") 23- Q_PLUGIN_METADATA(IID "MeeGo.Connman")
@@ -25,7 +26,7 @@ index d4f2bcd..49b7ac2 100644
25 public: 26 public:
26 void registerTypes(const char *uri); 27 void registerTypes(const char *uri);
27diff --git a/plugin/plugin.pro b/plugin/plugin.pro 28diff --git a/plugin/plugin.pro b/plugin/plugin.pro
28index 31d9076..da47ad9 100644 29index c4f54cf..3763f57 100644
29--- a/plugin/plugin.pro 30--- a/plugin/plugin.pro
30+++ b/plugin/plugin.pro 31+++ b/plugin/plugin.pro
31@@ -17,7 +17,7 @@ LIBS += -l$$qtLibraryTarget(connman-$$TARGET_SUFFIX) 32@@ -17,7 +17,7 @@ LIBS += -l$$qtLibraryTarget(connman-$$TARGET_SUFFIX)
@@ -46,5 +47,5 @@ index 5db82b7..de56688 100644
46+module Connman 47+module Connman
47 plugin ConnmanQtDeclarative 48 plugin ConnmanQtDeclarative
48-- 49--
491.8.1.2 502.11.0.windows.3
50 51
diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb
index 9605777d..ecd295c3 100644
--- a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb
+++ b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb
@@ -5,9 +5,9 @@ HOMEPAGE = "https://git.merproject.org/mer-core/libconnman-qt"
5LICENSE = "Apache-2.0" 5LICENSE = "Apache-2.0"
6LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88" 6LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
7DEPENDS += "qtbase qtdeclarative" 7DEPENDS += "qtbase qtdeclarative"
8PV = "1.1.10+git${SRCPV}" 8PV = "1.2.4+git${SRCPV}"
9 9
10SRCREV = "4d6def3053eaccaac04e4f9e03ee24dea8b9e8d8" 10SRCREV = "9d98e12ed60ae4fa9da62485cb8a82129ed1a464"
11SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https \ 11SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https \
12 file://0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch \ 12 file://0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch \
13" 13"
diff --git a/recipes-connectivity/libqofono/libqofono_git.bb b/recipes-connectivity/libqofono/libqofono_git.bb
index 88df1351..18e9b8fd 100644
--- a/recipes-connectivity/libqofono/libqofono_git.bb
+++ b/recipes-connectivity/libqofono/libqofono_git.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
5 5
6DEPENDS += "qtbase qtdeclarative" 6DEPENDS += "qtbase qtdeclarative"
7 7
8SRCREV = "54435de3bed0b454ef4ea3ea32c7234fcd9f24c6" 8SRCREV = "6916cd030b05f0bd137ea9b669fee48f20c19084"
9SRC_URI = "git://git.merproject.org/mer-core/libqofono.git" 9SRC_URI = "git://git.merproject.org/mer-core/libqofono.git"
10S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
11 11
12PV = "0.87+gitr${SRCPV}" 12PV = "0.92+gitr${SRCPV}"
13 13
14inherit qmake5 14inherit qmake5
15 15
diff --git a/recipes-qt/examples/qt5everywheredemo_1.0.bb b/recipes-qt/examples/qt5everywheredemo_1.0.bb
index 7735d902..ee947991 100644
--- a/recipes-qt/examples/qt5everywheredemo_1.0.bb
+++ b/recipes-qt/examples/qt5everywheredemo_1.0.bb
@@ -1,12 +1,12 @@
1SUMMARY = "Qt5 everywhere demo" 1SUMMARY = "Qt5 everywhere demo"
2DESCRIPTION = "Quick tour of Qt 5.0, primarily focusing on its graphical capabilities." 2DESCRIPTION = "Quick tour of Qt 5.0, primarily focusing on its graphical capabilities."
3LICENSE = "BSD"
3HOMEPAGE = "https://qt.gitorious.org/qt-labs" 4HOMEPAGE = "https://qt.gitorious.org/qt-labs"
4LICENSE = "LGPLv2.1" 5LIC_FILES_CHKSUM = "file://qml/QtDemo/main.qml;endline=39;md5=7d80863906a4bc8ffca77fd869e335a9"
5LIC_FILES_CHKSUM = "file://main.cpp;md5=1187cb795a0f96bce64e63dd1a67dc2b"
6 6
7DEPENDS = "qtdeclarative qtgraphicaleffects" 7DEPENDS = "qtdeclarative qtgraphicaleffects qtsvg qtmultimedia"
8 8
9SRCREV = "c17fe9e0ec0882ac4c4dc1168095f569acab5d09" 9SRCREV = "35d72a2eba7456a2efc5eb8b77afbc00f69ba0ac"
10SRC_URI = "${QT_LABS_GIT}/qt-labs-qt5-everywhere-demo" 10SRC_URI = "${QT_LABS_GIT}/qt-labs-qt5-everywhere-demo"
11 11
12S = "${WORKDIR}/git/QtDemo" 12S = "${WORKDIR}/git/QtDemo"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 0cb75a63..6f8ab717 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -37,6 +37,6 @@ do_configure_prepend() {
37 ${S}/src/quick3d/imports/input/importsinput.pro 37 ${S}/src/quick3d/imports/input/importsinput.pro
38} 38}
39 39
40SRCREV = "9d8c9ada161ad97634992c444196add0abb4f9d1" 40SRCREV = "143b721249af92fc27f48fb01914195516f7a087"
41 41
42BBCLASSEXTEND += "native nativesdk" 42BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb
index 2676bdd7..383145be 100644
--- a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb
+++ b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \
9 file://evdevmousehandler.cpp;beginline=1;endline=40;md5=9081062f6e7f74b6e62ad7ecee4a71be \ 9 file://evdevmousehandler.cpp;beginline=1;endline=40;md5=9081062f6e7f74b6e62ad7ecee4a71be \
10" 10"
11 11
12PV = "1.1.3+gitr${SRCPV}" 12PV = "1.1.4+gitr${SRCPV}"
13 13
14DEPENDS = "qtbase" 14DEPENDS = "qtbase"
15 15
@@ -17,7 +17,7 @@ DEPENDS = "qtbase"
17CXXFLAGS += "-Wno-narrowing" 17CXXFLAGS += "-Wno-narrowing"
18 18
19SRC_URI = "git://github.com/nemomobile/qt5-plugin-generic-vboxtouch.git" 19SRC_URI = "git://github.com/nemomobile/qt5-plugin-generic-vboxtouch.git"
20SRCREV = "d613ad1cc64d7a6a9b38df4d49146170be6876aa" 20SRCREV = "3f2bdb5a1d346f02d5ab185522271ba2288a42bb"
21S = "${WORKDIR}/git/vboxtouch" 21S = "${WORKDIR}/git/vboxtouch"
22 22
23inherit qmake5 23inherit qmake5
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 3a0699c4..b0f59701 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -125,4 +125,4 @@ do_install() {
125 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 125 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
126} 126}
127 127
128SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1" 128SRCREV = "ec16ba393baf504d4b192cc349775c62d3c96aa0"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index dce2d778..3ac6b214 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -228,4 +228,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
228 228
229RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 229RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
230 230
231SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1" 231SRCREV = "ec16ba393baf504d4b192cc349775c62d3c96aa0"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index f46cbc2c..17479e2f 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS = "qtdeclarative" 11DEPENDS = "qtdeclarative"
12 12
13SRCREV = "25447e889dc43c0831100bee1625a6f667d364cf" 13SRCREV = "a1aee8ecbefb74cd5eae380ced56bb43ff3cc40b"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 26881f0e..d4944816 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,4 +8,8 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "1f47b1a7ae58702dccc57a9ccbaa905441f4fecb" 11SRCREV = "e3af14e9169207e0e73f7e50191106895c29ddc4"
12
13# The same issue as in qtbase:
14# http://errors.yoctoproject.org/Errors/Details/152641/
15LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" \ No newline at end of file
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 9e91a1d4..ca9866f1 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
19 19
20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
21 21
22SRCREV = "94cc2b914a027fbcb7a1eb6cb34af45d0c07d2a4" 22SRCREV = "6b3bdb84406b42b50bdf5a39ee9ca2fabd3e6d2f"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 3737e107..7c8eda76 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" 9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
10 10
11SRCREV = "3f8ae713dfdbaeb34bdc52d905fe5ca16765cf7f" 11SRCREV = "8329a8fb287094012989b965604ff9c9426f022a"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 2cc969a6..4ae870a1 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -30,6 +30,6 @@ do_install_append_class-nativesdk() {
30 30
31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
32 32
33SRCREV = "7c45b035b97ce705d536932965673dca7cfa489e" 33SRCREV = "32218c3243fb4f0da83293c5bd6a663d8e3660ee"
34 34
35BBCLASSEXTEND =+ "native nativesdk" 35BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index 1fa8e826..30d5eeae 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13DEPENDS += "qtbase qtdeclarative qtxmlpatterns" 13DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
14 14
15QT_MODULE_BRANCH = "dev" 15QT_MODULE_BRANCH = "dev"
16SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d" 16SRCREV = "23603a3b088178d8ec92fddb240e5a5c55d77d5a"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index a771d9da..7e6cb1b2 100644
--- a/recipes-qt/qt5/qtgamepad_git.bb
+++ b/recipes-qt/qt5/qtgamepad_git.bb
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
14 14
15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
16 16
17SRCREV = "1fc40deed6993265c436783cc367285bf9a2266a" 17SRCREV = "167566d228792c0f763b84a39ff5dc52fda046dd"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 6c6f3aef..8f70bc0b 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
18# http://errors.yoctoproject.org/Errors/Build/44912/ 18# http://errors.yoctoproject.org/Errors/Build/44912/
19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
20 20
21SRCREV = "b6ff12df5496f3d296bb438ae343d5f771e93fec" 21SRCREV = "1f6658cbaa5ffecbf9ba845ea81683dd2215cd34"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 1e022f4a..52dd34a8 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
26 26
27EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 27EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
28 28
29SRCREV = "144a3535db9f95e60972d3c3b6eaceb65a604577" 29SRCREV = "dc6dc3b088d1828ee6d31f92528e0c87272ad4ed"
diff --git a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch
deleted file mode 100644
index 7db1676d..00000000
--- a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From dbc899b088817cf6529d7e5cb8be7a6a95556127 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 7 Jun 2017 13:29:29 +0300
4Subject: [PATCH] Make mapbox-gl build configurable
5
6mapbox-gl-native won't compile for ARMv5 or older, so disable the
7build by default.
8
9Task-number: QTBUG-61289
10Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b
11---
12 src/plugins/geoservices/geoservices.pro | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro
16index 459897a8..d97e05d0 100644
17--- a/src/plugins/geoservices/geoservices.pro
18+++ b/src/plugins/geoservices/geoservices.pro
19@@ -6,7 +6,7 @@ qtConfig(concurrent) {
20 SUBDIRS += osm
21 }
22
23-qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
24+mapboxgl:qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
25 !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) {
26 warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
27 } else {
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 0aebbd34..baa25d8a 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -13,10 +13,6 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" 14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
15 15
16# Patches from https://github.com/meta-qt5/qtlocation/commits/b5.9
17# 5.9.meta-qt5.2
18SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch"
19
20PACKAGECONFIG ??= "" 16PACKAGECONFIG ??= ""
21# older geoclue 0.12.99 is needed 17# older geoclue 0.12.99 is needed
22PACKAGECONFIG[geoclue] = ",,geoclue" 18PACKAGECONFIG[geoclue] = ",,geoclue"
@@ -34,7 +30,7 @@ SRC_URI += " \
34 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 30 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
35" 31"
36 32
37SRCREV_qtlocation = "c832af789766fcebd8cfb15e53ce14f36278ca6d" 33SRCREV_qtlocation = "d919f47308b209c798e50d8ca1b9abd48ba94718"
38SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b" 34SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead"
39 35
40SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 36SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 729b3ffd..f42bdc27 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -35,4 +35,4 @@ SRC_URI += "\
35# http://errors.yoctoproject.org/Errors/Build/44914/ 35# http://errors.yoctoproject.org/Errors/Build/44914/
36LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 36LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
37 37
38SRCREV = "343e281f0e7cc7fd9e1558e4d92f5019fa565181" 38SRCREV = "1e2702e86dbd2b3de69c58438bcfcf6276124547"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index 0655b425..e5ca4dfd 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-git.inc
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "3d93f6436596e349e43c3798b675af66db71df8a" 12SRCREV = "47b80ecae6fe0b9a2c74f0b0feb243145695995e"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 4b2924b0..64cfbdf7 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtdeclarative" 11DEPENDS += "qtdeclarative"
12 12
13SRCREV = "63f2f55462f2f040cfe175ada8aa1e01168597fc" 13SRCREV = "871d8e8e2faca0be870930d83f755a2ad484d30b"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 50d6ba6c..aa0e6e3f 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -28,4 +28,4 @@ SRC_URI += " \
28 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 28 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
29" 29"
30 30
31SRCREV = "a77494140324c3ede1f7c16086593c070d81e2b3" 31SRCREV = "8476f8fff7dc5b6f140074d280828cc0f9590088"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 9fe23589..b4f5a714 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -30,4 +30,4 @@ DEPENDS += "qtbase"
30# http://errors.yoctoproject.org/Errors/Build/44915/ 30# http://errors.yoctoproject.org/Errors/Build/44915/
31LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 31LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
32 32
33SRCREV = "86ee61734e0331459f9cfeb1ad56f773b7e994be" 33SRCREV = "08b74f4f30c304b80249a593a572808bc1892f66"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 36ca665d..fc60d601 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc
10 10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" 11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "a1dff1a11ad303a1f82f181e6386194de90ec08f" 13SRCREV = "3caae998c8c1770cd96cadba24d89a60005c5fe7"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9
16# 5.9.meta-qt5.2 16# 5.9.meta-qt5.2
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 6b2c28e3..014b68f7 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase qtdeclarative" 13DEPENDS += "qtbase qtdeclarative"
14 14
15SRCREV = "1673dbed00ba68209b6de95981f1e3b4a2a24682" 15SRCREV = "c273f2e5c82a3ef8e55e360988b8cf31362e2ba9"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 0b30043c..8df89137 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtserialport" 12DEPENDS += "qtbase qtserialport"
13 13
14SRCREV = "1d37c357c843a2622d2af7e1684576e19a8c7c30" 14SRCREV = "ce5a3ced5eeefe05675736d3279d4d45bbb6df90"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 23f03cea..0425e434 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase" 16DEPENDS += "qtbase"
17 17
18SRCREV = "93b539140c06da07d330c9ecad67ab5ed3f9b0c8" 18SRCREV = "cb9ade8beabd3cdcd469a45fa82a27fcc960532f"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index e3bd8407..f9e04c85 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "0fcd0160662941a9ba800b36671e88d82790bd95" 16SRCREV = "bdcd7a97449502f92069d36196cc81064b1c02a0"
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index 911a7098..0c6ce7e0 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -30,4 +30,4 @@ do_install_append() {
30 30
31QT_MODULE_BRANCH = "dev" 31QT_MODULE_BRANCH = "dev"
32 32
33SRCREV = "f364358a817ba57fa5aa9c67e731241249e704f8" 33SRCREV = "9c204e05ae7fefe9525b30238b469b1bb65d2537"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 151b4dfb..69305196 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -31,7 +31,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
31 31
32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
33 33
34SRCREV = "fdc5749b5603653c5d0c59db267f44fd1609457e" 34SRCREV = "90a701032ec5c8898e33b4fb4df0480634caaf8d"
35 35
36BBCLASSEXTEND = "native nativesdk" 36BBCLASSEXTEND = "native nativesdk"
37 37
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 122d0681..5b544555 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -53,4 +53,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
53 53
54DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" 54DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
55 55
56SRCREV = "dd8c39ea9312ec1441b3fdd830f9d42fe3258b58" 56SRCREV = "87218c4e68c4ebde8f5765f0dfe9a70a359ae05f"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 9847f393..979969ba 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature
37 37
38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
39 39
40SRCREV = "7f70da6a644bc5b690066f0ab4814e1358f57e81" 40SRCREV = "d483ed2927cb8d4685d5d3c7ea1c71246381910b"
41 41
42# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 42# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9
43# 5.9.meta-qt5.2 43# 5.9.meta-qt5.2
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 7e12a337..1e0796ab 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtdeclarative qtwebsockets" 13DEPENDS += "qtdeclarative qtwebsockets"
14 14
15SRCREV = "b5229df6a08a902b11a2fc9529af6385f4d985d5" 15SRCREV = "61a638663c9061d7211849d3a9316661733a5ad9"
diff --git a/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch b/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch
deleted file mode 100644
index d8d89b8e..00000000
--- a/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From 331de4be615b8552e498ac2f3deff4b49b4b0fc0 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 20 Aug 2017 20:37:38 +0200
4Subject: [PATCH] qtbug-61521.cpp: use free instead of cfree
5
6* as cfree man says:
7 This function should never be used. Use free(3) instead.
8 Starting with version 2.26, it has been removed from glibc.
9---
10 src/core/api/qtbug-61521.cpp | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp
14index 86d5998e..1dcc4cfa 100644
15--- a/src/core/api/qtbug-61521.cpp
16+++ b/src/core/api/qtbug-61521.cpp
17@@ -100,7 +100,7 @@ SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) {
18 }
19
20 SHIM_HIDDEN void ShimCFree(void* ptr) {
21- cfree(ptr);
22+ free(ptr);
23 }
24
25 SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) {
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 7a9c6148..4ced7925 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -137,7 +137,6 @@ SRC_URI += " \
137 file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ 137 file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
138 file://0003-Include-dependency-to-QCoreApplication-translate.patch \ 138 file://0003-Include-dependency-to-QCoreApplication-translate.patch \
139 file://0004-Force-host-toolchain-configuration.patch \ 139 file://0004-Force-host-toolchain-configuration.patch \
140 file://0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch \
141" 140"
142 141
143# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based 142# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based
@@ -164,8 +163,8 @@ SRC_URI_append_libc-musl = "\
164 file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ 163 file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
165" 164"
166 165
167SRCREV_qtwebengine = "99f84ffd2c0c78014a24534a863aa1c755abd51c" 166SRCREV_qtwebengine = "c11c2c8981e647c1eb2c6753ce77d436b92fff87"
168SRCREV_chromium = "21508b5b5421f10ba8627c3c66c5281efb39b2f9" 167SRCREV_chromium = "cfe8c60903b327ac94406661350f4ac05aa8c21b"
169SRCREV = "${SRCREV_qtwebengine}" 168SRCREV = "${SRCREV_qtwebengine}"
170 169
171SRCREV_FORMAT = "qtwebengine_chromium" 170SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 448ce5c4..eb3ab51b 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "fb71c823a7ae823345518ca33ccfe273fcf76494" 14SRCREV = "492981b93295f575ad77b6767dc5b8851287aa2e"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 0bbb09ea..79089aec 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
19COMPATIBLE_MACHINE_armv7ve = "(.*)" 19COMPATIBLE_MACHINE_armv7ve = "(.*)"
20COMPATIBLE_MACHINE_aarch64 = "(.*)" 20COMPATIBLE_MACHINE_aarch64 = "(.*)"
21 21
22SRCREV = "e4016a67bbffefed71a407494e249e978d212b3d" 22SRCREV = "ec640efd1d82cdc88157159cbaa048815696ee25"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index ed1440c1..d15fc2d9 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "f65d50eb063ad3c9a1d6f008f66e881d2e15f1d8" 16SRCREV = "160435b0eb076c31a021004eeede143fc265bce4"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index f4f46f11..8b706ddb 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = " \
18 18
19DEPENDS += "qtbase" 19DEPENDS += "qtbase"
20 20
21SRCREV = "fcfa824402bb4edaf644fad786dac3560c743ebe" 21SRCREV = "8d7e1e0ec06724a4d332c050e9260530c708e773"
22 22
23BBCLASSEXTEND =+ "native nativesdk" 23BBCLASSEXTEND =+ "native nativesdk"
24 24
diff --git a/recipes-qt/qtchooser/qtchooser_git.bb b/recipes-qt/qtchooser/qtchooser_git.bb
index f7656450..e745e8ad 100644
--- a/recipes-qt/qtchooser/qtchooser_git.bb
+++ b/recipes-qt/qtchooser/qtchooser_git.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "Wrapper to select between Qt development binary versions" 1DESCRIPTION = "Wrapper to select between Qt development binary versions"
2HOMEPAGE = "http://macieira.org/qtchooser" 2HOMEPAGE = "http://macieira.org/qtchooser"
3LICENSE = "LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | GPL-3.0" 3LICENSE = "LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | GPL-3.0"
4SRC_URI = "git://code.qt.io/qt/qtchooser.git;branch=master \ 4SRC_URI = "git://code.qt.io/cgit/qtsdk/qtchooser.git;branch=master \
5 file://0001-Makefile-install-the-man-dir.patch" 5 file://0001-Makefile-install-the-man-dir.patch"
6 6
7LIC_FILES_CHKSUM = " \ 7LIC_FILES_CHKSUM = " \
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = " \
10 file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ 10 file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
11" 11"
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13SRCREV = "4717841185d34bbe450e3b24445f2d35e3325a6a" 13SRCREV = "a1b6736e4f2daf86cd1626004d40ef57db85fbb5"
14PV = "39+git${SRCREV}" 14#PV = "39+git${SRCREV}"
15 15
16inherit pkgconfig 16inherit pkgconfig
17 17
diff --git a/recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch b/recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch
index a6da1ae4..d405c168 100644
--- a/recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch
+++ b/recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch
@@ -1,42 +1,31 @@
1From 878c5a2a47d620f36dd281d4b0eb6677a8a1fbd4 Mon Sep 17 00:00:00 2001 1From d8c16e032a6b639b410761a07f2158e0aeda0b08 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br> 2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Sat, 7 Jun 2014 18:13:14 -0300 3Date: Sat, 7 Jun 2014 18:13:14 -0300
4Subject: [PATCH] build: Fix mkspecs and CMake module install directories 4Subject: [PATCH] build: Fix mkspecs and CMake module install directories
5
5Organization: O.S. Systems Software LTDA. 6Organization: O.S. Systems Software LTDA.
6 7
7Upstream-Status: Inapropriate [configuration] 8Upstream-Status: Inapropriate [configuration]
8 9
9Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 10Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
11Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
10--- 12---
11 CMakeLists.txt | 2 +- 13 CMakeLists.txt | 2 +-
12 pkg/CMakeLists.txt | 2 +- 14 1 file changed, 1 insertion(+), 1 deletion(-)
13 2 files changed, 2 insertions(+), 2 deletions(-)
14 15
15diff --git a/CMakeLists.txt b/CMakeLists.txt 16diff --git a/CMakeLists.txt b/CMakeLists.txt
16index d78fedf..1f4db6b 100644 17index 0695a76..f2266c9 100644
17--- a/CMakeLists.txt 18--- a/CMakeLists.txt
18+++ b/CMakeLists.txt 19+++ b/CMakeLists.txt
19@@ -27,7 +27,7 @@ endfunction(QUERY_QMAKE) 20@@ -34,7 +34,7 @@ endfunction(QUERY_QMAKE)
20 query_qmake(QT_INSTALL_PLUGINS QT_PLUGINS_DIR) 21 query_qmake(QT_INSTALL_PLUGINS QT_PLUGINS_DIR)
21 query_qmake(QT_HOST_DATA QT_DATA_DIR) 22 query_qmake(QT_HOST_DATA QT_DATA_DIR)
22 23
23-set(QT_MKSPECS_DIR ${QT_DATA_DIR}/mkspecs) 24-set(QT_MKSPECS_DIR ${QT_DATA_DIR}/mkspecs)
24+set(QT_MKSPECS_DIR ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs) 25+set(QT_MKSPECS_DIR ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs)
25 26
26 # Configure options 27 # Debug version of library should have 'd' postfix on Windows
27 option(GENERATE_DOC 28 # and '_debug' on Mac OS X
28diff --git a/pkg/CMakeLists.txt b/pkg/CMakeLists.txt
29index 25891a5..a87fedd 100644
30--- a/pkg/CMakeLists.txt
31+++ b/pkg/CMakeLists.txt
32@@ -19,6 +19,6 @@ if(PKG_CONFIG_FOUND)
33 )
34 endif(PKG_CONFIG_FOUND)
35 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/FindTufao${TUFAO_VERSION_MAJOR}.cmake"
36- DESTINATION "${CMAKE_ROOT}/Modules"
37+ DESTINATION "${libdir}/cmake"
38 COMPONENT development
39 )
40-- 29--
412.0.0.rc4 302.0.0.rc4
42 31
diff --git a/recipes-qt/tufao/tufao_1.2.1.bb b/recipes-qt/tufao/tufao_1.3.10.bb
index 34b28b78..d4b62e2b 100644
--- a/recipes-qt/tufao/tufao_1.2.1.bb
+++ b/recipes-qt/tufao/tufao_1.3.10.bb
@@ -3,8 +3,8 @@ LICENSE = "LGPL-2.1"
3LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c" 3LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c"
4DEPENDS = "qtbase" 4DEPENDS = "qtbase"
5 5
6SRCREV = "a4832b4c941b5ff3f5fab23adcff39e6ad6cb4e5" 6SRCREV = "ad505c32d0ba14c3c616de8ba4c7eb79396c20a6"
7SRC_URI = "git://github.com/vinipsmaker/tufao.git;protocol=http \ 7SRC_URI = "git://github.com/vinipsmaker/tufao.git;protocol=http;branch=1.x \
8 file://build-Fix-mkspecs-and-CMake-module-install-directori.patch" 8 file://build-Fix-mkspecs-and-CMake-module-install-directori.patch"
9 9
10# This includes bugfixes from 1.x branch 10# This includes bugfixes from 1.x branch
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-28 19:15:27 +0000