| 1 |
commit: f82ad4334793e9692be2fa6472d72c982bca747a |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri May 8 07:18:03 2020 +0000 |
| 4 |
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 25 07:11:05 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f82ad433 |
| 7 |
|
| 8 |
dev-qt/qt-creator: Unbundle KSyntaxHighlighting |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 11 |
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com> |
| 12 |
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-qt/qt-creator/qt-creator-9999.ebuild | 8 +++++++- |
| 15 |
1 file changed, 7 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild |
| 18 |
index 01f6e2d47c2..ee5513e7298 100644 |
| 19 |
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild |
| 20 |
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild |
| 21 |
@@ -24,7 +24,7 @@ else |
| 22 |
S=${WORKDIR}/${MY_P} |
| 23 |
fi |
| 24 |
|
| 25 |
-# TODO: unbundle sqlite, yaml-cpp, and KSyntaxHighlighting |
| 26 |
+# TODO: unbundle sqlite and yaml-cpp |
| 27 |
|
| 28 |
QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt |
| 29 |
'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase |
| 30 |
@@ -64,6 +64,7 @@ CDEPEND=" |
| 31 |
>=dev-qt/qtwidgets-${QT_PV} |
| 32 |
>=dev-qt/qtx11extras-${QT_PV} |
| 33 |
>=dev-qt/qtxml-${QT_PV} |
| 34 |
+ kde-frameworks/syntax-highlighting:5 |
| 35 |
clang? ( |
| 36 |
|| ( |
| 37 |
sys-devel/clang:10 |
| 38 |
@@ -180,6 +181,9 @@ src_prepare() { |
| 39 |
done |
| 40 |
sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die |
| 41 |
|
| 42 |
+ # remove bundled syntax-highlighting |
| 43 |
+ rm -r src/libs/3rdparty/syntax-highlighting || die |
| 44 |
+ |
| 45 |
# remove bundled qbs |
| 46 |
rm -r src/shared/qbs || die |
| 47 |
} |
| 48 |
@@ -187,6 +191,8 @@ src_prepare() { |
| 49 |
src_configure() { |
| 50 |
eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \ |
| 51 |
IDE_PACKAGE_MODE=1 \ |
| 52 |
+ KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \ |
| 53 |
+ KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \ |
| 54 |
$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \ |
| 55 |
$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \ |
| 56 |
CONFIG+=qbs_disable_rpath \ |
Archives