dev-qt/qt5/patches/qt5-5.12.2.patchset → dev-qt/qt5/patches/qt5-5.12.3.patchset

@@ -1,4 +1,4 @@
-From 266185a40c6d8c5f09f0859e7b2f8602e3d55198 Mon Sep 17 00:00:00 2001
+From bcd54d38d6d0af906a10fe11141a7689c643b80e Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 11 Feb 2019 15:51:31 +1000
 Subject: Fix Haiku build
@@ -49,10 +49,10 @@ index d5f6992..c2a1e4f 100644
      || OS(OPENBSD)          \
      || OS(QNX)              \
 -- 
-2.19.1
+2.21.0
 
 
-From 0cd4cf3007086aad7e85d49aa10d4eab79c1af4f Mon Sep 17 00:00:00 2001
+From 36a2750838cd3f54f1201dd74cf005e3d6aebeb4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
 Date: Mon, 11 Feb 2019 15:53:20 +1000
 Subject: Add filteredDeviceFilePaths for Haiku's /dev/ports/*
@@ -84,18 +84,18 @@ index 0f62a9d..afd5c0b 100644
          deviceDir.setNameFilters(deviceFileNameFilterList);
          deviceDir.setFilter(QDir::Files | QDir::System | QDir::NoSymLinks);
 -- 
-2.19.1
+2.21.0
 
 
-From 2e39c63f5a8af0f60ba22963735c1f3abcebc0b7 Mon Sep 17 00:00:00 2001
+From bb82905e378d76be6b8326aeb9035bf2ca191815 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
 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...
 
 diff --git a/qtbase/mkspecs/features/create_cmake.prf b/qtbase/mkspecs/features/create_cmake.prf
-index 2ed708e..28e0d93 100644
+index 6bf1380..1eed4c8 100644
 --- a/qtbase/mkspecs/features/create_cmake.prf
 +++ b/qtbase/mkspecs/features/create_cmake.prf
 @@ -86,6 +86,9 @@ win32:!static:!staticlib {
@@ -109,10 +109,10 @@ index 2ed708e..28e0d93 100644
      CMAKE_DLL_DIR = $$CMAKE_LIB_DIR
      CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE
 -- 
-2.19.1
+2.21.0
 
 
-From 601e40469689c5cf7365dd567375dcaafde947b3 Mon Sep 17 00:00:00 2001
+From a2a1d6761a3b460ba03e12db8f3deddf9d4d5c80 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 11 Feb 2019 15:55:08 +1000
 Subject: Disable built-in haiku QPA plugin
@@ -134,10 +134,10 @@ index acc55ad..a36c18e 100644
 
  qtConfig(mirclient): SUBDIRS += mirclient
 -- 
-2.19.1
+2.21.0
 
 
-From 92b045d91cbe7589933f391969347e6ab0a44c4d Mon Sep 17 00:00:00 2001
+From dce88511c1a8e0d35fbdbc840284b84145ec2a36 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 11 Feb 2019 15:55:38 +1000
 Subject: disable mapbox-gl-native on Haiku.
@@ -157,10 +157,10 @@ index b81ad34..7b642c0 100644
          warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
      } else {
 -- 
-2.19.1
+2.21.0
 
 
-From 38dd3fa30ba8756adee6be48079b31bd8d5febe5 Mon Sep 17 00:00:00 2001
+From c047db6bf915a73233366fe1c0bc1e0ea0495569 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 11 Feb 2019 15:56:12 +1000
 Subject: Fix QStandartPaths for Haiku
@@ -220,17 +220,17 @@ index 044d69f..1f255a9 100644
      case GenericConfigLocation:
          paths += haikuStandardPath(B_SYSTEM_SETTINGS_DIRECTORY);
 -- 
-2.19.1
+2.21.0
 
 
-From da8783cefee2fc5ede481b29f8cff6458341077d Mon Sep 17 00:00:00 2001
+From d85dd8d43156c4c72da85467e8bad315c91d611d Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 11 Feb 2019 15:56:39 +1000
 Subject: QSslSocketPrivate::unixRootCertDirectories(): add ssl path for Haiku.
 
 
 diff --git a/qtbase/src/network/ssl/qsslsocket.cpp b/qtbase/src/network/ssl/qsslsocket.cpp
-index 4a9d054..46f3d08 100644
+index 4f49a71..92909a4 100644
 --- a/qtbase/src/network/ssl/qsslsocket.cpp
 +++ b/qtbase/src/network/ssl/qsslsocket.cpp
 @@ -2800,6 +2800,7 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
@@ -242,20 +242,20 @@ index 4a9d054..46f3d08 100644
  }
 
 -- 
-2.19.1
+2.21.0
 
 
-From 55b653469dd0504318c280d7c494e32235115dc7 Mon Sep 17 00:00:00 2001
+From ecbf32d622114448705c30e4eec70885592377bb Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 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 2a7cbab..82fe480 100644
+index 9c3a64a..da7734e 100644
 --- a/qtbase/mkspecs/features/toolchain.prf
 +++ b/qtbase/mkspecs/features/toolchain.prf
-@@ -251,7 +251,7 @@ isEmpty($${target_prefix}.INCDIRS) {
+@@ -254,7 +254,7 @@ isEmpty($${target_prefix}.INCDIRS) {
                  }
              }
          }
@@ -265,17 +265,17 @@ index 2a7cbab..82fe480 100644
              # or gold under Linux) will not print any library search path. Need to use another
              # invocation with different options (which in turn doesn't print include search
 -- 
-2.19.1
+2.21.0
 
 
-From a09461d2874d9607b9b6e920f9020de41a0a47fd Mon Sep 17 00:00:00 2001
+From d714be6cde52a674fb5cd2030a9de0a80f39c743 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 11 Feb 2019 15:57:25 +1000
 Subject: Fix build qt3d zip module
 
 
 diff --git a/qt3d/src/3rdparty/assimp/contrib/zip/src/miniz.h b/qt3d/src/3rdparty/assimp/contrib/zip/src/miniz.h
-index 916fb1f..8834128 100644
+index 2e4e223..6436df5 100644
 --- a/qt3d/src/3rdparty/assimp/contrib/zip/src/miniz.h
 +++ b/qt3d/src/3rdparty/assimp/contrib/zip/src/miniz.h
 @@ -2917,7 +2917,7 @@ void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h,
@@ -288,10 +288,10 @@ index 916fb1f..8834128 100644
        #include <utime.h>
      #endif
 -- 
-2.19.1
+2.21.0
 
 
-From d5b657042db76fe707e7065549c81f4bba8a4b27 Mon Sep 17 00:00:00 2001
+From 2079bbd8c7d581b54691ff72f5cd126d631bafd3 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 11 Feb 2019 15:57:54 +1000
 Subject: Fix endian detection
@@ -315,5 +315,93 @@ index 09d2a8b..49d74ae 100644
  #    endif
  #  endif
 -- 
-2.19.1
+2.21.0
+
+
+From 081f0bdfac4bcd712e54c1c64e7d10be99bbb93e Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sat, 27 Apr 2019 17:47:23 +1000
+Subject: Add dnslookup query function for Haiku
+
+
+diff --git a/qtbase/src/network/kernel/kernel.pri b/qtbase/src/network/kernel/kernel.pri
+index 11b80d5..57406e2 100644
+--- a/qtbase/src/network/kernel/kernel.pri
++++ b/qtbase/src/network/kernel/kernel.pri
+@@ -50,6 +50,11 @@ android:qtConfig(dnslookup) {
+     SOURCES += kernel/qdnslookup_android.cpp
+ }
+
++haiku:qtConfig(dnslookup) {
++    SOURCES -= kernel/qdnslookup_unix.cpp
++    SOURCES += kernel/qdnslookup_haiku.cpp
++}
++
+ win32: {
+     SOURCES += kernel/qhostinfo_win.cpp
+
+diff --git a/qtbase/src/network/kernel/qdnslookup_haiku.cpp b/qtbase/src/network/kernel/qdnslookup_haiku.cpp
+new file mode 100644
+index 0000000..0b387df
+--- /dev/null
++++ b/qtbase/src/network/kernel/qdnslookup_haiku.cpp
+@@ -0,0 +1,56 @@
++/****************************************************************************
++**
++** Copyright (C) 2019 Gerasim Troeglazov <3dEyes@gmail.com>
++** Contact: https://www.qt.io/licensing/
++**
++** This file is part of the QtNetwork module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and The Qt Company. For licensing terms
++** and conditions see https://www.qt.io/terms-conditions. For further
++** information use the contact form at https://www.qt.io/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 3 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL3 included in the
++** packaging of this file. Please review the following information to
++** ensure the GNU Lesser General Public License version 3 requirements
++** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 2.0 or (at your option) the GNU General
++** Public license version 3 or any later version approved by the KDE Free
++** Qt Foundation. The licenses are as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
++** included in the packaging of this file. Please review the following
++** information to ensure the GNU General Public License requirements will
++** be met: https://www.gnu.org/licenses/gpl-2.0.html and
++** https://www.gnu.org/licenses/gpl-3.0.html.
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include "qdnslookup_p.h"
++
++QT_BEGIN_NAMESPACE
++
++void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestName, const QHostAddress &nameserver, QDnsLookupReply *reply)
++{
++    Q_UNUSED(requestType);
++    Q_UNUSED(requestName);
++    Q_UNUSED(nameserver);
++    Q_UNUSED(reply);
++    qWarning("Not yet supported on Haiku");
++    reply->error = QDnsLookup::ResolverError;
++    reply->errorString = tr("Not yet supported on Haiku");
++    return;
++}
++
++QT_END_NAMESPACE
+-- 
+2.21.0
 

dev-qt/qt5/qt5-5.12.2.recipe → dev-qt/qt5/qt5-5.12.3.recipe

@@ -9,7 +9,7 @@ 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="59b8cb4e728450b21224dcaaa40eb25bafc5196b6988f2225c394c6b7f881ff5"
+CHECKSUM_SHA256="6462ac74c00ff466487d8ef8d0922971aa5b1d5b33c0753308ec9d57711f5a42"
 SOURCE_DIR="qt-everywhere-src-${portVersion/\~/-}"
 PATCHES="qt5-$portVersion.patchset"
 ADDITIONAL_FILES="
@@ -130,14 +130,14 @@ REQUIRES="
 	lib:libgstapp_1.0$secondaryArchSuffix
 	lib:libgstaudio_1.0$secondaryArchSuffix
 	lib:libgstbadaudio_1.0$secondaryArchSuffix
-	lib:libgstbadvideo_1.0$secondaryArchSuffix
 	lib:libgstreamer_1.0$secondaryArchSuffix
 	lib:libgstvideo_1.0$secondaryArchSuffix
 	lib:libicudata$secondaryArchSuffix
 	lib:libicui18n$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
+	lib:libopenal$secondaryArchSuffix
 	lib:libpcre2_16$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
@@ -370,13 +370,13 @@ BUILD_REQUIRES="
 	devel:libgstapp_1.0$secondaryArchSuffix
 	devel:libgstaudio_1.0$secondaryArchSuffix
 	devel:libgstbadaudio_1.0$secondaryArchSuffix
-	devel:libgstbadvideo_1.0$secondaryArchSuffix
 	devel:libgstbase_1.0$secondaryArchSuffix
 	devel:libgstpbutils_1.0$secondaryArchSuffix
 	devel:libgstreamer_1.0$secondaryArchSuffix
 	devel:libgstvideo_1.0$secondaryArchSuffix
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
+	devel:libopenal$secondaryArchSuffix
 	devel:liborc_0.4$secondaryArchSuffix
 	devel:libpcre2_16$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
@@ -519,8 +519,8 @@ INSTALL()
 	ln -s $appsDir/Qt5/Linguist $binDir/linguist
 	mv $binDir/qdoc $appsDir/Qt5/qdoc
 	ln -s $appsDir/Qt5/qdoc $binDir/qdoc
-	cp -f /system/$relativeLibDir/libclang* $appsDir/Qt5/lib
-	strip $appsDir/Qt5/lib/*
+	cp -f /system/$relativeLibDir/libclang.so.5 $appsDir/Qt5/lib
+	strip $appsDir/Qt5/lib/libclang*
 
 	toolsCommands="assistant designer lconvert linguist lrelease lupdate pixeltool
 		qcollectiongenerator qdistancefieldgenerator qdbus qdbuscpp2xml qdbusviewer qdbusxml2cpp