pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
qtcreator: Update to 4.0.1
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Tue Jun 14 21:45:14 2016 +0200
Changeset: 5de7f805ddd3773ad8c8978bc3d398198deb6e90
Modified Files:
qtcreator/Makefile
qtcreator/distinfo
Added Files:
qtcreator/patches/patch-src_plugins_projectexplorer_abi.cpp
qtcreator/patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils.cpp
Removed Files:
qtcreator/patches/patch-doc_doc.pri
qtcreator/patches/patch-lib_qtcreator_qtcomponents_qtcomponents.pro
qtcreator/patches/patch-share_qtcreator_static.pro
qtcreator/patches/patch-share_qtcreator_translations_translations.pro
qtcreator/patches/patch-src_app_app.pro
qtcreator/patches/patch-src_libs_3rdparty_botan_src_src.pro
qtcreator/patches/patch-src_libs_extensionsystem_extensionsystem.pro
qtcreator/patches/patch-src_libs_glsl_glsllexer.cpp
qtcreator/patches/patch-src_libs_glsl_glslparsertable__p.h
qtcreator/patches/patch-src_libs_qtcomponents_styleitem_styleitem.pro
qtcreator/patches/patch-src_libs_utils_process__stub.pro
qtcreator/patches/patch-src_plugins_coreplugin_coreplugin.pro
qtcreator/patches/patch-src_plugins_debugger_gdb_gdbengine.cpp
qtcreator/patches/patch-src_plugins_genericprojectmanager_genericmakestep.cpp
qtcreator/patches/patch-src_plugins_glsleditor_glslhighlighter.cpp
qtcreator/patches/patch-src_plugins_qt4projectmanager_qt4buildconfiguration.cpp
qtcreator/patches/patch-src_qtcreatorlibrary.pri
qtcreator/patches/patch-src_qtcreatorplugin.pri
qtcreator/patches/patch-src_tools_qmlprofilertool_qmlprofilertool.pro
qtcreator/patches/patch-src_tools_qtpromaker_qtpromaker.pro
Log Message:
qtcreator: Update to 4.0.1
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5de7f805ddd3773ad8c8978bc3d398198deb6e90
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
qtcreator/Makefile | 36 ++++++---------
qtcreator/distinfo | 29 +++---------
qtcreator/patches/patch-doc_doc.pri | 23 ----------
...tch-lib_qtcreator_qtcomponents_qtcomponents.pro | 35 ---------------
qtcreator/patches/patch-share_qtcreator_static.pro | 45 -------------------
...h-share_qtcreator_translations_translations.pro | 34 ---------------
qtcreator/patches/patch-src_app_app.pro | 26 -----------
.../patch-src_libs_3rdparty_botan_src_src.pro | 25 -----------
...ch-src_libs_extensionsystem_extensionsystem.pro | 16 -------
.../patches/patch-src_libs_glsl_glsllexer.cpp | 15 -------
.../patch-src_libs_glsl_glslparsertable__p.h | 15 -------
...h-src_libs_qtcomponents_styleitem_styleitem.pro | 16 -------
.../patches/patch-src_libs_utils_process__stub.pro | 24 ----------
.../patch-src_plugins_coreplugin_coreplugin.pro | 17 --------
.../patch-src_plugins_debugger_gdb_gdbengine.cpp | 15 -------
...ugins_genericprojectmanager_genericmakestep.cpp | 15 -------
...atch-src_plugins_glsleditor_glslhighlighter.cpp | 24 ----------
.../patch-src_plugins_projectexplorer_abi.cpp | 40 +++++++++++++++++
...ins_qt4projectmanager_qt4buildconfiguration.cpp | 15 -------
qtcreator/patches/patch-src_qtcreatorlibrary.pri | 17 --------
qtcreator/patches/patch-src_qtcreatorplugin.pri | 20 ---------
...ared_qbs_src_lib_corelib_tools_processutils.cpp | 51 ++++++++++++++++++++++
...h-src_tools_qmlprofilertool_qmlprofilertool.pro | 25 -----------
.../patch-src_tools_qtpromaker_qtpromaker.pro | 23 ----------
24 files changed, 110 insertions(+), 491 deletions(-)
diffs:
diff --git a/qtcreator/Makefile b/qtcreator/Makefile
index 9606429..bc807b6 100644
--- a/qtcreator/Makefile
+++ b/qtcreator/Makefile
@@ -1,35 +1,25 @@
# $NetBSD: Makefile,v 1.11 2012/12/15 08:27:24 asau Exp $
-DISTNAME= qt-creator-2.5.2-src
-PKGNAME= ${DISTNAME:S/qt-/qt/:S/-src//}
+DISTNAME= qt-creator-opensource-src-4.0.1
+PKGNAME= ${DISTNAME:S/qt-/qt/:S/-opensource-src//}
CATEGORIES= devel
-MASTER_SITES= http://download.qt.io/official_releases/qtcreator/2.5/2.5.2/
-EXTRACT_SUFX= .tar.gz
-EXTRACT_USING= bsdtar
+MASTER_SITES= http://download.qt.io/official_releases/${PKGBASE}/${PKGVERSION_NOREV:R}/${PKGVERSION_NOREV}/
+EXTRACT_SUFX= .zip
-MAINTAINER= fw%submerge.ch@localhost
-HOMEPAGE= http://qt-project.org/
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://www.qt.io
COMMENT= Cross-platform IDE for Qt and C++
-LICENSE= gnu-lgpl-v2.1
+LICENSE= gnu-lgpl-v3
USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake
-INSTALLATION_DIRS= bin lib/qtcreator lib/qtcreator/plugins/Nokia \
- share/doc/qtcreator share/pixmaps share/qtcreator \
- share/qtcreator/translations
-
-BUILD_DEPENDS+= qt4-tools>=4.7.4:../../x11/qt4-tools \
- qt4-sqlite3>=4.7.4:../../x11/qt4-sqlite3
-
-BUILD_TARGET= all docs
-INSTALL_TARGET= install install_docs
-MAKE_ENV+= PREFIX=${PREFIX} INSTALL_ROOT=${DESTDIR}
-CONFIGURE_ENV+= PREFIX=${PREFIX}
+INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}/%{PREFIX}
+INSTALL_TARGET= install install_inst_qch_docs
do-configure:
- cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QTDIR}/bin/qmake
+ ${RUN} cd ${WRKSRC} && ${QTDIR}/bin/qmake -o Makefile
-.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/qt5-qtscript/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/qtcreator/distinfo b/qtcreator/distinfo
index 155f6ed..94361b3 100644
--- a/qtcreator/distinfo
+++ b/qtcreator/distinfo
@@ -1,25 +1,8 @@
$NetBSD: distinfo,v 1.6 2012/11/26 01:05:10 fwsf Exp $
-SHA1 (qt-creator-2.5.2-src.tar.gz) = 703bcb2306abc41c7080726e1bde1c6ae3b74ebb
-RMD160 (qt-creator-2.5.2-src.tar.gz) = 4cbf69a0d59c821b775da39d3075576e020fb6d8
-Size (qt-creator-2.5.2-src.tar.gz) = 22523588 bytes
-SHA1 (patch-doc_doc.pri) = 11c4204a8632bd4357ff6f58a88192733f1d03ef
-SHA1 (patch-lib_qtcreator_qtcomponents_qtcomponents.pro) = a54209a0bbfd5b3ec04e60f3c55a4de8099d77a5
-SHA1 (patch-share_qtcreator_static.pro) = 21877a6c188ab430b7c6b610f9d6b660b9069156
-SHA1 (patch-share_qtcreator_translations_translations.pro) = 725902cf3b2f185de162ca54129df2edee280147
-SHA1 (patch-src_app_app.pro) = c4c2c6c5d814d9ea6621b15699c6b79935bccca4
-SHA1 (patch-src_libs_3rdparty_botan_src_src.pro) = a4214d580b427416421c63634b9aeeccfbc339da
-SHA1 (patch-src_libs_extensionsystem_extensionsystem.pro) = c7987035c14517f5b24cee6692d06d9ac7e0f275
-SHA1 (patch-src_libs_glsl_glsllexer.cpp) = 5b0f0200f2efcebbce0370330454811813035c84
-SHA1 (patch-src_libs_glsl_glslparsertable__p.h) = 258258679f56cebd646000b653535eeb1cf3b0ae
-SHA1 (patch-src_libs_qtcomponents_styleitem_styleitem.pro) = 19dfcb79e8ab81c2aaeb5dacf1dcb0fef384c021
-SHA1 (patch-src_libs_utils_process__stub.pro) = 6cccb475cebf7afc1310c367f9812b91a09b68c0
-SHA1 (patch-src_plugins_coreplugin_coreplugin.pro) = 6f31c48270b75fd64ec0cbb9b1ca31110bf500c7
-SHA1 (patch-src_plugins_debugger_gdb_gdbengine.cpp) = fd7dd253fca66886c430ec3a136cd36a327d1f84
-SHA1 (patch-src_plugins_genericprojectmanager_genericmakestep.cpp) = ec39b9ab739889141fbd7972e0b23fbb42d12d3a
-SHA1 (patch-src_plugins_glsleditor_glslhighlighter.cpp) = f7b116ac34081b6a900da7186479d3e15e1467bd
-SHA1 (patch-src_plugins_qt4projectmanager_qt4buildconfiguration.cpp) = 588d7af0359cff029f62d85cc28830dd0e91b4a3
-SHA1 (patch-src_qtcreatorlibrary.pri) = 6d54bb15650282111875a3a974ff5af140d01dbf
-SHA1 (patch-src_qtcreatorplugin.pri) = 7bd51003819ee63dbe4b53d46797c3973fc2bca4
-SHA1 (patch-src_tools_qmlprofilertool_qmlprofilertool.pro) = 1ec881fb804bd172262ae4794a5070b00ff745c7
-SHA1 (patch-src_tools_qtpromaker_qtpromaker.pro) = 8d0d828b8b38f1a89abb3a6efc2a96a0999faf6e
+SHA1 (qt-creator-opensource-src-4.0.1.zip) = 2ab795222850cf9735661c02ac7ee27abcbdb1ef
+RMD160 (qt-creator-opensource-src-4.0.1.zip) = 636d52578f0a7c9f5b32de1e78dfc09fe8a5c400
+SHA512 (qt-creator-opensource-src-4.0.1.zip) = 8685641b225186c121d1ad0e77817a0dd1c018240e9bfd095f66650eadd007711c291e79c01f2d307b65e2dd95a2408c72dd943a2484669d42da006a169b4045
+Size (qt-creator-opensource-src-4.0.1.zip) = 30243285 bytes
+SHA1 (patch-src_plugins_projectexplorer_abi.cpp) = 61f416b01fad576ed880bfbcc98647177462e3b6
+SHA1 (patch-src_shared_qbs_src_lib_corelib_tools_processutils.cpp) = 9a500ceedaf04b697dc8b709ba14bbd890c70923
diff --git a/qtcreator/patches/patch-doc_doc.pri b/qtcreator/patches/patch-doc_doc.pri
deleted file mode 100644
index b5bc470..0000000
--- a/qtcreator/patches/patch-doc_doc.pri
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-doc_doc.pri,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Add a separate $PREFIX to the install paths, as qmake only supports
-a single $INSTALL_ROOT prefix. By setting $INSTALL_ROOT to $DESTDIR
-this enables DESTDIR support and fixes the library paths.
-
---- doc/doc.pri.orig 2012-08-08 13:47:06.000000000 +0000
-+++ doc/doc.pri
-@@ -69,12 +69,12 @@ dev_qch_docs.depends += dev_html_docs
-
- !macx {
- inst_qch_docs.files = $$QCH_FILE
-- inst_qch_docs.path = /share/doc/qtcreator
-+ inst_qch_docs.path = $$(PREFIX)/share/doc/qtcreator
- inst_qch_docs.CONFIG += no_check_exist no_default_install
- INSTALLS += inst_qch_docs
-
- inst_dev_qch_docs.files = $$DEV_QCH_FILE
-- inst_dev_qch_docs.path = /share/doc/qtcreator
-+ inst_dev_qch_docs.path = $$(PREFIX)/share/doc/qtcreator
- inst_dev_qch_docs.CONFIG += no_check_exist no_default_install
- INSTALLS += inst_dev_qch_docs
-
diff --git a/qtcreator/patches/patch-lib_qtcreator_qtcomponents_qtcomponents.pro b/qtcreator/patches/patch-lib_qtcreator_qtcomponents_qtcomponents.pro
deleted file mode 100644
index a6f7faf..0000000
--- a/qtcreator/patches/patch-lib_qtcreator_qtcomponents_qtcomponents.pro
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-lib_qtcreator_qtcomponents_qtcomponents.pro,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Fix phony target for Makefile dependencies.
-Add a separate $PREFIX to the install paths, as qmake only supports
-a single $INSTALL_ROOT prefix. By setting $INSTALL_ROOT to $DESTDIR
-this enables DESTDIR support and fixes the library paths.
-
---- lib/qtcreator/qtcomponents/qtcomponents.pro.orig 2012-08-08 13:47:06.000000000 +0000
-+++ lib/qtcreator/qtcomponents/qtcomponents.pro
-@@ -7,7 +7,7 @@ QT =
- LIBS =
- macx:CONFIG -= app_bundle
-
--isEmpty(vcproj) {
-+!isEmpty(vcproj) {
- QMAKE_LINK = @: IGNORE THIS LINE
- OBJECTS_DIR =
- win32:CONFIG -= embed_manifest_exe
-@@ -17,7 +17,7 @@ isEmpty(vcproj) {
- phony_src.input = PHONY_DEPS
- phony_src.output = phony.c
- phony_src.variable_out = GENERATED_SOURCES
-- phony_src.commands = echo int main() { return 0; } > phony.c
-+ phony_src.commands = echo \"int main() { return 0; }\" > phony.c
- phony_src.name = CREATE phony.c
- phony_src.CONFIG += combine
- QMAKE_EXTRA_COMPILERS += phony_src
-@@ -52,6 +52,6 @@ DATA_FILE_PATTERNS = \
-
- !macx {
- qmlfiles.files = $$PWD/*.qml $$PWD/qmldir $$PWD/images $$PWD/custom
-- qmlfiles.path = /$${IDE_LIBRARY_BASENAME}/qtcreator/qtcomponents
-+ qmlfiles.path = $$(PREFIX)/lib/qtcreator/qtcomponents
- INSTALLS += qmlfiles
- }
diff --git a/qtcreator/patches/patch-share_qtcreator_static.pro b/qtcreator/patches/patch-share_qtcreator_static.pro
deleted file mode 100644
index c761489..0000000
--- a/qtcreator/patches/patch-share_qtcreator_static.pro
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-share_qtcreator_static.pro,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Fix phony target for Makefile dependencies.
-Add a separate $PREFIX to the install paths, as qmake only supports
-a single $INSTALL_ROOT prefix. By setting $INSTALL_ROOT to $DESTDIR
-this enables DESTDIR support and fixes the library paths.
-
---- share/qtcreator/static.pro.orig 2012-08-08 13:47:06.000000000 +0000
-+++ share/qtcreator/static.pro
-@@ -7,7 +7,7 @@ QT =
- LIBS =
- macx:CONFIG -= app_bundle
-
--isEmpty(vcproj) {
-+!isEmpty(vcproj) {
- QMAKE_LINK = @: IGNORE THIS LINE
- OBJECTS_DIR =
- win32:CONFIG -= embed_manifest_exe
-@@ -17,7 +17,7 @@ isEmpty(vcproj) {
- phony_src.input = PHONY_DEPS
- phony_src.output = phony.c
- phony_src.variable_out = GENERATED_SOURCES
-- phony_src.commands = echo int main() { return 0; } > phony.c
-+ phony_src.commands = echo \"int main() { return 0; }\" > phony.c
- phony_src.name = CREATE phony.c
- phony_src.CONFIG += combine
- QMAKE_EXTRA_COMPILERS += phony_src
-@@ -64,7 +64,7 @@ macx: DATA_DIRS += scripts
- !macx {
- for(data_dir, DATA_DIRS) {
- eval($${data_dir}.files = $$quote($$PWD/$$data_dir))
-- eval($${data_dir}.path = /share/qtcreator)
-+ eval($${data_dir}.path = $$(PREFIX)/share/qtcreator)
- INSTALLS += $$data_dir
- }
- } else {
-@@ -117,7 +117,7 @@ QMAKE_EXTRA_COMPILERS += unconditionalCo
- !macx {
- for(data_dir, DATA_DIRS) {
- eval($${data_dir}.files = $$IDE_DATA_PATH/$$data_dir)
-- eval($${data_dir}.path = /share/qtcreator)
-+ eval($${data_dir}.path = $$(PREFIX)/share/qtcreator)
- eval($${data_dir}.CONFIG += no_check_exist)
- INSTALLS += $$data_dir
- }
diff --git a/qtcreator/patches/patch-share_qtcreator_translations_translations.pro b/qtcreator/patches/patch-share_qtcreator_translations_translations.pro
deleted file mode 100644
index 9386dec..0000000
--- a/qtcreator/patches/patch-share_qtcreator_translations_translations.pro
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-share_qtcreator_translations_translations.pro,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Fix phony target for Makefile dependencies.
-Add a separate $PREFIX to the install paths, as qmake only supports
-a single $INSTALL_ROOT prefix. By setting $INSTALL_ROOT to $DESTDIR
-this enables DESTDIR support and fixes the library paths.
-
---- share/qtcreator/translations/translations.pro.orig 2012-08-08 13:47:06.000000000 +0000
-+++ share/qtcreator/translations/translations.pro
-@@ -103,7 +103,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN
- updateqm.CONFIG += no_link
- QMAKE_EXTRA_COMPILERS += updateqm
-
--isEmpty(vcproj) {
-+!isEmpty(vcproj) {
- QMAKE_LINK = @: IGNORE THIS LINE
- OBJECTS_DIR =
- win32:CONFIG -= embed_manifest_exe
-@@ -113,13 +113,13 @@ isEmpty(vcproj) {
- phony_src.input = PHONY_DEPS
- phony_src.output = phony.c
- phony_src.variable_out = GENERATED_SOURCES
-- phony_src.commands = echo int main() { return 0; } > phony.c
-+ phony_src.commands = echo \"int main() { return 0; }\" > phony.c
- phony_src.name = CREATE phony.c
- phony_src.CONFIG += combine
- QMAKE_EXTRA_COMPILERS += phony_src
- }
-
- qmfiles.files = $$prependAll(LANGUAGES, $$OUT_PWD/qtcreator_,.qm)
--qmfiles.path = /share/qtcreator/translations
-+qmfiles.path = $$(PREFIX)/share/qtcreator/translations
- qmfiles.CONFIG += no_check_exist
- INSTALLS += qmfiles
diff --git a/qtcreator/patches/patch-src_app_app.pro b/qtcreator/patches/patch-src_app_app.pro
deleted file mode 100644
index c3c3316..0000000
--- a/qtcreator/patches/patch-src_app_app.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-src_app_app.pro,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Add a separate $PREFIX to the install paths, as qmake only supports
-a single $INSTALL_ROOT prefix. By setting $INSTALL_ROOT to $DESTDIR
-this enables DESTDIR support and fixes the library paths.
-
---- src/app/app.pro.orig 2012-08-08 13:47:06.000000000 +0000
-+++ src/app/app.pro
-@@ -3,7 +3,7 @@ include(../shared/qtsingleapplication/qt
-
- TEMPLATE = app
- TARGET = $$IDE_APP_TARGET
--DESTDIR = $$IDE_APP_PATH
-+#DESTDIR = $$IDE_APP_PATH
-
- SOURCES += main.cpp
-
-@@ -29,7 +29,7 @@ win32 {
- info.output = $$IDE_BIN_PATH/../Info.plist
- QMAKE_SUBSTITUTES = info
- } else {
-- target.path = /bin
-+ target.path = $$(PREFIX)/bin
- INSTALLS += target
- }
-
diff --git a/qtcreator/patches/patch-src_libs_3rdparty_botan_src_src.pro b/qtcreator/patches/patch-src_libs_3rdparty_botan_src_src.pro
deleted file mode 100644
index 39b08b5..0000000
--- a/qtcreator/patches/patch-src_libs_3rdparty_botan_src_src.pro
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_libs_3rdparty_botan_src_src.pro,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Build similar to Linux and FreeBSD, using the netbsd* qmake makespec
-that is defined for all pkgsrc targets.
-
---- src/libs/3rdparty/botan/src/src.pro.orig 2012-08-08 13:47:06.000000000 +0000
-+++ src/libs/3rdparty/botan/src/src.pro
-@@ -282,7 +282,7 @@ unix {
- timer/gettimeofday/tm_unix.h
- }
-
--linux*-g++*|freebsd*-g++* {
-+linux*-g++*|freebsd*-g++*|netbsd*-g++* {
- HEADERS += timer/posix_rt/tm_posix.h
- }
-
-@@ -566,7 +566,7 @@ unix {
- timer/gettimeofday/tm_unix.cpp
- }
-
--linux*|freebsd* {
-+linux*|freebsd*|netbsd* {
- SOURCES += timer/posix_rt/tm_posix.cpp
-
- LIBS += -lrt
diff --git a/qtcreator/patches/patch-src_libs_extensionsystem_extensionsystem.pro b/qtcreator/patches/patch-src_libs_extensionsystem_extensionsystem.pro
deleted file mode 100644
index 954cf96..0000000
--- a/qtcreator/patches/patch-src_libs_extensionsystem_extensionsystem.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_libs_extensionsystem_extensionsystem.pro,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Build similar to FreeBSD, using the netbsd* qmake makespec
-that is defined for all pkgsrc targets.
-
---- src/libs/extensionsystem/extensionsystem.pro.orig 2012-08-08 13:47:06.000000000 +0000
-+++ src/libs/extensionsystem/extensionsystem.pro
-@@ -4,7 +4,7 @@ DEFINES += EXTENSIONSYSTEM_LIBRARY
- include(../../qtcreatorlibrary.pri)
- include(extensionsystem_dependencies.pri)
-
--unix:!macx:!freebsd*:LIBS += -ldl
-+unix:!macx:!freebsd*:!netbsd*:LIBS += -ldl
-
- !isEmpty(vcproj) {
- DEFINES += IDE_TEST_DIR=\"$$IDE_SOURCE_TREE\"
diff --git a/qtcreator/patches/patch-src_libs_glsl_glsllexer.cpp b/qtcreator/patches/patch-src_libs_glsl_glsllexer.cpp
deleted file mode 100644
index 2fa32df..0000000
--- a/qtcreator/patches/patch-src_libs_glsl_glsllexer.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_libs_glsl_glsllexer.cpp,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Fix naming conflict of T_RESERVED with a system header define.
-
---- src/libs/glsl/glsllexer.cpp.orig 2012-08-08 13:47:06.000000000 +0000
-+++ src/libs/glsl/glsllexer.cpp
-@@ -406,7 +406,7 @@ int Lexer::findKeyword(const char *word,
- // in the current language variant so that the syntax highlighter
- // can warn the user about the word.
- if (!_scanKeywords)
-- return Parser::T_RESERVED;
-+ return Parser::TOKEN_RESERVED;
- }
- return t & ~Variant_Mask;
- }
diff --git a/qtcreator/patches/patch-src_libs_glsl_glslparsertable__p.h b/qtcreator/patches/patch-src_libs_glsl_glslparsertable__p.h
deleted file mode 100644
index 23ef8c3..0000000
--- a/qtcreator/patches/patch-src_libs_glsl_glslparsertable__p.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_libs_glsl_glslparsertable__p.h,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Fix naming conflict of T_RESERVED with a system header define.
-
---- src/libs/glsl/glslparsertable_p.h.orig 2012-08-08 13:47:06.000000000 +0000
-+++ src/libs/glsl/glslparsertable_p.h
-@@ -165,7 +165,7 @@ public:
- T_PRECISION = 106,
- T_PREPROC = 171,
- T_QUESTION = 107,
-- T_RESERVED = 174,
-+ TOKEN_RESERVED = 174,
- T_RETURN = 108,
- T_RIGHT_ANGLE = 109,
- T_RIGHT_ASSIGN = 110,
diff --git a/qtcreator/patches/patch-src_libs_qtcomponents_styleitem_styleitem.pro b/qtcreator/patches/patch-src_libs_qtcomponents_styleitem_styleitem.pro
deleted file mode 100644
index 4f5d951..0000000
--- a/qtcreator/patches/patch-src_libs_qtcomponents_styleitem_styleitem.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_libs_qtcomponents_styleitem_styleitem.pro,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Add a separate $PREFIX to the install paths, as qmake only supports
-a single $INSTALL_ROOT prefix. By setting $INSTALL_ROOT to $DESTDIR
-this enables DESTDIR support and fixes the library paths.
-
---- src/libs/qtcomponents/styleitem/styleitem.pro.orig 2012-08-08 13:47:06.000000000 +0000
-+++ src/libs/qtcomponents/styleitem/styleitem.pro
-@@ -33,6 +33,6 @@ SOURCES += qtmenu.cpp \
- qwheelarea.cpp
-
- !macx {
-- target.path = /$${IDE_LIBRARY_BASENAME}/qtcreator/qtcomponents/plugin
-+ target.path = $$(PREFIX)/lib/qtcreator/qtcomponents/plugin
- INSTALLS += target
- }
diff --git a/qtcreator/patches/patch-src_libs_utils_process__stub.pro b/qtcreator/patches/patch-src_libs_utils_process__stub.pro
deleted file mode 100644
index 7fc740d..0000000
--- a/qtcreator/patches/patch-src_libs_utils_process__stub.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_libs_utils_process__stub.pro,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Add a separate $PREFIX to the install paths, as qmake only supports
-a single $INSTALL_ROOT prefix. By setting $INSTALL_ROOT to $DESTDIR
-this enables DESTDIR support and fixes the library paths.
-
---- src/libs/utils/process_stub.pro.orig 2012-08-08 13:47:06.000000000 +0000
-+++ src/libs/utils/process_stub.pro
-@@ -5,7 +5,7 @@ include(../../../qtcreator.pri)
-
- TEMPLATE = app
- TARGET = qtcreator_process_stub
--DESTDIR = $$IDE_LIBEXEC_PATH
-+#DESTDIR = $$IDE_LIBEXEC_PATH
-
- build_all:!build_pass {
- CONFIG -= build_all
-@@ -20,5 +20,5 @@ unix {
- LIBS += -lshell32
- }
-
--target.path = /bin # FIXME: libexec, more or less
-+target.path = $$(PREFIX)/bin # FIXME: libexec, more or less
- INSTALLS += target
diff --git a/qtcreator/patches/patch-src_plugins_coreplugin_coreplugin.pro b/qtcreator/patches/patch-src_plugins_coreplugin_coreplugin.pro
deleted file mode 100644
index d991183..0000000
--- a/qtcreator/patches/patch-src_plugins_coreplugin_coreplugin.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_plugins_coreplugin_coreplugin.pro,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Add a separate $PREFIX to the install paths, as qmake only supports
-a single $INSTALL_ROOT prefix. By setting $INSTALL_ROOT to $DESTDIR
-this enables DESTDIR support and fixes the library paths.
-
---- src/plugins/coreplugin/coreplugin.pro.orig 2012-08-08 13:47:06.000000000 +0000
-+++ src/plugins/coreplugin/coreplugin.pro
-@@ -223,7 +223,7 @@ else:unix {
-
- for(imagesize, IMAGE_SIZE_LIST) {
- eval(image$${imagesize}.files = images/logo/$${imagesize}/qtcreator.png)
-- eval(image$${imagesize}.path = /share/icons/hicolor/$${imagesize}x$${imagesize}/apps)
-+ eval(image$${imagesize}.path = $$(PREFIX)/share/icons/hicolor/$${imagesize}x$${imagesize}/apps)
- INSTALLS += image$${imagesize}
- }
- }
diff --git a/qtcreator/patches/patch-src_plugins_debugger_gdb_gdbengine.cpp b/qtcreator/patches/patch-src_plugins_debugger_gdb_gdbengine.cpp
deleted file mode 100644
index f88f60b..0000000
--- a/qtcreator/patches/patch-src_plugins_debugger_gdb_gdbengine.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_plugins_debugger_gdb_gdbengine.cpp,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Fix debugger commands for systems with unix line endings.
-
---- src/plugins/debugger/gdb/gdbengine.cpp.orig 2012-08-08 13:47:06.000000000 +0000
-+++ src/plugins/debugger/gdb/gdbengine.cpp
-@@ -891,7 +891,7 @@ void GdbEngine::flushCommand(const GdbCo
- QMetaObject::invokeMethod(this, "handleResponse",
- Q_ARG(QByteArray, buffer));
- } else {
-- m_gdbAdapter->write(cmd.command + "\r\n");
-+ m_gdbAdapter->write(cmd.command + "\n");
-
- // Start Watchdog.
- if (m_commandTimer.interval() <= 20000)
diff --git a/qtcreator/patches/patch-src_plugins_genericprojectmanager_genericmakestep.cpp b/qtcreator/patches/patch-src_plugins_genericprojectmanager_genericmakestep.cpp
deleted file mode 100644
index 3712346..0000000
--- a/qtcreator/patches/patch-src_plugins_genericprojectmanager_genericmakestep.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_plugins_genericprojectmanager_genericmakestep.cpp,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Fix toolchain debug adapter building by using gnu make.
-
---- src/plugins/genericprojectmanager/genericmakestep.cpp.orig 2012-08-08 13:47:06.000000000 +0000
-+++ src/plugins/genericprojectmanager/genericmakestep.cpp
-@@ -179,7 +179,7 @@ QString GenericMakeStep::makeCommand() c
- if (ProjectExplorer::ToolChain *toolChain = pro->toolChain())
- command = toolChain->makeCommand();
- else
-- command = QLatin1String("make");
-+ command = QLatin1String("gmake");
- }
- return command;
- }
diff --git a/qtcreator/patches/patch-src_plugins_glsleditor_glslhighlighter.cpp b/qtcreator/patches/patch-src_plugins_glsleditor_glslhighlighter.cpp
deleted file mode 100644
index 204825d..0000000
--- a/qtcreator/patches/patch-src_plugins_glsleditor_glslhighlighter.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_plugins_glsleditor_glslhighlighter.cpp,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Fix naming conflict of T_RESERVED with a system header define.
-
---- src/plugins/glsleditor/glslhighlighter.cpp.orig 2012-08-08 13:47:06.000000000 +0000
-+++ src/plugins/glsleditor/glslhighlighter.cpp
-@@ -192,7 +192,7 @@ void Highlighter::highlightBlock(const Q
-
- } else if (tk.is(GLSL::Parser::T_IDENTIFIER)) {
- int kind = lex.findKeyword(data.constData() + tk.position, tk.length);
-- if (kind == GLSL::Parser::T_RESERVED)
-+ if (kind == GLSL::Parser::TOKEN_RESERVED)
- setFormat(tk.position, tk.length, m_formats[GLSLReservedKeyword]);
- else if (kind != GLSL::Parser::T_IDENTIFIER)
- setFormat(tk.position, tk.length, m_formats[GLSLKeywordFormat]);
-@@ -371,7 +371,7 @@ void Highlighter::highlightBlock(const Q
- setFormat(tk.position, tk.length, Qt::darkGreen); // ### FIXME: m_formats[GLSLCommentFormat]);
- else if (tk.is(GLSL::Parser::T_IDENTIFIER)) {
- int kind = lex.findKeyword(data.constData() + tk.position, tk.length);
-- if (kind == GLSL::Parser::T_RESERVED)
-+ if (kind == GLSL::Parser::TOKEN_RESERVED)
- setFormat(tk.position, tk.length, m_formats[GLSLReservedKeyword]);
- else if (kind != GLSL::Parser::T_IDENTIFIER)
- setFormat(tk.position, tk.length, m_formats[GLSLKeywordFormat]);
diff --git a/qtcreator/patches/patch-src_plugins_projectexplorer_abi.cpp b/qtcreator/patches/patch-src_plugins_projectexplorer_abi.cpp
new file mode 100644
index 0000000..5ee3055
--- /dev/null
+++ b/qtcreator/patches/patch-src_plugins_projectexplorer_abi.cpp
@@ -0,0 +1,40 @@
+$NetBSD$
+
+Cherry-pick upstream patch by Ralf Nolden:
+https://codereview.qt-project.org/#/c/162330/2/src/plugins/projectexplorer/abi.cpp
+
+--- src/plugins/projectexplorer/abi.cpp.orig 2016-06-06 13:26:59.000000000 +0000
++++ src/plugins/projectexplorer/abi.cpp
+@@ -199,12 +199,20 @@ static QList<Abi> abiOf(const QByteArray
+ Abi::OSFlavor flavor = Abi::GenericUnixFlavor;
+ // http://www.sco.com/developers/gabi/latest/ch4.eheader.html#elfid
+ switch (osAbi) {
+- case 2: // NetBSD:
++#if defined(Q_OS_NETBSD)
++ case 0: // NetBSD: ELFOSABI_NETBSD 2, however, NetBSD uses 0
+ os = Abi::BsdOS;
+ flavor = Abi::NetBsdFlavor;
+ break;
++#elif defined(Q_OS_OPENBSD)
++ case 0: // OpenBSD: ELFOSABI_OPENBSD 12, however, OpenBSD uses 0
++ os = Abi::BsdOS;
++ flavor = Abi::OpenBsdFlavor;
++ break;
++#else
++ case 0: // no extra info available: Default to Linux
++#endif
+ case 3: // Linux:
+- case 0: // no extra info available: Default to Linux:
+ case 97: // ARM, also linux most of the time.
+ os = Abi::LinuxOS;
+ flavor = Abi::GenericLinuxFlavor;
+@@ -217,9 +225,6 @@ static QList<Abi> abiOf(const QByteArray
+ os = Abi::BsdOS;
+ flavor = Abi::FreeBsdFlavor;
+ break;
+- case 12: // OpenBSD:
+- os = Abi::BsdOS;
+- flavor = Abi::OpenBsdFlavor;
+ }
+
+ switch (machine) {
diff --git a/qtcreator/patches/patch-src_plugins_qt4projectmanager_qt4buildconfiguration.cpp b/qtcreator/patches/patch-src_plugins_qt4projectmanager_qt4buildconfiguration.cpp
deleted file mode 100644
index 5c53726..0000000
--- a/qtcreator/patches/patch-src_plugins_qt4projectmanager_qt4buildconfiguration.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_plugins_qt4projectmanager_qt4buildconfiguration.cpp,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Fix toolchain debug adapter building by using gnu make.
-
---- src/plugins/qt4projectmanager/qt4buildconfiguration.cpp.orig 2012-08-08 13:47:06.000000000 +0000
-+++ src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
-@@ -308,7 +308,7 @@ void Qt4BuildConfiguration::setShadowBui
- QString Qt4BuildConfiguration::makeCommand() const
- {
- ToolChain *tc = toolChain();
-- return tc ? tc->makeCommand() : QLatin1String("make");
-+ return tc ? tc->makeCommand() : QLatin1String("gmake");
- }
-
- static inline QString symbianMakeTarget(QtSupport::BaseQtVersion::QmakeBuildConfigs buildConfig,
diff --git a/qtcreator/patches/patch-src_qtcreatorlibrary.pri b/qtcreator/patches/patch-src_qtcreatorlibrary.pri
deleted file mode 100644
index 9b8724d..0000000
--- a/qtcreator/patches/patch-src_qtcreatorlibrary.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_qtcreatorlibrary.pri,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Add a separate $PREFIX to the install paths, as qmake only supports
-a single $INSTALL_ROOT prefix. By setting $INSTALL_ROOT to $DESTDIR
-this enables DESTDIR support and fixes the library paths.
-
---- src/qtcreatorlibrary.pri.orig 2012-08-08 13:47:06.000000000 +0000
-+++ src/qtcreatorlibrary.pri
-@@ -21,7 +21,7 @@ contains(QT_CONFIG, reduce_exports):CONF
- win32 {
- target.path = /bin
- } else {
-- target.path = /$$IDE_LIBRARY_BASENAME/qtcreator
-+ target.path = $$(PREFIX)/lib/qtcreator
- }
- INSTALLS += target
- }
diff --git a/qtcreator/patches/patch-src_qtcreatorplugin.pri b/qtcreator/patches/patch-src_qtcreatorplugin.pri
deleted file mode 100644
index f2dc769..0000000
--- a/qtcreator/patches/patch-src_qtcreatorplugin.pri
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_qtcreatorplugin.pri,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Add a separate $PREFIX to the install paths, as qmake only supports
-a single $INSTALL_ROOT prefix. By setting $INSTALL_ROOT to $DESTDIR
-this enables DESTDIR support and fixes the library paths.
-
---- src/qtcreatorplugin.pri.orig 2012-08-08 13:47:06.000000000 +0000
-+++ src/qtcreatorplugin.pri
-@@ -81,9 +81,9 @@ CONFIG += plugin plugin_with_soname
- linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
-
- !macx {
-- target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
-+ target.path = $$(PREFIX)/lib/qtcreator/plugins/$$PROVIDER
- pluginspec.files += $${TARGET}.pluginspec
-- pluginspec.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
-+ pluginspec.path = $$(PREFIX)/lib/qtcreator/plugins/$$PROVIDER
- INSTALLS += target pluginspec
- }
-
diff --git a/qtcreator/patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils.cpp b/qtcreator/patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils.cpp
new file mode 100644
index 0000000..6411445
--- /dev/null
+++ b/qtcreator/patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils.cpp
@@ -0,0 +1,51 @@
+$NetBSD$
+
+Implement for NetBSD.
+
+Upstream approved newer patch by Ralf Nolden support as well (it adds FreeBSD and OpenBSD):
+https://codereview.qt-project.org/#/c/162259/5/src/lib/corelib/tools/processutils.cpp
+
+--- src/shared/qbs/src/lib/corelib/tools/processutils.cpp.orig 2016-06-02 14:28:45.000000000 +0000
++++ src/shared/qbs/src/lib/corelib/tools/processutils.cpp
+@@ -40,10 +40,14 @@
+ # include "fileinfo.h"
+ # include <unistd.h>
+ # include <cstdio>
+-#elif defined(Q_OS_BSD4)
++#elif defined(Q_OS_BSD4) && !defined(Q_OS_NETBSD)
+ # include <libutil.h>
+ # include <sys/types.h>
+ # include <sys/user.h>
++#elif defined(Q_OS_NETBSD)
++# include <sys/cdefs.h>
++# include <sys/param.h>
++# include <sys/sysctl.h>
+ #else
+ # error Missing implementation of processNameByPid for this platform.
+ #endif
+@@ -81,13 +85,24 @@ QString processNameByPid(qint64 pid)
+ sprintf(exePath, "/proc/%lld/exe", pid);
+ readlink(exePath, buf, sizeof(buf));
+ return FileInfo::fileName(QString::fromUtf8(buf));
+-#elif defined(Q_OS_BSD4)
++#elif defined(Q_OS_BSD4) && !defined(Q_OS_NETBSD)
+ kinfo_proc *proc = kinfo_getproc(pid);
+ if (!proc)
+ return QString();
+ QString name = QString::fromUtf8(proc->ki_comm);
+ free(proc);
+ return name;
++#elif defined(Q_OS_NETBSD)
++ struct kinfo_proc2 kp;
++ int mib[6] = { CTL_KERN, KERN_PROC2, KERN_PROC_PID, (int)pid, sizeof(struct kinfo_proc2), 1 };
++ size_t len = sizeof(kp);
++ u_int mib_len = sizeof(mib)/sizeof(u_int);
++ if (sysctl(mib, mib_len, &kp, &len, NULL, 0) < 0)
++ return QString();
++ if (kp.p_pid != pid)
++ return QString();
++ QString name = QString::fromUtf8(kp.p_comm);
++ return name;
+ #else
+ return QString();
+ #endif
diff --git a/qtcreator/patches/patch-src_tools_qmlprofilertool_qmlprofilertool.pro b/qtcreator/patches/patch-src_tools_qmlprofilertool_qmlprofilertool.pro
deleted file mode 100644
index 3864cae..0000000
--- a/qtcreator/patches/patch-src_tools_qmlprofilertool_qmlprofilertool.pro
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_tools_qmlprofilertool_qmlprofilertool.pro,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Add a separate $PREFIX to the install paths, as qmake only supports
-a single $INSTALL_ROOT prefix. By setting $INSTALL_ROOT to $DESTDIR
-this enables DESTDIR support and fixes the library paths.
-
---- src/tools/qmlprofilertool/qmlprofilertool.pro.orig 2012-08-08 13:47:06.000000000 +0000
-+++ src/tools/qmlprofilertool/qmlprofilertool.pro
-@@ -4,7 +4,7 @@ include(../../rpath.pri)
-
- TEMPLATE = app
- TARGET = qmlprofiler
--DESTDIR = $$IDE_BIN_PATH
-+#DESTDIR = $$IDE_BIN_PATH
-
- CONFIG += console
- CONFIG -= app_bundle
-@@ -23,6 +23,6 @@ HEADERS += \
- commandlistener.h \
- constants.h
-
--target.path=/bin
-+target.path=$$(PREFIX)/bin
- INSTALLS+=target
-
diff --git a/qtcreator/patches/patch-src_tools_qtpromaker_qtpromaker.pro b/qtcreator/patches/patch-src_tools_qtpromaker_qtpromaker.pro
deleted file mode 100644
index bfadb54..0000000
--- a/qtcreator/patches/patch-src_tools_qtpromaker_qtpromaker.pro
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_tools_qtpromaker_qtpromaker.pro,v 1.1 2012/11/26 01:05:11 fwsf Exp $
-
-Add a separate $PREFIX to the install paths, as qmake only supports
-a single $INSTALL_ROOT prefix. By setting $INSTALL_ROOT to $DESTDIR
-this enables DESTDIR support and fixes the library paths.
-
---- src/tools/qtpromaker/qtpromaker.pro.orig 2012-08-08 13:47:06.000000000 +0000
-+++ src/tools/qtpromaker/qtpromaker.pro
-@@ -4,12 +4,12 @@ include(../../../qtcreator.pri)
-
- TEMPLATE = app
- TARGET = qtpromaker
--DESTDIR = $$IDE_LIBEXEC_PATH
-+#DESTDIR = $$IDE_LIBEXEC_PATH
-
- CONFIG += console warn_on
- CONFIG -= app_bundle
-
- SOURCES += main.cpp
-
--target.path = /bin # FIXME: libexec, more or less
-+target.path = $$(PREFIX)/bin # FIXME: libexec, more or less
- INSTALLS += target
Home |
Main Index |
Thread Index |
Old Index