Commit abd817d7 authored by Bernhard Hartleb's avatar Bernhard Hartleb Committed by Martin Jansa
Browse files
No related merge requests found
Showing with 22 additions and 60 deletions
+22 -60
......@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=71469b4021772fca0f18e08b1ef8ac7e \
"
QT_MODULE = "qtbase"
......@@ -202,4 +202,4 @@ fakeroot do_generate_qt_environment_file() {
do_generate_qt_environment_file[umask] = "022"
addtask generate_qt_environment_file after do_install before do_package
SRCREV = "358aebba7280d6d2b59b1f740747a4a3d1b7a54a"
SRCREV = "42e4ae042a4c86e58bcb8b6d2d59ba4a988285b4"
......@@ -38,6 +38,6 @@ do_configure:prepend() {
${S}/src/quick3d/imports/input/importsinput.pro
}
SRCREV = "bf79d391c0ca24b5787cdc82dc95df71c53c2d02"
SRCREV = "e94b0fa39a2f4bf260969fb18bf075dba39b2df1"
BBCLASSEXTEND += "native nativesdk"
......@@ -14,4 +14,4 @@ CVE_PRODUCT:append = " qt"
S = "${WORKDIR}/git"
PV = "5.15.7+git${SRCPV}"
PV = "5.15.9+git${SRCPV}"
......@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=71469b4021772fca0f18e08b1ef8ac7e \
"
require qt5-native.inc
......@@ -146,4 +146,4 @@ do_install() {
echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
}
SRCREV = "358aebba7280d6d2b59b1f740747a4a3d1b7a54a"
SRCREV = "42e4ae042a4c86e58bcb8b6d2d59ba4a988285b4"
From 4e00087b393183493a0f7115fd41efc867bd3421 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 1 Jan 2023 21:30:23 -0800
Subject: [PATCH] zlib: Do not undefine _FILE_OFFSET_BITS
This is required for 64bit time_t to work with glibc as it needs
_FILE_OFFSET_BITS to be defined as 64 as well.
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/3rdparty/zlib/src/gzguts.h | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/src/3rdparty/zlib/src/gzguts.h b/src/3rdparty/zlib/src/gzguts.h
index 20de7cb4ce..f6ab9357c7 100644
--- a/src/3rdparty/zlib/src/gzguts.h
+++ b/src/3rdparty/zlib/src/gzguts.h
@@ -12,15 +12,6 @@
# endif
#endif
-#ifdef _LARGEFILE64_SOURCE
-# ifndef _LARGEFILE_SOURCE
-# define _LARGEFILE_SOURCE 1
-# endif
-# ifdef _FILE_OFFSET_BITS
-# undef _FILE_OFFSET_BITS
-# endif
-#endif
-
#ifndef QT_BOOTSTRAPPED
# include <qconfig.h>
#endif
--
2.39.0
......@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=71469b4021772fca0f18e08b1ef8ac7e \
"
# common for qtbase-native, qtbase-nativesdk and qtbase
......@@ -37,7 +37,6 @@ SRC_URI += "\
file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \
file://0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch \
file://0022-testlib-don-t-track-the-build-or-source-directories.patch \
file://0023-zlib-Do-not-undefine-_FILE_OFFSET_BITS.patch \
"
# Disable LTO for now, QT5 patches are being worked upstream, perhaps revisit with
......@@ -310,4 +309,4 @@ sed -i \
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
}
SRCREV = "358aebba7280d6d2b59b1f740747a4a3d1b7a54a"
SRCREV = "42e4ae042a4c86e58bcb8b6d2d59ba4a988285b4"
......@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia"
SRCREV = "df56d9b4e6373b5975b6cf636ffb5ccdebe9e9fc"
SRCREV = "3d4a84eb6d62ce22a47794f309f9268729ac375f"
# The same issue as in qtbase:
# http://errors.yoctoproject.org/Errors/Details/152641/
......
......@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "09e33f25138deceaf810b2ad4936ae8ed9dfe7a8"
SRCREV = "3dcb548bd6fe4aa488ca0bac95e65a7a366c3eca"
......@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
SRCREV = "15a66695ccc64f8b276f01b10fde427e3b889745"
SRCREV = "7636478bb30f0af8afe9af429eb8512d6fbcc11b"
......@@ -53,6 +53,6 @@ do_install:append:class-nativesdk() {
rm -rf ${D}${OE_QMAKE_PATH_QML}
}
SRCREV = "0d60f81bf61a69bc859a269ae562b2610d224e02"
SRCREV = "19ed7973a311a8d42d3a558bb551230e902ce9b9"
BBCLASSEXTEND =+ "native nativesdk"
......@@ -16,4 +16,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "674f21205720610eda7ad1ae1e4a8692fc959f69"
SRCREV = "7c05744e38d44afac687df3349d548c8790837db"
......@@ -18,4 +18,4 @@ RDEPENDS:${PN}-dev = ""
# http://errors.yoctoproject.org/Errors/Build/44912/
LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
SRCREV = "dfacc1706eaf9ec306e2f660be393ecffe9637fb"
SRCREV = "06cfcbb6940d2729f5a6575e264873ce65ac99c3"
......@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "078bc3fa18ea102525bcd831c3b4ed4cca7dc74e"
SRCREV = "1f67161fea6beb2ed4c09849abe446c6a880af8a"
......@@ -35,7 +35,7 @@ SRC_URI += " \
${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
"
SRCREV_qtlocation = "e0d60def8e32fb255ee003742f165f2033d25e1d"
SRCREV_qtlocation = "e3e9f9bf42c22565f226b3431cb8c17502cc2e7a"
SRCREV_qtlocation-mapboxgl = "d3101bbc22edd41c9036ea487d4a71eabd97823d"
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
......@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "0dcf0bb9cf72254d77cea7558b3c04c40a48f029"
SRCREV = "f9f123a97989638c36b5c2b03f4ff6261ddaed9a"
......@@ -40,7 +40,7 @@ SRC_URI += "\
# http://errors.yoctoproject.org/Errors/Build/44914/
LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
SRCREV = "eeb34aae03b9395c9b3b45ab7c4f3055d086e894"
SRCREV = "9dbea27ea43206c2d210e4b4cc48af169ada3847"
# Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory
do_install:append() {
......
......@@ -9,4 +9,4 @@ require qt5-git.inc
DEPENDS += "qtbase"
SRCREV = "361be878e4a3d098a119dd7f648ae8fc29e14674"
SRCREV = "59311ee7d78a8b19d3dbe61cf49d42c5bd7c934a"
......@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "267f179714eff834f95ce79346d7f1215e94b24f"
SRCREV = "5737c10128c6eeb28c10df569c8492bb2e8f4230"
......@@ -21,7 +21,7 @@ FILES:${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
"
SRCREV_qtquick3d = "cb8f82eeeb230c3ef38ac6e7f5ca393ccb8e6e1f"
SRCREV_qtquick3d = "a78f1c57dfb3459be43c856d6bda16f3dfdc3b15"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
SRCREV_FORMAT = "qtquick3d_assimp"
......@@ -12,4 +12,4 @@ DEPENDS += "qtdeclarative qtdeclarative-native"
SRC_URI += "file://0001-Revert-Get-the-scale-of-the-popup-item-when-setting-.patch"
SRCREV = "8b7daceeb829b4dbf52c95510d4934d1c6df380d"
SRCREV = "5e31cdc9dda940aee38cf8de4ddbbeb2c0cebfc7"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment