diff --git a/dev-qt/qt_creator/additional-files/qt_creator.rdef.in b/dev-qt/qt_creator/additional-files/qt_creator.rdef.in new file mode 100644 index 000000000..cd822a378 --- /dev/null +++ b/dev-qt/qt_creator/additional-files/qt_creator.rdef.in @@ -0,0 +1,42 @@ + +resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY; + +resource app_version { + major = @MAJOR@, + middle = @MIDDLE@, + minor = @MINOR@, + + variety = B_APPV_FINAL, + internal = 0, + + short_info = "Qt Creator", + long_info = "@LONG_INFO@" +}; + +resource app_signature "@APP_SIGNATURE@"; + +resource file_types message { + "types" = "text/x-jamfile", + "types" = "text/x-Makefile", + "types" = "text/x-patch", + types" = "text/x-source-code" +}; + +resource vector_icon { + $"6E63696604035AA72D05E3059505FF060606F204C635C6EAB516B516B9C7B516" + $"B9C7B516B77BB940B59EB6F3B59EB940B59EC635C6EA0204C006CA6DC8BBCAE4" + $"C006CA6DC33CC1EBBD18C46DC586C125CAE9BD1FC926BF2FCAE9BD1FC9A1C282" + $"CA3DBF5DC905C5A806033BC02ECA35C02ECA35C20BC89ECA45BE36C0DACA35C3" + $"D7C7B7C0DACA35020BBDF7C3BABDF7C3BABCDAC3BABB34C1F2BBB3C34FBA2BC1" + $"F4B8A7C0C0B951C18EB7FCBFF3B7A7BDB9B7A7BEF0B7A7BC5DB8AABA7EB7FDBB" + $"49B957B9B2BB6FB94CBA43B94CBC7DB94CBE00BA78BD58B9B0BEA8BB40BEFCBD" + $"85BEFCBC44BEFCBEA2BE4AC053BEC1BF91BDE6C0F7BC8245BD2EC17DBC8245BD" + $"F8C29FBC82C29FBDF8C29F0208B98EBDA3B98EBC91B98EBEB6BA0AC039B9B7BF" + $"93BA5CC0DFBB4BC132BAC7C132BBD9C132BC99C043BC48C0E2BCEABFA4BD13BD" + $"A7BD13BEC5BD13BC81BC9CBAFFBCEBBB9EBC4DBA5FBB56BA0FBBE0BA0FBACFBA" + $"0FBA0DBB0CBA61BA63B9B9BBB406117F441AF103C321C1C0C321C1C0C29CC1E0" + $"C22AC1DFC28DC1DFC11AC1DFC087C01BC087C149C087C01BBCE3BF7DBBD8C087" + $"BB88C0D7BA0DC192BA0EBBD8C321BCE3C192C192BFEBC192BFEBC192C04FC1C5" + $"C0C1C19EC09BC223C120C321C0CEC2DDC0E8C321C0CE050A000100000A010101" + $"000A020102000A03020304000A03010500" +}; diff --git a/dev-qt/qt_creator/patches/qt_creator-4.1.0.patch b/dev-qt/qt_creator/patches/qt_creator-4.1.0.patch deleted file mode 100644 index 4ff8d5ecf..000000000 --- a/dev-qt/qt_creator/patches/qt_creator-4.1.0.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 7acb43790ea653013031874e15d93486502dd48d Mon Sep 17 00:00:00 2001 -From: Augustin Cavalier -Date: Fri, 21 Oct 2016 18:10:37 -0400 -Subject: [PATCH] Haiku fixes. - ---- - .../qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp | 2 +- - share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri | 2 +- - src/libs/sqlite/sqlite-lib.pri | 2 +- - src/libs/utils/process_stub_unix.c | 4 ++++ - src/plugins/qmldesigner/qmldesignerplugin.pro | 2 +- - src/shared/qbs/src/lib/corelib/tools/processutils.cpp | 2 ++ - 6 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp -index 449e4ff..5ddf877 100644 ---- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp -+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp -@@ -43,7 +43,7 @@ - namespace QmlDesigner { - static void prioritizeDown() - { --#if defined(Q_OS_UNIX) -+#if defined(Q_OS_UNIX) && !defined(Q_OS_HAIKU) - nice(19); - #elif defined(Q_OS_WIN) - SetPriorityClass(GetCurrentProcess(), BELOW_NORMAL_PRIORITY_CLASS); -diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri -index 5a10394..2848740 100644 ---- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri -+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri -@@ -23,7 +23,7 @@ RESOURCES += $$PWD/../qmlpuppet.qrc - - DISTFILES += Info.plist - --unix:!openbsd:!osx: LIBS += -lrt # posix shared memory -+unix:!openbsd:!osx:!haiku: LIBS += -lrt # posix shared memory - - osx { - CONFIG -= app_bundle -diff --git a/src/libs/sqlite/sqlite-lib.pri b/src/libs/sqlite/sqlite-lib.pri -index f8ef1c1..405c747 100644 ---- a/src/libs/sqlite/sqlite-lib.pri -+++ b/src/libs/sqlite/sqlite-lib.pri -@@ -6,7 +6,7 @@ contains(CONFIG, dll) { - - INCLUDEPATH += $$PWD - --unix:!bsd: LIBS += -ldl -+unix:!bsd:!haiku: LIBS += -ldl - - include(../3rdparty/sqlite/sqlite.pri) - -diff --git a/src/libs/utils/process_stub_unix.c b/src/libs/utils/process_stub_unix.c -index 145d31d..75c6eca 100644 ---- a/src/libs/utils/process_stub_unix.c -+++ b/src/libs/utils/process_stub_unix.c -@@ -1,3 +1,4 @@ -+#if 0 - /**************************************************************************** - ** - ** Copyright (C) 2016 The Qt Company Ltd. -@@ -174,8 +175,10 @@ static void sigchldHandler(int sig) - - /* syntax: $0 {"run"|"debug"} */ - /* exit codes: 0 = ok, 1 = invocation error, 3 = internal error */ -+#endif - int main(int argc, char *argv[]) - { -+#if 0 - int errNo, hadInvalidCommand = 0; - char **env = 0; - struct sockaddr_un sau; -@@ -358,5 +361,6 @@ int main(int argc, char *argv[]) - } - } - assert(0); -+#endif - return 0; - } -diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro -index 8499afd..ee756e9 100644 ---- a/src/plugins/qmldesigner/qmldesignerplugin.pro -+++ b/src/plugins/qmldesigner/qmldesignerplugin.pro -@@ -4,7 +4,7 @@ CONFIG += exceptions - - INCLUDEPATH += $$PWD - --unix:!openbsd:!osx: LIBS += -lrt # posix shared memory -+unix:!openbsd:!osx:!haiku: LIBS += -lrt # posix shared memory - - include(../../qtcreatorplugin.pri) - -diff --git a/src/shared/qbs/src/lib/corelib/tools/processutils.cpp b/src/shared/qbs/src/lib/corelib/tools/processutils.cpp -index ec3aa76..35db2b6 100644 ---- a/src/shared/qbs/src/lib/corelib/tools/processutils.cpp -+++ b/src/shared/qbs/src/lib/corelib/tools/processutils.cpp -@@ -48,6 +48,8 @@ - # if !defined(Q_OS_NETBSD) - # include - # endif -+#elif defined(Q_OS_HAIKU) -+// Do nothing. - #else - # error Missing implementation of processNameByPid for this platform. - #endif --- -2.7.0 - diff --git a/dev-qt/qt_creator/patches/qt_creator-4.3.1.patchset b/dev-qt/qt_creator/patches/qt_creator-4.4.0.patchset similarity index 100% rename from dev-qt/qt_creator/patches/qt_creator-4.3.1.patchset rename to dev-qt/qt_creator/patches/qt_creator-4.4.0.patchset diff --git a/dev-qt/qt_creator/qt_creator-4.1.0.recipe b/dev-qt/qt_creator/qt_creator-4.1.0.recipe deleted file mode 100644 index ef72b8329..000000000 --- a/dev-qt/qt_creator/qt_creator-4.1.0.recipe +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY="A complete IDE for C/C++ development from the makers of Qt" -DESCRIPTION="Qt Creator provides a cross-platform, complete integrated \ -development environment (IDE) for application developers to create \ -applications for multiple desktop, embedded, and mobile device platforms, \ -such as Android and iOS." -HOMEPAGE="https://www.qt.io/ide/" -COPYRIGHT="2016 The Qt Company Ltd" -LICENSE="GNU GPL v3" -REVISION="1" -SOURCE_URI="https://download.qt.io/official_releases/qtcreator/4.1/$portVersion/qt-creator-opensource-src-$portVersion.tar.gz" -CHECKSUM_SHA256="412c0223dbfd86983b39e10e2c7cb42b530995cfe2f3aa3529ea3f1b00ffb403" -SOURCE_DIR="qt-creator-opensource-src-$portVersion" -PATCHES="qt_creator-$portVersion.patch" - -ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - qt_creator${secondaryArchSuffix} = $portVersion - app:QtCreator${secondaryArchSuffix} = $portVersion - " -REQUIRES=" - haiku${secondaryArchSuffix} - qt5${secondaryArchSuffix} == 5.5.1 - lib:libGL$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - qt5${secondaryArchSuffix}_devel == 5.5.1 - devel:libGL$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:qmake${secondaryArchSuffix} - cmd:make - cmd:g++${secondaryArchSuffix} - " - -BUILD() -{ - qmake -r - make $jobArgs -} - -INSTALL() -{ - make install INSTALL_ROOT=$appsDir/QtCreator/ - mkdir $appsDir/QtCreator/bin/lib/ - mv $appsDir/QtCreator/lib/qtcreator/*.so* $appsDir/QtCreator/bin/lib/ - - DIR_QT_DEVELOP_DESKBAR="${dataDir}/deskbar/menu/Applications/Qt" - mkdir -p ${DIR_QT_DEVELOP_DESKBAR} - addAppDeskbarSymlink $appsDir/QtCreator/bin/qtcreator "Qt/Creator" -} diff --git a/dev-qt/qt_creator/qt_creator-4.3.1.recipe b/dev-qt/qt_creator/qt_creator-4.4.0.recipe similarity index 64% rename from dev-qt/qt_creator/qt_creator-4.3.1.recipe rename to dev-qt/qt_creator/qt_creator-4.4.0.recipe index 99a06c268..11eb70adb 100644 --- a/dev-qt/qt_creator/qt_creator-4.3.1.recipe +++ b/dev-qt/qt_creator/qt_creator-4.4.0.recipe @@ -4,16 +4,17 @@ development environment (IDE) for application developers to create \ applications for multiple desktop, embedded, and mobile device platforms, \ such as Android and iOS." HOMEPAGE="https://www.qt.io/ide/" -COPYRIGHT="2016 The Qt Company Ltd" +COPYRIGHT="2017 The Qt Company Ltd" LICENSE="GNU GPL v3" REVISION="1" -SOURCE_URI="https://download.qt.io/official_releases/qtcreator/4.3/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz" -CHECKSUM_SHA256="060a8843f988c158ef01bd90221e390f0d4be3ccc8da95abaeb12c7477e7a4ad" +SOURCE_URI="https://download.qt.io/official_releases/qtcreator/4.4/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256="8c97d40a98ceb5dcff7f56668b0942d7a31821439fa76022c0145775c55a6202" SOURCE_DIR="qt-creator-opensource-src-$portVersion" PATCHES="qt_creator-$portVersion.patchset" +ADDITIONAL_FILES="qt_creator.rdef.in" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" -SECONDARY_ARCHITECTURES="?x86" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" qt_creator$secondaryArchSuffix = $portVersion @@ -42,6 +43,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libGL$secondaryArchSuffix devel:libQt5Concurrent$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix devel:libQt5Designer$secondaryArchSuffix @@ -58,7 +60,6 @@ BUILD_REQUIRES=" devel:libQt5Svg$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix devel:libQt5Xml$secondaryArchSuffix - devel:libGL$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:g++$secondaryArchSuffix @@ -74,9 +75,30 @@ BUILD() INSTALL() { - make install INSTALL_ROOT=$appsDir/QtCreator/ + make install INSTALL_ROOT=$appsDir/QtCreator + rm -rf $appsDir/QtCreator/share/icons - DIR_QT_DEVELOP_DESKBAR="${dataDir}/deskbar/menu/Applications/Qt" - mkdir -p ${DIR_QT_DEVELOP_DESKBAR} - addAppDeskbarSymlink $appsDir/QtCreator/bin/qtcreator "Qt/Creator" + # These plugins do not support createPlatformOpenGLContext + rm -rf $appsDir/QtCreator/lib/qtcreator/plugins/libQmlDesigner.so + rm -rf $appsDir/QtCreator/lib/qtcreator/plugins/libQmlProfiler.so + + ln -s $appsDir/QtCreator/bin/qtcreator "$appsDir/QtCreator/Qt Creator" + + local APP_SIGNATURE="application/x-vnd.qt5-qtcreator" + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local LONG_INFO="$SUMMARY" + sed \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + -e "s|@LONG_INFO@|$LONG_INFO|" \ + $portDir/additional-files/qt_creator.rdef.in > qt_creator.rdef + + addResourcesToBinaries qt_creator.rdef $appsDir/QtCreator/bin/qtcreator + + mkdir -p $dataDir/deskbar/menu/Applications/Qt + addAppDeskbarSymlink $appsDir/QtCreator/bin/qtcreator "Qt/Qt Creator" } diff --git a/net-p2p/qbittorrent/additional-files/qbittorrent.rdef b/net-p2p/qbittorrent/additional-files/qbittorrent.rdef.in similarity index 100% rename from net-p2p/qbittorrent/additional-files/qbittorrent.rdef rename to net-p2p/qbittorrent/additional-files/qbittorrent.rdef.in