Index: head/devel/qtcreator/Makefile =================================================================== --- head/devel/qtcreator/Makefile (revision 540744) +++ head/devel/qtcreator/Makefile (revision 540745) @@ -1,111 +1,121 @@ # Created by: Kris Moore # $FreeBSD$ PORTNAME= qtcreator -DISTVERSION= 4.12.2 +DISTVERSION= 4.12.3 CATEGORIES= devel MASTER_SITES= QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION} DISTNAME= qt-creator-opensource-src-${DISTVERSION} DIST_SUBDIR= KDE/Qt/qtcreator MAINTAINER= kde@FreeBSD.org COMMENT= C++ and QML IDE for Qt development +LICENSE= QtGPL +LICENSE_GROUPS_QtGPL= GPL +LICENSE_NAME= GPLv3 with Qt Company GPL Exception 1.0 +LICENSE_FILE= ${WRKSRC}/LICENSE.GPL3-EXCEPT +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + # depend on the split out qbs LIB_DEPENDS= libqbscore.so:devel/qbs BUILD_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} RUN_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} USES= compiler:c++14-lang gl python qmake qt:5 shebangfix tar:xz USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME} USE_GL= gl USE_QT= buildtools concurrent core declarative designer gui help \ linguist location network printsupport qdoc qmake \ quickcontrols script script serialport sql svg webchannel \ widgets xml xmlpatterns CXXFLAGS_powerpc= -maltivec CXXFLAGS_powerpc64= -maltivec # be paranoid and do not extract qbs (devel/qbs) copy from source tree EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/src/shared/qbs' # Set QBS_INSTALL_DIR for QBS plugin build and set config parameter to build # the qbsprojectmanager plugin without compile error QMAKE_ARGS+= QBS_INSTALL_DIR=${PREFIX} CONFIG+=qbs_enable_project_file_updates # Enforce installation to ${PREFIX}. QMAKE_ARGS+= QTC_PREFIX=${PREFIX} LLVM_INSTALL_DIR=${PREFIX}/llvm${LLVM_DEFAULT} DESKTOP_ENTRIES="Qt Creator" "" "QtProject-qtcreator" \ "${PREFIX}/bin/${PORTNAME}" "Development;Qt;" true PORTDOCS= * OPTIONS_DEFINE= DOCS EXAMPLES QTWEBENGINE OPTIONS_SUB= yes DOCS_DESC= Install the Qt5 api documentation DOCS_USE= QT=doc_run EXAMPLES_DESC= Install the Qt5 example projects EXAMPLES_USE= QT=examples_run OPTIONS_DEFAULT= DOCS EXAMPLES OPTIONS_DEFAULT_amd64= QTWEBENGINE OPTIONS_DEFAULT_i386= QTWEBENGINE QTWEBENGINE_DESC= Add dependency on qt5-webengine QTWEBENGINE_USE= qt=webengine QTWEBENGINE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine ALL_TARGET= all INSTALL_TARGET= install DOCS_ALL_TARGET= docs DOCS_INSTALL_TARGET= install_docs PLIST_SUB= SHLIB_VER="${PORTVERSION}" SHEBANG_FILES= tests/system/tools/objectsToTable.py \ tests/system/tools/findUnusedObjects.py \ share/qtcreator/templates/wizards/files/python/file.py \ share/qtcreator/scripts/openTerminal.py \ src/libs/qmljs/parser/changeLicense.py \ src/libs/qt-breakpad/qtbreakpadsymbols \ src/tools/icons/export.py \ scripts/packagePlugins.py \ scripts/ninjawrapper.py \ scripts/checkInstalledFiles.py \ scripts/createDistPackage.py \ scripts/createDevPackage.py \ scripts/deployqt.py \ scripts/dependencyinfo.py \ scripts/createSourcePackages.py \ scripts/uichanges.py \ scripts/makedmg.py .include .if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90 LLVM_DEFAULT= 80 +.endif + +.if ${LLVM_DEFAULT} == 10 +EXTRA_PATCHES= ${PATCHDIR}/llvm10_patch-src_shared_clang_clang__installation.pri .endif post-patch: # Fix paths for gnuplot and ant. ${REINPLACE_CMD} -e 's|/usr/bin/gnuplot|${LOCALBASE}/bin/gnuplot|' \ ${WRKSRC}/share/qtcreator/debugger/dumper.py ${REINPLACE_CMD} -e 's|/usr/bin/ant|${LOCALBASE}/bin/ant|' \ ${WRKSRC}/src/plugins/android/androidsettingswidget.cpp # Fix python binary in pro file. ${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|g' \ ${WRKSRC}/qtcreator.pro pre-configure: # We piggyback on QMAKE_LIBDIR_FLAGS to make sure -L${WRKSRC}/lib is passed to # the linker before -L/usr/local/lib. By default, the opposite happens, which # is a problem when a Qt port is being upgraded, since an existing library # would end up being picked up instead of those built in ${WRKSRC}/lib. Since # qmake appends the value of QMAKE_LIBDIR to QMAKE_LIBDIR_FLAGS, we can use the # latter to get the linker path order right. qmake is smart enough to strip # occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them. # See QTBUG-40825 and ports bugs 194088, 195105 and 198720. ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${WRKSRC}/lib' >> ${WRKSRC}/.qmake.cache .include Index: head/devel/qtcreator/distinfo =================================================================== --- head/devel/qtcreator/distinfo (revision 540744) +++ head/devel/qtcreator/distinfo (revision 540745) @@ -1,3 +1,3 @@ -TIMESTAMP = 1591198832 -SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-4.12.2.tar.xz) = 52c03074256f4e18e4bd830883df23ea405e1fd752bda6482f87f4e5142bf516 -SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-4.12.2.tar.xz) = 34347552 +TIMESTAMP = 1592573402 +SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-4.12.3.tar.xz) = 81e12010aace162755f3a94ff788f7973f7a902ac1a9bc968f30e535cf5da32a +SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-4.12.3.tar.xz) = 34351356 Index: head/devel/qtcreator/files/llvm10_patch-src_shared_clang_clang__installation.pri =================================================================== --- head/devel/qtcreator/files/llvm10_patch-src_shared_clang_clang__installation.pri (nonexistent) +++ head/devel/qtcreator/files/llvm10_patch-src_shared_clang_clang__installation.pri (revision 540745) @@ -0,0 +1,24 @@ +Obtained from: https://git.archlinux.org/svntogit/packages.git/tree/trunk/qtcreator-clang-libs.patch?h=packages/qtcreator + +--- src/shared/clang/clang_installation.pri.orig 2020-06-22 04:41:41 UTC ++++ src/shared/clang/clang_installation.pri +@@ -133,7 +133,8 @@ defineReplace(extractWarnings) { + + CLANGTOOLING_LIBS=-lclangTooling -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ + -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ +- -lclangASTMatchers -lclangToolingCore -lclangAST -lclangLex -lclangBasic ++ -lclangASTMatchers -lclangToolingCore -lclangAST -lclangLex -lclangBasic \ ++ -lclang-cpp + win32:CLANGTOOLING_LIBS += -lversion + + BIN_EXTENSION = +@@ -207,7 +208,8 @@ isEmpty(LLVM_VERSION) { + isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) { + CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h + exists($$CLANGFORMAT_MAIN_HEADER) { +- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic ++ CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic \ ++ -lclang-cpp + ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \ + -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ + -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ Property changes on: head/devel/qtcreator/files/llvm10_patch-src_shared_clang_clang__installation.pri ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property