svn commit: r540745 - in head/devel/qtcreator: . files

[Loïc Bartoletti]

Author: lbartoletti
Date: Mon Jun 29 04:35:32 2020
New Revision: 540745
URL: https://svnweb.freebsd.org/changeset/ports/540745

Log:
  devel/qtcreator: Update to 4.12.3
  
  - Update to 4.12.3
  - Add license
  
  Approved by:	tcberner (mentor)
  Differential Revision:	https://reviews.freebsd.org/D25384

Added:
  head/devel/qtcreator/files/llvm10_patch-src_shared_clang_clang__installation.pri   (contents, props changed)
Modified:
  head/devel/qtcreator/Makefile
  head/devel/qtcreator/distinfo

Modified: head/devel/qtcreator/Makefile
==============================================================================
--- head/devel/qtcreator/Makefile	Mon Jun 29 04:29:29 2020	(r540744)
+++ head/devel/qtcreator/Makefile	Mon Jun 29 04:35:32 2020	(r540745)
@@ -2,7 +2,7 @@
 # $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}
@@ -11,6 +11,12 @@ DIST_SUBDIR=	KDE/Qt/qtcreator
 MAINTAINER=	kde at 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}
@@ -85,6 +91,10 @@ SHEBANG_FILES=		tests/system/tools/objectsToTable.py \
 
 .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:

Modified: head/devel/qtcreator/distinfo
==============================================================================
--- head/devel/qtcreator/distinfo	Mon Jun 29 04:29:29 2020	(r540744)
+++ head/devel/qtcreator/distinfo	Mon Jun 29 04:35:32 2020	(r540745)
@@ -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

Added: head/devel/qtcreator/files/llvm10_patch-src_shared_clang_clang__installation.pri
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/qtcreator/files/llvm10_patch-src_shared_clang_clang__installation.pri	Mon Jun 29 04:35:32 2020	(r540745)
@@ -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 \