From 27e904d04311753e82419df35bc46cfa3de4df7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 4 May 2018 14:09:59 +0200 Subject: [PATCH] qtcreator: update to 4.6.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QtCreator comes with GPL-3.0-only plus an annotation called the Qt Company GPL Exception 1.0, which permits projects created with QtCreator to choose the license they desire. Thus install the license file which includes the annotation and the GPL-3.0. Also enable building the ClangCodeModel plugin by adding llvm and clang to the hostdepends. Signed-off-by: Jürgen Buchmüller --- srcpkgs/qtcreator/template | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template index 7831310b7ea..07a3d6581a6 100644 --- a/srcpkgs/qtcreator/template +++ b/srcpkgs/qtcreator/template @@ -1,20 +1,20 @@ # Template file for 'qtcreator' pkgname=qtcreator -version=4.6.0 +version=4.6.1 revision=1 wrksrc=qt-creator-opensource-src-${version} build_style=qmake make_install_args="INSTALL_ROOT=\${DESTDIR}/usr" -hostmakedepends="perl python pkg-config" +hostmakedepends="clang llvm perl pkg-config python" makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel" depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite" nocross="Requires system botan-devel-1.10 for the target architecture" short_desc="A cross-platform IDE for Qt developers" maintainer="Jürgen Buchmüller " -license="LGPL-2.1" +license="GPL-3.0-only,QtCompany-GPL-Exception-1.0" homepage="https://wiki.qt.io/Category:Tools::QtCreator" distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz" -checksum=36e6a9146fbd07f045ea19301176c66f8234afd42bae0a7a17c91e1832fc4882 +checksum=e74dce61becc2a97199ff4a0e50a148e4dbafb6572587212323c470d70c137da if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-qmake qt5-host-tools qt5-script-devel qt5-tools-devel" @@ -37,6 +37,9 @@ post_install() { # Install the desktop file vinstall ${FILESDIR}/qtcreator.desktop \ 644 usr/share/applications + # Install the license with the annotation for + # the Qt Company GPL Exception 1.0 + vlicense LICENSE.GPL3-EXCEPT } qtcreator-full_package() {