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
2019-02-11 19:51:30 +10:00
parent b5a3555831
commit af6232c2c7
2 changed files with 30 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
dev-qt/qt5/patches/qt5-5.12.0.patchset → dev-qt/qt5/patches/qt5-5.12.1.patchset
View File

@@ -1,6 +1,6 @@
From 025e88323ff0019457774e4f8462d47d7ba68f25 Mon Sep 17 00:00:00 2001
From 266185a40c6d8c5f09f0859e7b2f8602e3d55198 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 16 Dec 2018 17:19:57 +1000
Date: Mon, 11 Feb 2019 15:51:31 +1000
Subject: Fix Haiku build
@@ -52,9 +52,9 @@ index d5f6992..c2a1e4f 100644
2.19.1
From 4d60db5d8f634d882e0b09aa5d330705e2fd2019 Mon Sep 17 00:00:00 2001
From 0cd4cf3007086aad7e85d49aa10d4eab79c1af4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sun, 16 Dec 2018 17:24:56 +1000
Date: Mon, 11 Feb 2019 15:53:20 +1000
Subject: Add filteredDeviceFilePaths for Haiku's /dev/ports/*
@@ -87,9 +87,9 @@ index 0f62a9d..afd5c0b 100644
2.19.1
From 7f30ea55a2ce758d2ede75b681591d7aec2e675c Mon Sep 17 00:00:00 2001
From 2e39c63f5a8af0f60ba22963735c1f3abcebc0b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sun, 16 Dec 2018 17:32:49 +1000
Date: Mon, 11 Feb 2019 15:53:49 +1000
Subject: Make sure libs are searched in the develop/ dir by CMake
Static libs at least are not in the lib[/x86] dirs...
@@ -112,14 +112,14 @@ index 2ed708e..28e0d93 100644
2.19.1
From ffedca155a4909193ea61ead9560d78a9d33a053 Mon Sep 17 00:00:00 2001
From 601e40469689c5cf7365dd567375dcaafde947b3 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 16 Dec 2018 17:45:34 +1000
Date: Mon, 11 Feb 2019 15:55:08 +1000
Subject: Disable built-in haiku QPA plugin
diff --git a/qtbase/src/plugins/platforms/platforms.pro b/qtbase/src/plugins/platforms/platforms.pro
index 5bf2b77..1000fe1 100644
index acc55ad..a36c18e 100644
--- a/qtbase/src/plugins/platforms/platforms.pro
+++ b/qtbase/src/plugins/platforms/platforms.pro
@@ -42,10 +42,6 @@ freebsd {
@@ -130,16 +130,16 @@ index 5bf2b77..1000fe1 100644
- SUBDIRS += haiku
-}
-
wasm: SUBDIRS = wasm
wasm: SUBDIRS += wasm
qtConfig(mirclient): SUBDIRS += mirclient
--
2.19.1
From 9a2d33b8d61c9ac0788b5232f8f55d426540abd5 Mon Sep 17 00:00:00 2001
From 92b045d91cbe7589933f391969347e6ab0a44c4d Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 16 Dec 2018 17:51:08 +1000
Date: Mon, 11 Feb 2019 15:55:38 +1000
Subject: disable mapbox-gl-native on Haiku.
@@ -160,9 +160,9 @@ index b81ad34..7b642c0 100644
2.19.1
From fbed02429201d00dcd47f3fcb89d26030da39eb7 Mon Sep 17 00:00:00 2001
From 38dd3fa30ba8756adee6be48079b31bd8d5febe5 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 16 Dec 2018 17:59:16 +1000
Date: Mon, 11 Feb 2019 15:56:12 +1000
Subject: Fix QStandartPaths for Haiku
@@ -223,9 +223,9 @@ index 044d69f..1f255a9 100644
2.19.1
From 81211ef29eb2c396b2f4a05d2e21fe1b6311bf89 Mon Sep 17 00:00:00 2001
From da8783cefee2fc5ede481b29f8cff6458341077d Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 16 Dec 2018 18:06:04 +1000
Date: Mon, 11 Feb 2019 15:56:39 +1000
Subject: QSslSocketPrivate::unixRootCertDirectories(): add ssl path for Haiku.
@@ -245,17 +245,17 @@ index 4a9d054..46f3d08 100644
2.19.1
From 544aea68d2c5b5f2148b813e56124fe54e22d1ae Mon Sep 17 00:00:00 2001
From 55b653469dd0504318c280d7c494e32235115dc7 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 16 Dec 2018 18:15:28 +1000
Date: Mon, 11 Feb 2019 15:56:59 +1000
Subject: Fix build for Haiku platform
diff --git a/qtbase/mkspecs/features/toolchain.prf b/qtbase/mkspecs/features/toolchain.prf
index 4ecfb8d..edb7968 100644
index 2a7cbab..82fe480 100644
--- a/qtbase/mkspecs/features/toolchain.prf
+++ b/qtbase/mkspecs/features/toolchain.prf
@@ -121,7 +121,7 @@ isEmpty($${target_prefix}.INCDIRS) {
@@ -251,7 +251,7 @@ isEmpty($${target_prefix}.INCDIRS) {
}
}
}
@@ -268,34 +268,9 @@ index 4ecfb8d..edb7968 100644
2.19.1
From 2e473eda1b0aa0fd7e26e4d95f56779c2521db8f Mon Sep 17 00:00:00 2001
From a09461d2874d9607b9b6e920f9020de41a0a47fd Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 16 Dec 2018 18:26:15 +1000
Subject: Fix clang-config detection on Haiku
diff --git a/qttools/mkspecs/features/qt_find_clang.prf b/qttools/mkspecs/features/qt_find_clang.prf
index d7cc4ed..9485612 100644
--- a/qttools/mkspecs/features/qt_find_clang.prf
+++ b/qttools/mkspecs/features/qt_find_clang.prf
@@ -77,6 +77,10 @@ for(_, $$list(_)) { # just a way to break easily
}
}
+ equals(QMAKE_HOST.os, Haiku) {
+ clangInstallDir = "/system"
+ }
+
# note: llvm_config only exits on unix
llvm_config = $$clangInstallDir/bin/llvm-config
exists($$llvm_config) {
--
2.19.1
From 04305e362eff17b0b128613fcf22bbb0ca5c12b5 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 16 Dec 2018 18:32:36 +1000
Date: Mon, 11 Feb 2019 15:57:25 +1000
Subject: Fix build qt3d zip module
@@ -316,9 +291,9 @@ index 916fb1f..8834128 100644
2.19.1
From 830ea18a9458c85374643f49426a62b0f704b4cf Mon Sep 17 00:00:00 2001
From d5b657042db76fe707e7065549c81f4bba8a4b27 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 31 Dec 2018 18:03:28 +1000
Date: Mon, 11 Feb 2019 15:57:54 +1000
Subject: Fix endian detection

12
dev-qt/qt5/qt5-5.12.0.recipe → dev-qt/qt5/qt5-5.12.1.recipe
View File

@@ -4,12 +4,12 @@ used for developing software with a graphical user interface, and also used \
for developing non-GUI programs such as command-line tools and consoles for \
servers."
HOMEPAGE="https://qt.io/"
COPYRIGHT="2015-2018 The Qt Company Ltd."
COPYRIGHT="2015-2019 The Qt Company Ltd."
LICENSE="GNU LGPL v2.1
GNU LGPL v3"
REVISION="1"
SOURCE_URI="https://download.qt.io/official_releases/qt/5.12/${portVersion/\~/-}/single/qt-everywhere-src-${portVersion/\~/-}.tar.xz"
CHECKSUM_SHA256="356f42d9087718f22f03d13d0c2cdfb308f91dc3cf0c6318bed33f2094cd9d6c"
CHECKSUM_SHA256="caffbd625c7bc10ff8c5c7a27dbc7d84fa4de146975c0e1ffe904b514ccd6da4"
SOURCE_DIR="qt-everywhere-src-${portVersion/\~/-}"
PATCHES="qt5-$portVersion.patchset"
ADDITIONAL_FILES="
@@ -329,6 +329,7 @@ PROVIDES_tools="
cmd:lrelease$secondaryArchSuffix = $portVersion compat >= 5
cmd:lupdate$secondaryArchSuffix = $portVersion compat >= 5
cmd:pixeltool$secondaryArchSuffix = $portVersion compat >= 5
cmd:qcollectiongenerator$secondaryArchSuffix = $portVersion compat >= 5
cmd:qdbus$secondaryArchSuffix = $portVersion compat >= 5
cmd:qdbuscpp2xml$secondaryArchSuffix = $portVersion compat >= 5
cmd:qdbusviewer$secondaryArchSuffix = $portVersion compat >= 5
@@ -497,10 +498,9 @@ INSTALL()
devPackageCommands="$devPackageCommands $binDir/$i"
done
toolsCommands="assistant designer lconvert
linguist lrelease lupdate pixeltool qdistancefieldgenerator qdbus
qdbuscpp2xml qdbusviewer qdbusxml2cpp qdoc
qhelpgenerator qtattributionsscanner qtdiag qtpaths qtplugininfo"
toolsCommands="assistant designer lconvert linguist lrelease lupdate pixeltool
qcollectiongenerator qdistancefieldgenerator qdbus qdbuscpp2xml qdbusviewer qdbusxml2cpp
qdoc qhelpgenerator qtattributionsscanner qtdiag qtpaths qtplugininfo"
for i in $toolsCommands; do
toolsPackageCommands="$toolsPackageCommands $binDir/$i"