qtbase: Fix build with 64bit time_t on glibc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2023-01-01 21:35:06 -08:00
committed by Martin Jansa
parent 8159b71f8c
commit f1ac12036e
2 changed files with 38 additions and 0 deletions

View File

@@ -0,0 +1,37 @@
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

View File

@@ -37,6 +37,7 @@ 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