Hi All,
straightforward patch to 4.2.1.
- bump some SHARED_LIBS (nm(1) checks)
- Fix WANTLIB, NO_TEST
- remove qtwebkit
- fix one tab
Best regards,
Rafael Sadowski
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/qt-creator/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile 31 Dec 2016 12:53:42 -0000 1.20
+++ Makefile 28 Jan 2017 20:19:33 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.20 2016/12/31 12:53:42 zhuk Exp $
COMMENT = cross-platform IDE for use with Qt
-V = 4.1.0
+V = 4.2.1
DISTNAME = qt-creator-opensource-src-${V}
PKGNAME = qt-creator-${V}
@@ -11,20 +11,21 @@ PKGNAME = qt-creator-${V}
SHARED_LIBS += Aggregation 0.0 # 0.0
SHARED_LIBS += CPlusPlus 0.0 # 0.0
-SHARED_LIBS += ExtensionSystem 0.0 # 0.0
+SHARED_LIBS += ExtensionSystem 0.1 # 0.0
SHARED_LIBS += GLSL 0.0 # 0.0
SHARED_LIBS += LanguageUtils 0.0 # 0.0
-SHARED_LIBS += QmlDebug 0.0 # 0.0
+SHARED_LIBS += QmlDebug 0.1 # 0.0
SHARED_LIBS += QmlEditorWidgets 0.0 # 0.0
-SHARED_LIBS += QmlJS 0.0 # 0.0
+SHARED_LIBS += QmlJS 0.1 # 0.0
SHARED_LIBS += QtcSsh 0.0 # 0.0
-SHARED_LIBS += Utils 0.0 # 0.0
-SHARED_LIBS += qbscore 0.0 # 0.0
-SHARED_LIBS += Clangbackendipc 1.0 # 1.0
-SHARED_LIBS += Sqlite 1.0 # 1.0
-SHARED_LIBS += Timeline 1.0 # 1.0
+SHARED_LIBS += Utils 0.1 # 0.0
+SHARED_LIBS += qbscore 0.1 # 0.0
+SHARED_LIBS += Clangbackendipc 1.1 # 1.0
+SHARED_LIBS += Sqlite 1.1 # 1.0
+SHARED_LIBS += Timeline 1.1 # 1.0
SHARED_LIBS += qbsqtprofilesetup 1.4 # 1.4
SHARED_LIBS += Modeling 1.0 # 1.0
+SHARED_LIBS += FlameGraph 0.0 # 4.2
MAKE_FLAGS = BUILD_TESTS=1
.for _l _v in ${SHARED_LIBS}
@@ -38,11 +39,10 @@ HOMEPAGE = https://www.qt.io/ide/
# XXX GPLv3 with some exceptions
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += c kvm m pthread
WANTLIB += GL Qt5Concurrent Qt5Core Qt5Designer Qt5DesignerComponents
WANTLIB += Qt5Gui Qt5Help Qt5Network Qt5PrintSupport Qt5Qml Qt5Quick
-WANTLIB += Qt5QuickWidgets Qt5Script Qt5Sql Qt5Svg Qt5WebKit Qt5WebKitWidgets
-WANTLIB += Qt5Widgets Qt5Xml
+WANTLIB += Qt5QuickWidgets Qt5Script Qt5Sql Qt5Svg Qt5Widgets
+WANTLIB += Qt5Xml c kvm m pthread
MASTER_SITES = https://download.qt.io/official_releases/qtcreator/${V:R}/${V}/
@@ -69,14 +69,13 @@ RUN_DEPENDS = devel/gdb \
LIB_DEPENDS = x11/qt5/qtdeclarative \
x11/qt5/qtscript \
x11/qt5/qtsvg \
- x11/qt5/qttools \
- x11/qt5/qtwebkit
+ x11/qt5/qttools
PORTHOME = ${WRKDIR}
ALL_TARGET = all qch_docs
-#NO_TEST = Yes
+NO_TEST = Yes
FAKE_FLAGS = INSTALL_ROOT=${WRKINST}${TRUEPREFIX}
GDB_ADJ_FILES = \
@@ -95,6 +94,6 @@ post-install:
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/qtcreator
${INSTALL_DATA} ${WRKBUILD}/share/doc/qtcreator/qtcreator.qch \
- ${PREFIX}/share/doc/qtcreator/qtcreator.qch
+ ${PREFIX}/share/doc/qtcreator/qtcreator.qch
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/qt-creator/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 26 Dec 2016 15:26:01 -0000 1.3
+++ distinfo 28 Jan 2017 20:19:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt-creator-opensource-src-4.1.0.tar.gz) =
QSwCI9v9hpg7OeEOLHy0K1MJlc/i86o1Keo/GwD/tAM=
-SIZE (qt-creator-opensource-src-4.1.0.tar.gz) = 22342296
+SHA256 (qt-creator-opensource-src-4.2.1.tar.gz) =
JTfC/NEnE2JB0L87+eHwPPNb4aJEFEedVQKnU5yiWjg=
+SIZE (qt-creator-opensource-src-4.2.1.tar.gz) = 22572953
Index: patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
===================================================================
RCS file:
/cvs/ports/devel/qt-creator/patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1
patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
--- patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
26 Dec 2016 15:26:01 -0000 1.1
+++ patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
28 Jan 2017 20:19:33 -0000
@@ -4,9 +4,9 @@ When calling gmake, override the CXX and
by qmake by setting gmake's command line arguments. Makes it possible to
compile C++11 code.
---- src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp.orig Tue Aug
23 14:36:42 2016
-+++ src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp Fri Dec
16 09:57:01 2016
-@@ -677,6 +677,7 @@ void QmakeBuildConfigurationFactory::configureBuildCon
+--- src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp.orig Thu Jan
19 16:04:00 2017
++++ src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp Thu Jan
26 23:22:01 2017
+@@ -671,6 +671,7 @@ void QmakeBuildConfigurationFactory::configureBuildCon
buildSteps->insertStep(0, qmakeStep);
MakeStep *makeStep = new MakeStep(buildSteps);
Index: patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp
===================================================================
RCS file:
/cvs/ports/devel/qt-creator/patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1
patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp
--- patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp 26 Dec
2016 15:26:01 -0000 1.1
+++ patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp 28 Jan
2017 20:19:33 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp,v 1.1
2016/12/26 15:26:01 zhuk Exp $
---- src/shared/qbs/src/lib/corelib/tools/processutils.cpp.orig Fri Aug 19
09:23:24 2016
-+++ src/shared/qbs/src/lib/corelib/tools/processutils.cpp Fri Dec 16
09:57:01 2016
-@@ -40,6 +40,11 @@
+--- src/shared/qbs/src/lib/corelib/tools/processutils.cpp.orig Thu Jan 5
18:01:57 2017
++++ src/shared/qbs/src/lib/corelib/tools/processutils.cpp Thu Jan 26
23:22:01 2017
+@@ -49,6 +49,11 @@
# include "fileinfo.h"
# include <unistd.h>
# include <cstdio>
@@ -13,7 +13,7 @@ $OpenBSD: patch-src_shared_qbs_src_lib_c
#elif defined(Q_OS_BSD4)
# include <QFile>
# include <sys/cdefs.h>
-@@ -85,6 +90,19 @@ QString processNameByPid(qint64 pid)
+@@ -94,6 +99,19 @@ QString processNameByPid(qint64 pid)
sprintf(exePath, "/proc/%lld/exe", pid);
readlink(exePath, buf, sizeof(buf));
return FileInfo::fileName(QString::fromUtf8(buf));
Index: patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri
===================================================================
RCS file:
/cvs/ports/devel/qt-creator/patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_shared_qbs_src_lib_corelib_tools_tools_pri
--- patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri 26 Dec
2016 15:26:01 -0000 1.1
+++ patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri 28 Jan
2017 20:19:33 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_shared_qbs_src_lib_corelib_tools_tools_pri,v 1.1
2016/12/26 15:26:01 zhuk Exp $
---- src/shared/qbs/src/lib/corelib/tools/tools.pri.orig Fri Aug 19
09:23:24 2016
-+++ src/shared/qbs/src/lib/corelib/tools/tools.pri Fri Dec 16 09:57:01 2016
-@@ -88,6 +88,8 @@ osx {
+--- src/shared/qbs/src/lib/corelib/tools/tools.pri.orig Thu Jan 5
18:01:57 2017
++++ src/shared/qbs/src/lib/corelib/tools/tools.pri Thu Jan 26 23:22:01 2017
+@@ -93,6 +93,8 @@ osx {
LIBS += -framework Security
}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/qt-creator/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 26 Dec 2016 15:26:01 -0000 1.3
+++ pkg/PLIST 28 Jan 2017 20:19:33 -0000
@@ -12,6 +12,7 @@ bin/qtcreator.sh
@lib lib/libCPlusPlus.so.${LIBCPlusPlus_VERSION}
@lib lib/libClangbackendipc.so.${LIBClangbackendipc_VERSION}
@lib lib/libExtensionSystem.so.${LIBExtensionSystem_VERSION}
+@lib lib/libFlameGraph.so.${LIBFlameGraph_VERSION}
@lib lib/libGLSL.so.${LIBGLSL_VERSION}
@lib lib/libLanguageUtils.so.${LIBLanguageUtils_VERSION}
@lib lib/libModeling.so.${LIBModeling_VERSION}
@@ -29,6 +30,7 @@ lib/qtcreator/
@lib lib/qtcreator/libCPlusPlus.so.${LIBCPlusPlus_VERSION}
@lib lib/qtcreator/libClangbackendipc.so.${LIBClangbackendipc_VERSION}
@lib lib/qtcreator/libExtensionSystem.so.${LIBExtensionSystem_VERSION}
+@lib lib/qtcreator/libFlameGraph.so.${LIBFlameGraph_VERSION}
@lib lib/qtcreator/libGLSL.so.${LIBGLSL_VERSION}
@lib lib/qtcreator/libLanguageUtils.so.${LIBLanguageUtils_VERSION}
@lib lib/qtcreator/libModeling.so.${LIBModeling_VERSION}
@@ -90,6 +92,7 @@ lib/qtcreator/plugins/libQnx.so
lib/qtcreator/plugins/libQtSupport.so
lib/qtcreator/plugins/libRemoteLinux.so
lib/qtcreator/plugins/libResourceEditor.so
+lib/qtcreator/plugins/libScxmlEditor.so
lib/qtcreator/plugins/libSubversion.so
lib/qtcreator/plugins/libTaskList.so
lib/qtcreator/plugins/libTextEditor.so
@@ -132,11 +135,13 @@ share/qtcreator/debugger/
share/qtcreator/debugger/LICENSE.GPL3-EXCEPT
share/qtcreator/debugger/README.txt
share/qtcreator/debugger/boosttypes.py
+share/qtcreator/debugger/cdbbridge.py
share/qtcreator/debugger/creatortypes.py
share/qtcreator/debugger/dumper.py
share/qtcreator/debugger/gdbbridge.py
share/qtcreator/debugger/lldbbridge.py
share/qtcreator/debugger/misctypes.py
+share/qtcreator/debugger/opencvtypes.py
share/qtcreator/debugger/pdbbridge.py
share/qtcreator/debugger/personaltypes.py
share/qtcreator/debugger/qttypes.py
@@ -278,6 +283,7 @@ share/qtcreator/qbs/share/qbs/imports/qb
share/qtcreator/qbs/share/qbs/imports/qbs/Probes/FrameworkProbe.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/Probes/GccProbe.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/Probes/IncludeProbe.qbs
+share/qtcreator/qbs/share/qbs/imports/qbs/Probes/InnoSetupProbe.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/Probes/JdkProbe.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/Probes/MsvcProbe.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/Probes/NodeJsProbe.qbs
@@ -298,6 +304,7 @@ share/qtcreator/qbs/share/qbs/imports/qb
share/qtcreator/qbs/share/qbs/imports/qbs/base/AutotestRunner.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/base/CppApplication.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/base/DynamicLibrary.qbs
+share/qtcreator/qbs/share/qbs/imports/qbs/base/InnoSetup.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/base/InstallPackage.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/base/JavaClassCollection.qbs
share/qtcreator/qbs/share/qbs/imports/qbs/base/JavaJarFile.qbs
@@ -352,6 +359,8 @@ share/qtcreator/qbs/share/qbs/modules/cp
share/qtcreator/qbs/share/qbs/modules/ib/
share/qtcreator/qbs/share/qbs/modules/ib/IBModule.qbs
share/qtcreator/qbs/share/qbs/modules/ib/ib.js
+share/qtcreator/qbs/share/qbs/modules/innosetup/
+share/qtcreator/qbs/share/qbs/modules/innosetup/InnoSetupModule.qbs
share/qtcreator/qbs/share/qbs/modules/java/
share/qtcreator/qbs/share/qbs/modules/java/JavaModule.qbs
share/qtcreator/qbs/share/qbs/modules/java/io/
@@ -487,6 +496,8 @@ share/qtcreator/qml/qmlpuppet/container/
share/qtcreator/qml/qmlpuppet/container/informationcontainer.h
share/qtcreator/qml/qmlpuppet/container/instancecontainer.cpp
share/qtcreator/qml/qmlpuppet/container/instancecontainer.h
+share/qtcreator/qml/qmlpuppet/container/mockuptypecontainer.cpp
+share/qtcreator/qml/qmlpuppet/container/mockuptypecontainer.h
share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.cpp
share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h
share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.cpp
@@ -515,6 +526,7 @@ share/qtcreator/qml/qmlpuppet/interfaces
share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp
share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h
share/qtcreator/qml/qmlpuppet/mockfiles/
+share/qtcreator/qml/qmlpuppet/mockfiles/GenericBackend.qml
share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml
share/qtcreator/qml/qmlpuppet/qml2puppet/
share/qtcreator/qml/qmlpuppet/qml2puppet/Info.plist
@@ -611,6 +623,7 @@ share/qtcreator/qmldesigner/propertyEdit
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/DoubleSpinBox.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExpandingSpacer.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExpressionTextField.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FlickableSection.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml
@@ -623,6 +636,7 @@ share/qtcreator/qmldesigner/propertyEdit
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Label.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/OriginControl.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/PaddingSection.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ScrollView.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SecondColumnLayout.qml
@@ -866,6 +880,10 @@ share/qtcreator/templates/wizards/files/
share/qtcreator/templates/wizards/files/nim/file.nim
share/qtcreator/templates/wizards/files/nim/icon.png
share/qtcreator/templates/wizards/files/nim/wizard.json
+share/qtcreator/templates/wizards/files/nimscript/
+share/qtcreator/templates/wizards/files/nimscript/file.nims
+share/qtcreator/templates/wizards/files/nimscript/icon.png
+share/qtcreator/templates/wizards/files/nimscript/wizard.json
share/qtcreator/templates/wizards/files/python/
share/qtcreator/templates/wizards/files/python/file.py
share/qtcreator/templates/wizards/files/python/wizard.json
@@ -928,14 +946,6 @@ share/qtcreator/templates/wizards/projec
share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/threejs/3rdparty/three.js
share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/threejs/glcode.js
share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/wizard.json
-share/qtcreator/templates/wizards/projects/qmake/qtlabscontrolsapplication/
-share/qtcreator/templates/wizards/projects/qmake/qtlabscontrolsapplication/Page1.qml.tpl
-share/qtcreator/templates/wizards/projects/qmake/qtlabscontrolsapplication/Page1Form.ui.qml.tpl
-share/qtcreator/templates/wizards/projects/qmake/qtlabscontrolsapplication/app.pro
-share/qtcreator/templates/wizards/projects/qmake/qtlabscontrolsapplication/main.cpp
-share/qtcreator/templates/wizards/projects/qmake/qtlabscontrolsapplication/main.qml.tpl
-share/qtcreator/templates/wizards/projects/qmake/qtlabscontrolsapplication/qml.qrc
-share/qtcreator/templates/wizards/projects/qmake/qtlabscontrolsapplication/wizard.json
share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/
share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/MainForm.ui.qml.tpl
share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/app.pro
@@ -951,6 +961,7 @@ share/qtcreator/templates/wizards/projec
share/qtcreator/templates/wizards/projects/qmake/qtquickcontrols2application/main.cpp
share/qtcreator/templates/wizards/projects/qmake/qtquickcontrols2application/main.qml.tpl
share/qtcreator/templates/wizards/projects/qmake/qtquickcontrols2application/qml.qrc
+share/qtcreator/templates/wizards/projects/qmake/qtquickcontrols2application/qtquickcontrols2.conf
share/qtcreator/templates/wizards/projects/qmake/qtquickcontrols2application/wizard.json
share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/
share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/MainForm.ui.qml.tpl
