From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1182242-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 63D0313835A
for <garchives@archives.gentoo.org>; Thu, 25 Jun 2020 07:11:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A80A0E08FB;
Thu, 25 Jun 2020 07:11:27 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 825ACE08FB
for <gentoo-commits@lists.gentoo.org>; Thu, 25 Jun 2020 07:11:27 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CFD1234F15B
for <gentoo-commits@lists.gentoo.org>; Thu, 25 Jun 2020 07:11:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 32AE02B8
for <gentoo-commits@lists.gentoo.org>; Thu, 25 Jun 2020 07:11:24 +0000 (UTC)
From: "Jason A. Donenfeld" <zx2c4@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jason A. Donenfeld" <zx2c4@gentoo.org>
Message-ID: <1593069065.f82ad4334793e9692be2fa6472d72c982bca747a.zx2c4@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-qt/qt-creator/qt-creator-9999.ebuild
X-VCS-Directories: dev-qt/qt-creator/
X-VCS-Committer: zx2c4
X-VCS-Committer-Name: Jason A. Donenfeld
X-VCS-Revision: f82ad4334793e9692be2fa6472d72c982bca747a
X-VCS-Branch: master
Date: Thu, 25 Jun 2020 07:11:24 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b10c2347-6e56-49a6-99aa-a243a79f7585
X-Archives-Hash: 1518aa396fe6c892acfde437e0264dea
commit: f82ad4334793e9692be2fa6472d72c982bca747a
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Fri May 8 07:18:03 2020 +0000
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 07:11:05 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f82ad433
dev-qt/qt-creator: Unbundle KSyntaxHighlighting
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
dev-qt/qt-creator/qt-creator-9999.ebuild | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 01f6e2d47c2..ee5513e7298 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -24,7 +24,7 @@ else
S=${WORKDIR}/${MY_P}
fi
-# TODO: unbundle sqlite, yaml-cpp, and KSyntaxHighlighting
+# TODO: unbundle sqlite and yaml-cpp
QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt
'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
@@ -64,6 +64,7 @@ CDEPEND="
>=dev-qt/qtwidgets-${QT_PV}
>=dev-qt/qtx11extras-${QT_PV}
>=dev-qt/qtxml-${QT_PV}
+ kde-frameworks/syntax-highlighting:5
clang? (
|| (
sys-devel/clang:10
@@ -180,6 +181,9 @@ src_prepare() {
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 qbs
rm -r src/shared/qbs || die
}
@@ -187,6 +191,8 @@ src_prepare() {
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 \