diff --git a/dev-qt/qt_creator/patches/qt_creator-4.12.0.patchset b/dev-qt/qt_creator/patches/qt_creator-4.12.0.patchset index 9d85f86b9..97107a55e 100644 --- a/dev-qt/qt_creator/patches/qt_creator-4.12.0.patchset +++ b/dev-qt/qt_creator/patches/qt_creator-4.12.0.patchset @@ -1,4 +1,4 @@ -From b4709157faa1a3b36731661a018bc4abbbd2a61d Mon Sep 17 00:00:00 2001 +From 0843848366ec535dcb8f30b4a32855138a9fe68e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 15 Jul 2017 15:42:32 +0200 Subject: apply patch from 4.1.0. @@ -100,7 +100,7 @@ index b27592f..ca5fcd6 100644 2.26.0 -From 1bbe86f642c4cc1e3c3532249a13731218fa45e1 Mon Sep 17 00:00:00 2001 +From 7189970983e565d501147da787b066ee75157900 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 15 Jul 2017 18:20:31 +0200 Subject: Fix rpath handling. @@ -145,10 +145,10 @@ index d0c94a7..cc35826 100644 macx:QMAKE_LFLAGS += -Wl,-rpath,$${QBS_APPS_RPATH_DIR} } -- -2.23.0 +2.26.0 -From 8715ab2fb9c4061190e0bb15f3819c17ce7c97a3 Mon Sep 17 00:00:00 2001 +From b13334e68897b69e3bbcd02367715bbc731cbb4f Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Mon, 25 Jun 2018 16:18:26 +0300 Subject: Enable Terminal on Haiku @@ -197,5 +197,31 @@ index 77daae6..4940d3e 100644 QString UnixUtils::fileBrowser(const QSettings *settings) -- -2.23.0 +2.26.0 + + +From ddb793f906a32e06715d6368a4e8f8d69cf07b0b Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 9 May 2020 20:00:50 +1000 +Subject: Fix rpath + + +diff --git a/src/rpath.pri b/src/rpath.pri +index 6085af2..49dfaf6 100644 +--- a/src/rpath.pri ++++ b/src/rpath.pri +@@ -16,8 +16,9 @@ macos { + IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") + QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' + QMAKE_RPATHDIR = +-} +-haiku { ++} else:haiku-* { ++ QMAKE_RPATHDIR += $ORIGIN/$$REL_PATH_TO_LIBS ++ QMAKE_RPATHDIR += $ORIGIN/$$REL_PATH_TO_PLUGINS + QMAKE_RPATHDIR += $ORIGIN + QMAKE_RPATHDIR += $ORIGIN/.. + QMAKE_RPATHDIR += $ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator +-- +2.26.0 diff --git a/dev-qt/qt_creator/qt_creator-4.12.0.recipe b/dev-qt/qt_creator/qt_creator-4.12.0.recipe index 53fd59b50..eea75152e 100644 --- a/dev-qt/qt_creator/qt_creator-4.12.0.recipe +++ b/dev-qt/qt_creator/qt_creator-4.12.0.recipe @@ -6,7 +6,7 @@ such as Android and iOS." HOMEPAGE="https://www.qt.io/ide/" COPYRIGHT="2020 The Qt Company Ltd" LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="https://download.qt.io/official_releases/qtcreator/${portVersion%.*}/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz" CHECKSUM_SHA256="d76655799ad2af81fb15f85d412d74583659fb1b4cf27b758ad8aae73675948b" SOURCE_DIR="qt-creator-opensource-src-$portVersion"