haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt5: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-05-28 11:50:41 +10:00
parent f7ca318851
commit 58fc912ccc
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
dev-qt/qt5/patches/qt5-5.14.2.patchset → dev-qt/qt5/patches/qt5-5.15.0.patchset
View File

@@ -406,19 +406,19 @@ index 0000000..0b387df
2.24.1
From 9b8e2a7d64a7f285df76f4a0bd7ba6855fe3e504 Mon Sep 17 00:00:00 2001
From 4feab77c35a69b97fa3c4d2727c30a711f97df9f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 24 Jun 2019 21:20:17 +1000
Date: Wed, 27 May 2020 19:54:30 +1000
Subject: Disable LibResolv for Haiku
diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp
index 78a05f8..cd93ca0 100644
index 625fbab..8e1dce7 100644
--- a/qtbase/src/network/kernel/qhostinfo_unix.cpp
+++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp
@@ -87,7 +87,7 @@ typedef void (*res_nclose_proto)(res_state_ptr);
static res_nclose_proto local_res_nclose = 0;
static res_state_ptr local_res = 0;
static res_nclose_proto local_res_nclose = nullptr;
static res_state_ptr local_res = nullptr;
-#if QT_CONFIG(library) && !defined(Q_OS_QNX)
+#if QT_CONFIG(library) && !defined(Q_OS_QNX) && !defined(Q_OS_HAIKU)
@@ -426,7 +426,7 @@ index 78a05f8..cd93ca0 100644
struct LibResolv
{
--
2.24.1
2.26.0
From de33269cc3951365f6313d5aa9273a16570c6a65 Mon Sep 17 00:00:00 2001
@@ -541,28 +541,28 @@ index b18d082..0c3bb81 100644
2.24.1
From 9784f6961228120ca3cc29b37fa7ed0ae2f05340 Mon Sep 17 00:00:00 2001
From 91bec7d81d4e8fe49fb13a1fd20ef36352beb9ef Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 15 Dec 2019 18:42:38 +1000
Date: Wed, 27 May 2020 19:54:58 +1000
Subject: Disable sharedmemory feature for bootstrap
diff --git a/qtbase/src/tools/bootstrap/bootstrap.pro b/qtbase/src/tools/bootstrap/bootstrap.pro
index 9863ff5..1bde486 100644
index c212ccb..1a31b62 100644
--- a/qtbase/src/tools/bootstrap/bootstrap.pro
+++ b/qtbase/src/tools/bootstrap/bootstrap.pro
@@ -17,7 +17,8 @@ MODULE_CONFIG = gc_binaries
DEFINES += \
$$MODULE_DEFINES \
QT_NO_FOREACH \
- QT_NO_CAST_FROM_ASCII
+ QT_NO_CAST_FROM_ASCII \
+ QT_NO_SHAREDMEMORY
@@ -11,7 +11,8 @@ MODULE_DEFINES = \
QT_VERSION_MINOR=$$QT_MINOR_VERSION \
QT_VERSION_PATCH=$$QT_PATCH_VERSION \
QT_BOOTSTRAPPED \
- QT_NO_CAST_TO_ASCII
+ QT_NO_CAST_TO_ASCII \
+ QT_NO_SHAREDMEMORY
MODULE_CONFIG = gc_binaries
SOURCES += \
../../corelib/codecs/qlatincodec.cpp \
DEFINES += \
--
2.24.1
2.26.0
From ec29bb4e065ca75a43cb32c63119131b1348a6e3 Mon Sep 17 00:00:00 2001

8
dev-qt/qt5/qt5-5.14.2.recipe → dev-qt/qt5/qt5-5.15.0.recipe
View File

@@ -10,7 +10,7 @@ LICENSE="GNU LGPL v2.1
FDL"
REVISION="1"
SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/single/qt-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256="c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa"
CHECKSUM_SHA256="22b63d7a7a45183865cc4141124f12b673e7a17b1fe2b91e433f6547c5d548c3"
SOURCE_DIR="qt-everywhere-src-$portVersion"
PATCHES="qt5-$portVersion.patchset"
ADDITIONAL_FILES="
@@ -293,6 +293,7 @@ PROVIDES_devel="
cmd:qml$secondaryArchSuffix = $portVersion compat >= 5
cmd:qmlcachegen$secondaryArchSuffix = $portVersion compat >= 5
cmd:qmleasing$secondaryArchSuffix = $portVersion compat >= 5
cmd:qmlformat$secondaryArchSuffix = $portVersion compat >= 5
cmd:qmlimportscanner$secondaryArchSuffix = $portVersion compat >= 5
cmd:qmllint$secondaryArchSuffix = $portVersion compat >= 5
cmd:qmlmin$secondaryArchSuffix = $portVersion compat >= 5
@@ -301,6 +302,7 @@ PROVIDES_devel="
cmd:qmlpreview$secondaryArchSuffix = $portVersion compat >= 5
cmd:qmlscene$secondaryArchSuffix = $portVersion compat >= 5
cmd:qmltestrunner$secondaryArchSuffix = $portVersion compat >= 5
cmd:qmltyperegistrar$secondaryArchSuffix = $portVersion compat >= 5
cmd:qscxmlc$secondaryArchSuffix = $portVersion compat >= 5
cmd:qvkgen$secondaryArchSuffix = $portVersion compat >= 5
cmd:rcc$secondaryArchSuffix = $portVersion compat >= 5
@@ -530,8 +532,8 @@ INSTALL()
grep -rl $dataDir/Qt5/mkspecs/modules/*.pri -e "staticlib" | xargs sed -i 's%$$QT_MODULE_LIB_BASE%'${developLibDir}'%g'
devCommands="balsam canbusutil fixqt4headers.pl
meshdebug moc qgltf qlalr qmake qml qmlcachegen qmleasing qmlimportscanner
qmllint qmlmin qmlplugindump qmlpreview qmlprofiler qmlscene qmltestrunner
meshdebug moc qgltf qlalr qmake qml qmlcachegen qmleasing qmlformat qmlimportscanner
qmllint qmlmin qmlplugindump qmlpreview qmlprofiler qmlscene qmltestrunner qmltyperegistrar
qscxmlc qvkgen rcc repc syncqt.pl tracegen uic xmlpatterns xmlpatternsvalidator"
for i in $devCommands; do
devPackageCommands="$devPackageCommands $binDir/$i"