t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-02 11:02:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtbase: refresh patches and update tags on meta-qt5

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2018-11-13 10:39:21 +00:00
parent 4ed4385658
commit 0edbe1ba0d
7 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
recipes-qt/qt5/nativesdk-qtbase_git.bb
View File

@@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
# common for qtbase-native, qtbase-nativesdk and qtbase
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared
# 5.11.meta-qt5-shared.11
# 5.11.meta-qt5-shared.12
SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -46,9 +46,9 @@ SRC_URI += "\
# common for qtbase-native and nativesdk-qtbase
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native
# 5.11.meta-qt5-native.11
# 5.11.meta-qt5-native.12
SRC_URI += " \
file://0016-Always-build-uic-and-qvkgen.patch \
file://0018-Always-build-uic-and-qvkgen.patch \
"
# CMake's toolchain configuration of nativesdk-qtbase

8
recipes-qt/qt5/qtbase-native_git.bb
View File

@@ -18,7 +18,7 @@ require qt5-git.inc
# common for qtbase-native, qtbase-nativesdk and qtbase
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared
# 5.11.meta-qt5-shared.11
# 5.11.meta-qt5-shared.12
SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -41,14 +41,14 @@ SRC_URI += "\
# common for qtbase-native and nativesdk-qtbase
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native
# 5.11.meta-qt5-native.11
# 5.11.meta-qt5-native.12
SRC_URI += " \
file://0016-Always-build-uic-and-qvkgen.patch \
file://0018-Always-build-uic-and-qvkgen.patch \
"
# only for qtbase-native
SRC_URI += " \
file://0017-Bootstrap-without-linkat-feature.patch \
file://0019-Bootstrap-without-linkat-feature.patch \
"
CLEANBROKEN = "1"

2
recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch
View File

@@ -1,4 +1,4 @@
From 94383531bde019ba113cc416b5cf3627e18ffef3 Mon Sep 17 00:00:00 2001
From 3b9861c92444d50198ca74e60bcf10738998b7e9 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 23 Oct 2018 09:54:57 +0300
Subject: [PATCH] Disable ltcg for host_build

5
recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
View File

@@ -1,4 +1,4 @@
From cc017da9bb6936c6e147e8d416c8405493d4422c Mon Sep 17 00:00:00 2001
From a154d5f20d85108fcbf36f9f39cb853438f98127 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Sat, 27 Oct 2018 12:29:31 +0000
Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to
@@ -64,6 +64,3 @@ index 07869efd7d..671aa82167 100644
!!ENDIF
--
2.13.6

2
recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch → recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch
View File

@@ -1,4 +1,4 @@
From 7b5433027e9c75902b83a2990e09ae221d98451e Mon Sep 17 00:00:00 2001
From 531068a88afa3336455134d85c16934bb4002124 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 16 Nov 2013 00:32:30 +0100
Subject: [PATCH] Always build uic and qvkgen

2
recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch → recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch
View File

@@ -1,4 +1,4 @@
From 739dd4920bc16919c81c62bcddadc6958599792c Mon Sep 17 00:00:00 2001
From 0d6a38d7bec0a3017a9e325f5e2b6e6168359b33 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 24 Nov 2017 15:16:31 +0200
Subject: [PATCH] Bootstrap without linkat feature

2
recipes-qt/qt5/qtbase_git.bb
View File

@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
# common for qtbase-native, qtbase-nativesdk and qtbase
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared
# 5.11.meta-qt5-shared.11
# 5.11.meta-qt5-shared.12
SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \