qt5: update to openssl3 and libtiff 6

This commit is contained in:
PulkoMandy
2024-08-10 17:07:01 +02:00
parent 42bfbe5692
commit 36ff2c23cc
2 changed files with 44 additions and 4 deletions

View File

@@ -1166,3 +1166,43 @@ index e6e989a..dbf32b6 100644
--
2.30.2
From eae7d61615b76c6459747505a13d0b0fa85f4270 Mon Sep 17 00:00:00 2001
From: PulkoMandy <pulkomandy@pulkomandy.tk>
Date: Sat, 10 Aug 2024 17:05:17 +0200
Subject: [PATCH] Fix build on Haiku R1/beta5
---
src/corelib/io/forkfd_qt.cpp | 4 ++++
src/network/kernel/qhostinfo.cpp | 2 ++
2 files changed, 6 insertions(+)
diff --git a/src/corelib/io/forkfd_qt.cpp b/src/corelib/io/forkfd_qt.cpp
index cf44874..8a0938d 100644
--- a/src/corelib/io/forkfd_qt.cpp
+++ b/src/corelib/io/forkfd_qt.cpp
@@ -44,5 +44,9 @@
# define NDEBUG
#endif
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
#include <forkfd.h>
#include "../../3rdparty/forkfd/forkfd.c"
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index 0159636..7ca58a4 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -39,6 +39,8 @@
//#define QHOSTINFO_DEBUG
+#define _DEFAULT_SOURCE // for NI_MAXHOST
+
#include "qhostinfo.h"
#include "qhostinfo_p.h"
#include <qplatformdefs.h>
--
2.45.2

View File

@@ -8,7 +8,7 @@ COPYRIGHT="2015-2020 The Qt Company Ltd."
LICENSE="GNU LGPL v2.1
GNU LGPL v3
FDL"
REVISION="1"
REVISION="2"
#baseURL="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules"
baseURL="http://qt-mirror.dannhauer.de/official_releases/qt/${portVersion%.*}/$portVersion/submodules/"
SOURCE_URI="https://github.com/qt/qt5/archive/v$portVersion-lts-lgpl.tar.gz"
@@ -537,7 +537,7 @@ BUILD_REQUIRES="
devel:libclang$secondaryArchSuffix >= 17
devel:libclanganalysis$secondaryArchSuffix >= 17
devel:libLLVM_17$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix >= 3
devel:libdouble_conversion$secondaryArchSuffix >= 3
devel:libegl$secondaryArchSuffix
devel:libflite$secondaryArchSuffix
@@ -560,8 +560,8 @@ BUILD_REQUIRES="
devel:libpcre2_16$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libsqlite3$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix >= 5
devel:libssl$secondaryArchSuffix >= 3
devel:libtiff$secondaryArchSuffix >= 6
devel:libxml2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"