diff --git a/dev-qt/qt5/patches/qt5base-5.5.patchset b/dev-qt/qt5/patches/qt5base-5.5.patchset index 2d8810bda..8a103e301 100644 --- a/dev-qt/qt5/patches/qt5base-5.5.patchset +++ b/dev-qt/qt5/patches/qt5base-5.5.patchset @@ -1,7 +1,7 @@ -From 8f27586b1e96ad377ac84bc6853fd522cdd09af2 Mon Sep 17 00:00:00 2001 +From cbfe432283334a5315a7a04184b7bc1533899f70 Mon Sep 17 00:00:00 2001 From: Tobias Koenig Date: Fri, 13 Feb 2015 14:04:34 +0000 -Subject: [PATCH] Haiku: Fix tst_qfileselector.cpp unit test +Subject: Haiku: Fix tst_qfileselector.cpp unit test Add the missing test data for haiku platform selector and adapt unit test to use them. @@ -9,16 +9,6 @@ and adapt unit test to use them. Change-Id: I578e7f7e04f2a4c68f23d5356ea201e9562dbe6c Reviewed-by: Augustin Cavalier Reviewed-by: Thiago Macieira ---- - tests/auto/corelib/io/qfileselector/platforms/+haiku/test | 0 - tests/auto/corelib/io/qfileselector/platforms/+haiku/test2 | 0 - tests/auto/corelib/io/qfileselector/platforms/+unix/+haiku/test | 0 - tests/auto/corelib/io/qfileselector/qfileselector.qrc | 3 +++ - tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp | 2 +- - 5 files changed, 4 insertions(+), 1 deletion(-) - create mode 100644 tests/auto/corelib/io/qfileselector/platforms/+haiku/test - create mode 100644 tests/auto/corelib/io/qfileselector/platforms/+haiku/test2 - create mode 100644 tests/auto/corelib/io/qfileselector/platforms/+unix/+haiku/test diff --git a/tests/auto/corelib/io/qfileselector/platforms/+haiku/test b/tests/auto/corelib/io/qfileselector/platforms/+haiku/test new file mode 100644 @@ -70,14 +60,14 @@ index b3767b4..87381f4 100644 /* We are only aware of specific unixes, and do not have test files for any of the others. However those unixes can get a selector added from the result of a uname call, so this will lead to a case where we don't have that file so we can't expect the concatenation of platform ---- -git 2.2.2 +-- +2.2.2 -From 7dd5726380f5d5422edd4b71c6beba6d02b4e3df Mon Sep 17 00:00:00 2001 +From 55967193f3a139e84877ab5c737157a3c3291764 Mon Sep 17 00:00:00 2001 From: Tobias Koenig Date: Fri, 20 Feb 2015 15:47:02 +0000 -Subject: [PATCH] Haiku: Fix clipboard implementation +Subject: Haiku: Fix clipboard implementation Fix the behavior of the clipboard implementation to pass the unit test. @@ -85,10 +75,6 @@ to pass the unit test. Change-Id: Ia8d5428eebf17a626565e8f4a4d895a67f35b20b Reviewed-by: Augustin Cavalier Reviewed-by: Maurice Kalinowski ---- - src/plugins/platforms/haiku/qhaikuclipboard.cpp | 45 ++++++++++++++++++++----- - src/plugins/platforms/haiku/qhaikuclipboard.h | 4 +++ - 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/src/plugins/platforms/haiku/qhaikuclipboard.cpp b/src/plugins/platforms/haiku/qhaikuclipboard.cpp index f3aa9dc..a2d7e96 100644 @@ -202,7 +188,7 @@ diff --git a/src/plugins/platforms/haiku/qhaikuclipboard.h b/src/plugins/platfor index 0dc2bfd..3c1f92c 100644 --- a/src/plugins/platforms/haiku/qhaikuclipboard.h +++ b/src/plugins/platforms/haiku/qhaikuclipboard.h -@@ -55,6 +55,10 @@ class QHaikuClipboard : public QPlatformClipboard, public BHandler +@@ -55,6 +55,10 @@ public: // override from BHandler to catch change notifications from Haiku clipboard void MessageReceived(BMessage* message) Q_DECL_OVERRIDE; @@ -213,14 +199,14 @@ index 0dc2bfd..3c1f92c 100644 }; QT_END_NAMESPACE ---- -git 2.2.2 +-- +2.2.2 -From 8a51ca091873d099a2816b3d19f21fef618d9ab8 Mon Sep 17 00:00:00 2001 +From 0798b7fd09c1399728af833005f7f963775e9921 Mon Sep 17 00:00:00 2001 From: Tobias Koenig Date: Sat, 2 May 2015 12:29:00 +0000 -Subject: [PATCH] Haiku: Fix compilation after QPA API change +Subject: Haiku: Fix compilation after QPA API change Remove the calls to QWindowSystemInterface::setSynchronousWindowsSystemEvents in the Haiku QPA plugin, because the method was renamed in latest QPA API and @@ -229,9 +215,6 @@ we do not really have to call them anyway (was a copy&paste leftover from QNX QP Change-Id: I67db43e89c093e5679f11d967d609846008cad0d Reviewed-by: Augustin Cavalier Reviewed-by: Maurice Kalinowski ---- - src/plugins/platforms/haiku/qhaikuwindow.cpp | 4 ---- - 1 file changed, 4 deletions(-) diff --git a/src/plugins/platforms/haiku/qhaikuwindow.cpp b/src/plugins/platforms/haiku/qhaikuwindow.cpp index 5768e1c..140b79a 100644 @@ -259,23 +242,20 @@ index 5768e1c..140b79a 100644 if ((m_windowState == Qt::WindowMaximized) && !zoomInProgress) { // the user has resized the window while maximized -> reset maximized flag ---- -git 2.2.2 +-- +2.2.2 -From 85d9403a129100c00ef096baa01c3c024d0f705a Mon Sep 17 00:00:00 2001 +From fd3a69d4358900797f34a44941547bb9965f510e Mon Sep 17 00:00:00 2001 From: Tobias Koenig Date: Fri, 27 Feb 2015 18:24:43 +0000 -Subject: [PATCH] Haiku: Enable FreeType2/FontConfig support +Subject: Haiku: Enable FreeType2/FontConfig support Pass the correct include path to the config test, otherwise compilation will fail. Change-Id: I6723cad41ec289b051dcc9c47b3b1d67af7c5879 Reviewed-by: Oswald Buddenhagen ---- - config.tests/unix/freetype/freetype.pri | 1 + - 1 file changed, 1 insertion(+) diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri index be2fc33..05299ed 100644 @@ -289,14 +269,14 @@ index be2fc33..05299ed 100644 for(p, TRY_INCLUDEPATHS) { p = $$join(p, "", "", "/freetype2") exists($$p):INCLUDEPATH *= $$p ---- -git 2.2.2 +-- +2.2.2 -From 5f21aa22fbc224cdd4102ae6a7797574a463af3b Mon Sep 17 00:00:00 2001 +From 72ee7d9936c4774067b64aa54f7b53183a00db98 Mon Sep 17 00:00:00 2001 From: Tobias Koenig Date: Sat, 2 May 2015 12:50:25 +0000 -Subject: [PATCH] Haiku: Fix reported geometry of platform window +Subject: Haiku: Fix reported geometry of platform window Report the proper window geometry and adapt the geometry parameters of expose events to be relative @@ -304,9 +284,6 @@ to the window coordinate system. Change-Id: Ifb32b2663fdf41df0c9783e76e0ebc5e5cf978a3 Reviewed-by: Maurice Kalinowski ---- - src/plugins/platforms/haiku/qhaikuwindow.cpp | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/plugins/platforms/haiku/qhaikuwindow.cpp b/src/plugins/platforms/haiku/qhaikuwindow.cpp index 140b79a..9622d12 100644 @@ -356,14 +333,14 @@ index 140b79a..9622d12 100644 if ((m_windowState == Qt::WindowMaximized) && !zoomInProgress) { // the user has resized the window while maximized -> reset maximized flag ---- -git 2.2.2 +-- +2.2.2 -From f80b103910cc936e16c247fefb2daa781e09d17e Mon Sep 17 00:00:00 2001 +From 5bdb6f63e033d1de0cb8513ffefbf85fc5063344 Mon Sep 17 00:00:00 2001 From: Tobias Koenig Date: Thu, 19 Feb 2015 14:10:53 +0000 -Subject: [PATCH] Haiku: Fix QWaitCondition on Haiku +Subject: Haiku: Fix QWaitCondition on Haiku The latest version of Haiku provides the implementation for pthread_condattr_setclock, so we can enable the code @@ -373,9 +350,6 @@ correctly. Change-Id: Ibb9ad33d873c3b34f2c516087c4e0aeac04cc83f Reviewed-by: Augustin Cavalier Reviewed-by: Thiago Macieira ---- - src/corelib/thread/qwaitcondition_unix.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/thread/qwaitcondition_unix.cpp b/src/corelib/thread/qwaitcondition_unix.cpp index fd6af7d..89bf523 100644 @@ -390,5 +364,69 @@ index fd6af7d..89bf523 100644 if (QElapsedTimer::clockType() == QElapsedTimer::MonotonicClock) pthread_condattr_setclock(&condattr, CLOCK_MONOTONIC); #endif --- -git 2.2.2 +-- +2.2.2 + + +From 0dae6e42d3e2c477b279cfbfe447d495f716a3b8 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Thu, 15 Oct 2015 21:13:27 +1000 +Subject: Fix Haiku paths + + +diff --git a/src/corelib/io/qstandardpaths_haiku.cpp b/src/corelib/io/qstandardpaths_haiku.cpp +index a565b10..adc2992 100644 +--- a/src/corelib/io/qstandardpaths_haiku.cpp ++++ b/src/corelib/io/qstandardpaths_haiku.cpp +@@ -134,20 +134,20 @@ QString QStandardPaths::writableLocation(StandardLocation type) + case HomeLocation: + return haikuStandardPath(B_USER_DIRECTORY); + case FontsLocation: +- return haikuStandardPath(B_USER_NONPACKAGED_FONTS_DIRECTORY); +- case ApplicationsLocation: +- return haikuStandardPath(B_USER_NONPACKAGED_BIN_DIRECTORY); ++ return haikuStandardPath(B_SYSTEM_FONTS_DIRECTORY); ++// case ApplicationsLocation: ++// return haikuStandardPath(B_USER_NONPACKAGED_BIN_DIRECTORY); + case TempLocation: + return haikuStandardPath(B_SYSTEM_TEMP_DIRECTORY); + case AppDataLocation: // fall through + case AppLocalDataLocation: +- return haikuAppStandardPath(B_USER_NONPACKAGED_DATA_DIRECTORY); ++ return haikuAppStandardPath(B_SYSTEM_DATA_DIRECTORY); + case GenericDataLocation: +- return haikuStandardPath(B_USER_NONPACKAGED_DATA_DIRECTORY); ++ return haikuStandardPath(B_SYSTEM_DATA_DIRECTORY); + case CacheLocation: + return haikuAppStandardPath(B_USER_CACHE_DIRECTORY); + case GenericCacheLocation: +- return haikuStandardPath(B_USER_CACHE_DIRECTORY); ++ return haikuStandardPath(B_SYSTEM_CACHE_DIRECTORY); + case ConfigLocation: // fall through + case AppConfigLocation: + return haikuAppStandardPath(B_USER_SETTINGS_DIRECTORY); +@@ -173,7 +173,7 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) + case MoviesLocation: + case DownloadLocation: + case HomeLocation: +- paths += haikuStandardPath(B_USER_NONPACKAGED_DIRECTORY); ++ paths += haikuStandardPath(B_USER_DIRECTORY); + break; + case FontsLocation: + paths += haikuStandardPaths(B_FIND_PATH_FONTS_DIRECTORY); +@@ -197,10 +197,10 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) + break; + case ConfigLocation: // fall through + case AppConfigLocation: +- paths += haikuAppStandardPath(B_SYSTEM_SETTINGS_DIRECTORY); ++ paths += haikuAppStandardPath(B_USER_SETTINGS_DIRECTORY); + break; + case GenericConfigLocation: +- paths += haikuStandardPath(B_SYSTEM_SETTINGS_DIRECTORY); ++ paths += haikuStandardPath(B_USER_SETTINGS_DIRECTORY); + break; + default: + break; +-- +2.2.2 + diff --git a/dev-qt/qt5/qt5base-5.5.0.recipe b/dev-qt/qt5/qt5base-5.5.0.recipe index 79418d32e..a27d5fcad 100644 --- a/dev-qt/qt5/qt5base-5.5.0.recipe +++ b/dev-qt/qt5/qt5base-5.5.0.recipe @@ -20,7 +20,10 @@ SOURCE_URI_3="https://download.qt.io/official_releases/qt/5.5/$portVersion/submo CHECKSUM_SHA256_3="c4bd6db6e426965c6f8824c54e81f68bbd61e2bae1bcadc328c6e81c45902a0d" SOURCE_DIR_3="qttranslations-opensource-src-$portVersion" -REVISION="1" +SOURCE_URI_4="git+https://github.com/threedeyes/QPAHaikuExp#dd88f691e399f238b62cfef0d9ff872af34af77b" + + +REVISION="2" ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="x86" @@ -137,6 +140,9 @@ BUILD_PREREQUIRES=" PATCH() { + rm -rf $sourceDir/src/plugins/platforms/haiku + cp -s $sourceDir4/haiku $sourceDir/src/plugins/platforms/haiku + cd $sourceDir2 sed -i s/__linux__/__HAIKU__/g \ src/assistant/3rdparty/clucene/src/CLucene/config/compiler.h