AUX qt-creator-4.13.0-dylib-fix.patch 4013 BLAKE2B 1fd0338c05b1b5c05aadf42dce11b248c55320e70e07112a5744217c50619a3109756cad7e0b59e961840aec3ea0da1c0b519ace39676e907b6eece06dafbc6f SHA512 e1f28bb5c5838c046df3ac68f5b56e5ce5cab9c9b654a7d71deb41d19ce3b1b6408f588e7e26121df79e0963060bb8799468267fa8d6a59f08e20fa87c0e65d4

AUX qt-creator-4.13.0-libclangformat-ide.patch 3203 BLAKE2B 8126c70fc8d142d43135484aece129c887b1ba3da8ee6b131c743149d8a423963bccf97a90b84f451ae0849db57748fd6ccc1d07fb4f96b6ba6c7b93c5011630 SHA512 4d393690098f6c82c302dba23c149d8082d27550562681a16f6162d43bef807b86c7115c62a14d96581c58edec46afcea91dbcac4aa0b1aa0156ea169f8fa2bc

DIST qt-creator-opensource-src-4.13.2.tar.xz 39783044 BLAKE2B e09122e2794ac95fb61914e0e5341b574e1e12ecb9cef95bd05d049d7cce3ce1124c00252883b60552baa1d5c5995574ee01e40e41dd0e6651e097499318df55 SHA512 d99e19f6a121440ef37b44944a967b994ebaa952574bfee32c6dcef744226109b65988d33585d32b0e1d9022a03009ab442fade29e1d763560c64ea32eafc90c

EBUILD qt-creator-4.13.2.ebuild 7292 BLAKE2B 3d2ae0cc7889d83c549a203f6bf1af96be66fb898a9ff71e52e8fb3308c922315e947b47ba0bea93cea33531bfb59c3d19904bc72c927f60eb8d0aaf45ef84d0 SHA512 cde3efe8e6892683fbe02e715210fef00e814797d47d80fc184bbefc368cd5cf760b22640dbb439a9d8546762b3bc0c353bbb6e1c4a5d0ec00a090828f34779a

From 1c5faa6dcf16135ee31252d13766d01536a69405 Mon Sep 17 00:00:00 2001

From: Peter Levine <plevine457@gmail.com>

Date: Tue, 5 May 2020 03:45:35 -0400

Subject: [PATCH] Fix building against clang configured with

 CLANG_LINK_CLANG_DYLIB

LLVM/Clang upstream only officially supports building shared

components as a single dynamic library (via

LLVM_BUILD_LLVM_DYLIB=ON, CLANG_LINK_CLANG_DYLIB=ON, etc..).

Linux distros like Fedora and Gentoo have followed suit.

Unfortunately, QT-Creator's src/shared/clang/clang_installation.pri

file assumes clang is built with separate component libraries

and the build fails.

This change alters the build to check for the existence

of clang component libraries and, if found, link to them, or

otherwise to libclang-cpp.

Task-number: QTCREATORBUG-23172

Change-Id: I17df5822d7aeb471227f21f2cf4a71871d6f9b86

---

 src/shared/clang/clang_installation.pri | 35 +++++++++++++++----------

 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri

index 2ef2cb42..24afbed8 100644

--- a/src/shared/clang/clang_installation.pri

+++ b/src/shared/clang/clang_installation.pri

@@ -206,19 +206,6 @@ 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

-            ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \

-                           -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \

-                           -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \

-                           -lclangASTMatchers -lclangAST -lclangLex -lclangBasic

-            win32:CLANGFORMAT_LIBS += -lversion

-        }

-    }

-    win32:ALL_CLANG_LIBS += -lversion

-

     LIBCLANG_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang-c/Index.h

     !exists($$LIBCLANG_MAIN_HEADER) {

         $$llvmWarningOrError(\

@@ -239,11 +226,31 @@ isEmpty(LLVM_VERSION) {

     LIBCLANG_LIBS += $${CLANG_LIB}

     isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) {

+        CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h

+        exists($$CLANGFORMAT_MAIN_HEADER) {

+            exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib) {

+                CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic

+                ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \

+                           -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \

+                           -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \

+                           -lclangASTMatchers -lclangAST -lclangLex -lclangBasic

+                win32:CLANGFORMAT_LIBS += -lversion

+                win32:ALL_CLANG_LIBS += -lversion

+            } else {

+                CLANGFORMAT_LIBS=-lclang-cpp

+                ALL_CLANG_LIBS=-lclang-cpp

+            }

+        }

+

         QTC_ENABLE_CLANG_REFACTORING=$$(QTC_ENABLE_CLANG_REFACTORING)

         !isEmpty(QTC_ENABLE_CLANG_REFACTORING) {

             !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBTOOLING_LIBS = -L$${LLVM_LIBDIR}

-            LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS

+            exists($${LLVM_LIBDIR}/libclangTooling.so*)|exists($${LLVM_LIBDIR}/libclangTooling.dylib) {

+                LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS

+            } else {

+                LIBTOOLING_LIBS += -lclang-cpp $$LLVM_STATIC_LIBS

+            }

         }

     }

-- 

2.26.2

diff --git a/src/plugins/clangformat/clangformatbaseindenter.h b/src/plugins/clangformat/clangformatbaseindenter.h

index 00dc3e9c..2c1cf48f 100644

--- a/src/plugins/clangformat/clangformatbaseindenter.h

+++ b/src/plugins/clangformat/clangformatbaseindenter.h

@@ -27,7 +27,7 @@

 #include <texteditor/indenter.h>

-#include <clang/Format/Format.h>

+#include <clang/Format/FormatIDE.h>

 namespace ClangFormat {

diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp

index f1fa2c82..b2e552e9 100644

--- a/src/plugins/clangformat/clangformatconfigwidget.cpp

+++ b/src/plugins/clangformat/clangformatconfigwidget.cpp

@@ -32,7 +32,7 @@

 #include "ui_clangformatchecks.h"

 #include "ui_clangformatconfigwidget.h"

-#include <clang/Format/Format.h>

+#include <clang/Format/FormatIDE.h>

 #include <coreplugin/icore.h>

 #include <cppeditor/cpphighlighter.h>

diff --git a/src/plugins/clangformat/clangformatplugin.cpp b/src/plugins/clangformat/clangformatplugin.cpp

index 9b76a086..840efe1f 100644

--- a/src/plugins/clangformat/clangformatplugin.cpp

+++ b/src/plugins/clangformat/clangformatplugin.cpp

@@ -56,7 +56,7 @@

 #include <texteditor/icodestylepreferences.h>

 #include <texteditor/texteditorsettings.h>

-#include <clang/Format/Format.h>

+#include <clang/Format/FormatIDE.h>

 #include <utils/algorithm.h>

diff --git a/src/plugins/clangformat/clangformatutils.h b/src/plugins/clangformat/clangformatutils.h

index 74fd84c9..c455d25f 100644

--- a/src/plugins/clangformat/clangformatutils.h

+++ b/src/plugins/clangformat/clangformatutils.h

@@ -28,7 +28,7 @@

 #include <utils/fileutils.h>

 #include <utils/id.h>

-#include <clang/Format/Format.h>

+#include <clang/Format/FormatIDE.h>

 #include <QFile>

diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri

index b1927ca9..2f0b5900 100644

--- a/src/shared/clang/clang_installation.pri

+++ b/src/shared/clang/clang_installation.pri

@@ -229,7 +229,7 @@ isEmpty(LLVM_VERSION) {

         CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h

         exists($$CLANGFORMAT_MAIN_HEADER) {

             exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib) {

-                CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic

+                CLANGFORMAT_LIBS=-lclangFormatIDE -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic

                 ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \

                            -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \

                            -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \

@@ -237,7 +237,7 @@ isEmpty(LLVM_VERSION) {

                 win32:CLANGFORMAT_LIBS += -lversion

                 win32:ALL_CLANG_LIBS += -lversion

             } else {

-                CLANGFORMAT_LIBS=-lclang-cpp

+                CLANGFORMAT_LIBS=-lclangFormatIDE -lclang-cpp

                 ALL_CLANG_LIBS=-lclang-cpp

             }

         }

# Copyright 1999-2020 Gentoo Authors

# Distributed under the terms of the GNU General Public License v2

EAPI=7

LLVM_MAX_SLOT=11

PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"

inherit llvm qmake-utils virtualx xdg

DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"

HOMEPAGE="https://doc.qt.io/qtcreator/"

LICENSE="GPL-3"

SLOT="0"

if [[ ${PV} == *9999 ]]; then

	inherit git-r3

	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"

else

	MY_PV=${PV/_/-}

	MY_P=${PN}-opensource-src-${MY_PV}

	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development

	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz"

	KEYWORDS="~amd64 ~arm ~x86"

	S=${WORKDIR}/${MY_P}

fi

# TODO: unbundle sqlite

QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal beautifier boot2qt

	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase

	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios

	lsp:languageclient mcu:mcusupport mercurial modeling:modeleditor nim perforce perfprofiler python

	qbs:qbsprojectmanager +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal

	silversearcher subversion valgrind webassembly winrt)

IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"

RESTRICT="!test? ( test )"

REQUIRED_USE="

	boot2qt? ( remotelinux )

	clang? ( test? ( qbs ) )

	mcu? ( cmake )

	python? ( lsp )

	qnx? ( remotelinux )

"

# minimum Qt version required

QT_PV="5.12.3:5"

BDEPEND="

	>=dev-qt/linguist-tools-${QT_PV}

	virtual/pkgconfig

	doc? ( >=dev-qt/qdoc-${QT_PV} )

"

CDEPEND="

	>=dev-cpp/yaml-cpp-0.6.2:=

	>=dev-qt/qtconcurrent-${QT_PV}

	>=dev-qt/qtcore-${QT_PV}

	>=dev-qt/qtdeclarative-${QT_PV}[widgets]

	>=dev-qt/qtgui-${QT_PV}

	>=dev-qt/qtnetwork-${QT_PV}[ssl]

	>=dev-qt/qtprintsupport-${QT_PV}

	>=dev-qt/qtquickcontrols-${QT_PV}

	>=dev-qt/qtscript-${QT_PV}

	>=dev-qt/qtsql-${QT_PV}[sqlite]

	>=dev-qt/qtsvg-${QT_PV}

	>=dev-qt/qtwidgets-${QT_PV}

	>=dev-qt/qtx11extras-${QT_PV}

	>=dev-qt/qtxml-${QT_PV}

	kde-frameworks/syntax-highlighting:5

	clang? (

		|| (

			( sys-devel/clang:11

				dev-libs/libclangformat-ide:11 )

			( sys-devel/clang:10

				dev-libs/libclangformat-ide:10 )

			( sys-devel/clang:9

				dev-libs/libclangformat-ide:9 )

		)

		<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=

	)

	designer? ( >=dev-qt/designer-${QT_PV} )

	help? (

		>=dev-qt/qthelp-${QT_PV}

		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )

	)

	perfprofiler? ( dev-libs/elfutils )

	qbs? ( >=dev-util/qbs-1.13.1 )

	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )

	systemd? ( sys-apps/systemd:= )

"

DEPEND="${CDEPEND}

	test? (

		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]

		>=dev-qt/qtquickcontrols2-${QT_PV}

		>=dev-qt/qttest-${QT_PV}

		>=dev-qt/qtxmlpatterns-${QT_PV}[qml]

	)

"

RDEPEND="${CDEPEND}

	sys-devel/gdb[client,python]

	autotools? ( sys-devel/autoconf )

	cmake? ( dev-util/cmake )

	cppcheck? ( dev-util/cppcheck )

	cvs? ( dev-vcs/cvs )

	git? ( dev-vcs/git )

	mercurial? ( dev-vcs/mercurial )

	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )

	silversearcher? ( sys-apps/the_silver_searcher )

	subversion? ( dev-vcs/subversion )

	valgrind? ( dev-util/valgrind )

"

# qt translations must also be installed or qt-creator translations won't be loaded

for x in ${PLOCALES}; do

	IUSE+=" l10n_${x}"

	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"

done

unset x

PATCHES=(

	"${FILESDIR}"/${PN}-4.13.0-dylib-fix.patch

	"${FILESDIR}"/${PN}-4.13.0-libclangformat-ide.patch

)

llvm_check_deps() {

	has_version -d "sys-devel/clang:${LLVM_SLOT}" && \

		has_version -d "dev-libs/libclangformat-ide:${LLVM_SLOT}"

}

pkg_setup() {

	use clang && llvm_pkg_setup

}

src_prepare() {

	default

	# disable unwanted plugins

	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do

		if ! use ${plugin%:*}; then

			einfo "Disabling ${plugin%:*} plugin"

			sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \

				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"

		fi

	done

	sed -i -e '/updateinfo/d' src/plugins/plugins.pro || die

	# avoid building unused support libraries and tools

	if ! use clang; then

		sed -i -e '/clangsupport/d' src/libs/libs.pro || die

		sed -i -e '/clang\(\|pchmanager\|refactoring\)backend/d' src/tools/tools.pro || die

	fi

	if ! use glsl; then

		sed -i -e '/glsl/d' src/libs/libs.pro || die

	fi

	if ! use lsp; then

		sed -i -e '/languageserverprotocol/d' src/libs/libs.pro tests/auto/auto.pro || die

	fi

	if ! use modeling; then

		sed -i -e '/modelinglib/d' src/libs/libs.pro || die

	fi

	if ! use perfprofiler; then

		rm -r src/tools/perfparser || die

		if ! use ctfvisualizer && ! use qmlprofiler; then

			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die

		fi

	fi

	if ! use qmldesigner; then

		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die

		sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die

	fi

	if ! use valgrind; then

		sed -i -e '/valgrindfake/d' src/tools/tools.pro || die

		sed -i -e '/valgrind/d' tests/auto/auto.pro || die

	fi

	# automagic dep on qtwebengine

	if ! use webengine; then

		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die

	fi

	# disable broken or unreliable tests

	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die

	sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' tests/auto/debugger/debugger.pro || die

	sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die

	sed -i -e 's/\<check\>//' tests/auto/qml/codemodel/codemodel.pro || die

	# do not install test binaries

	sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die

	# fix path to some clang headers

	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die

	# fix translations

	local lang languages=

	for lang in ${PLOCALES}; do

		use l10n_${lang} && languages+=" ${lang/-/_}"

	done

	sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die

	# remove bundled syntax-highlighting

	rm -r src/libs/3rdparty/syntax-highlighting || die

	# remove bundled yaml-cpp

	rm -r src/libs/3rdparty/yaml-cpp || die

	# remove bundled qbs

	rm -r src/shared/qbs || die

}

src_configure() {

	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \

		IDE_PACKAGE_MODE=1 \

		KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \

		KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \

		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \

		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \

		CONFIG+=qbs_disable_rpath \

		CONFIG+=qbs_enable_project_file_updates \

		$(use systemd && echo CONFIG+=journald) \

		$(use test && echo BUILD_TESTS=1)

}

src_test() {

	cd tests/auto && virtx default

}

src_install() {

	emake INSTALL_ROOT="${ED}/usr" install

	dodoc dist/{changes-*,known-issues}

	# install documentation

	if use doc; then

		emake docs

		# don't use ${PF} or the doc will not be found

		insinto /usr/share/doc/qtcreator

		doins share/doc/qtcreator/qtcreator{,-dev}.qch

		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch

	fi

}