Skip to content

Commit

Permalink
devel/qtcreator: update to 8.0.1 latest upstream
Browse files Browse the repository at this point in the history
Update Qt Creator to release 8.0.1, see the release announcements:

	https://www.qt.io/blog/qt-creator-8-released
	https://www.qt.io/blog/qt-creator-8.0.1-released-1

While here, cleanup the list of shebang files and omit QmlDesigner
resources from being installed. QmlDesigner only builds with Qt 6.2+.

PR:		265437
Obtained from:	Florian Walpen
  • Loading branch information
0EVSG authored and Adriaan de Groot committed Aug 14, 2022
1 parent ad61700 commit 379eb9f
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 552 deletions.
38 changes: 24 additions & 14 deletions devel/qtcreator/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PORTNAME= qtcreator
DISTVERSION= 7.0.2
DISTVERSION= 8.0.1
CATEGORIES= devel
MASTER_SITES= QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
DISTNAME= qt-creator-opensource-src-${DISTVERSION}
Expand All @@ -19,32 +19,38 @@ LIB_DEPENDS= libKF5SyntaxHighlighting.so:textproc/kf5-syntax-highlighting \
libzstd.so:archivers/zstd
RUN_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}

USES= compiler:c++14-lang pkgconfig cmake gl python qt:5 shebangfix tar:xz \
USES= compiler:c++17-lang pkgconfig cmake gl python qt:5 shebangfix tar:xz \
desktop-file-utils
USE_GL= gl
USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME}
USE_QT= buildtools concurrent core declarative designer gui help \
linguist location network printsupport qdoc qmake \
quick3d quickcontrols script serialport sql svg testlib \
quick3d quickcontrols quicktimeline script serialport sql svg testlib \
webchannel widgets xml xmlpatterns

# Workaround, KF5-5.94 moved header files to subfolder. Instead of using the bundled
# syntax-highligher, just help it find the proper files.
CFLAGS+= -I${LOCALBASE}/include/KF5/KSyntaxHighlighting/KSyntaxHighlighting

SHEBANG_FILES= tests/system/tools/objectsToTable.py \
tests/system/tools/findUnusedObjects.py \
share/qtcreator/templates/wizards/files/python/file.py \
SHEBANG_FILES= bin/qtcreator.sh \
doc/fixnavi.pl \
doc/qtcreatordev/examples/aggregation/test.sh \
scripts/*.pl \
scripts/*.py \
scripts/*.sh \
share/qtcreator/scripts/openTerminal.py \
share/qtcreator/translations/check-ts.pl \
share/qtcreator/translations/*.py \
src/app/winicons/createicons.sh \
src/libs/glsl/make-parser.sh \
src/libs/qmljs/parser/changeLicense.py \
src/libs/qmljs/parser/gen-parser.sh \
src/libs/qt-breakpad/qtbreakpadsymbols \
src/tools/icons/export.py \
scripts/ninjawrapper.py \
scripts/checkInstalledFiles.py \
scripts/deployqt.py \
scripts/dependencyinfo.py \
scripts/uichanges.py \
scripts/makedmg.py
src/plugins/perfprofiler/tracepoints.sh \
src/tools/icons/*.sh \
src/tools/icons/*.py \
tests/system/tools/findUnusedObjects.py \
tests/system/tools/objectsToTable.py

# Provide library paths, default llvm first as a hint to the clang code model.
CMAKE_ARGS+= -DCMAKE_PREFIX_PATH:STRING="${PREFIX}/llvm${LLVM_DEFAULT};${PREFIX}"
Expand Down Expand Up @@ -83,7 +89,7 @@ QTWEBENGINE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine

.include <bsd.port.pre.mk>

# Force a modern LLVM >= 10
# Force a modern LLVM >= 13
.if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} > 80
LLVM_DEFAULT= 13
.endif
Expand All @@ -99,4 +105,8 @@ do-install-DOCS-on:
${CMAKE_BIN} --install ${BUILD_WRKSRC} --prefix ${STAGEDIR}${PREFIX} \
--component html_docs

# QmlDesigner needs Qt 6.2, remove its data for now.
post-install:
${RM} -r ${STAGEDIR}${DATADIR}/qmldesigner

.include <bsd.port.post.mk>
6 changes: 3 additions & 3 deletions devel/qtcreator/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1653585752
SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-7.0.2.tar.xz) = 14dee285aa3aa56fb25ccbd7587382fb6cb05ae99a1a30237f0a0bbef3ceff7a
SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-7.0.2.tar.xz) = 46320400
TIMESTAMP = 1660214443
SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-8.0.1.tar.xz) = e2ce200a79c74dcd6367dcbb83c839c1c20b2cc077d6a658639eacde8a4ab865
SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-8.0.1.tar.xz) = 46918596
6 changes: 3 additions & 3 deletions devel/qtcreator/files/patch-src_libs_sqlite_CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
@@ -47,6 +47,8 @@ extend_qtc_library(Sqlite DEFINES _HAVE_SQLITE_CONFIG_

if (APPLE)
extend_qtc_library(Sqlite DEFINES _BSD_SOURCE)
extend_qtc_library(Sqlite DEFINES _BSD_SOURCE)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+extend_qtc_library(Sqlite DEFINES _POSIX_C_SOURCE=200809L _BSD_SOURCE __XSI_VISIBLE)
+ extend_qtc_library(Sqlite DEFINES _POSIX_C_SOURCE=200809L _BSD_SOURCE __XSI_VISIBLE)
elseif (UNIX)
extend_qtc_library(Sqlite DEFINES _POSIX_C_SOURCE=200809L _GNU_SOURCE _DEFAULT_SOURCE)
extend_qtc_library(Sqlite DEFINES _POSIX_C_SOURCE=200809L _GNU_SOURCE _DEFAULT_SOURCE)
endif()
Loading

0 comments on commit 379eb9f

Please sign in to comment.