commit: 69102d1618507b0bcf94f166ca7b01735150cdcc
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 09:54:29 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 10:19:49 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=69102d16
dev-qt: add changes from 5.9999 to 5.11
The 5.11.9999 ebuilds were mistakingly created using the 5.10.9999
ebuilds as their base, thus missing some of the changes in 5.9999.
Thanks to [Arfrever] for pointing it out.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-qt/qdoc/qdoc-5.11.0_alpha.ebuild | 6 ++++++
dev-qt/qdoc/qdoc-5.11.9999.ebuild | 6 ++++++
dev-qt/qtdeclarative/qtdeclarative-5.11.0_alpha.ebuild | 8 ++++++++
dev-qt/qtdeclarative/qtdeclarative-5.11.9999.ebuild | 8 ++++++++
dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild | 2 +-
dev-qt/qtgui/qtgui-5.11.9999.ebuild | 2 +-
6 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qdoc/qdoc-5.11.0_alpha.ebuild
b/dev-qt/qdoc/qdoc-5.11.0_alpha.ebuild
index 983d3432..61789076 100644
--- a/dev-qt/qdoc/qdoc-5.11.0_alpha.ebuild
+++ b/dev-qt/qdoc/qdoc-5.11.0_alpha.ebuild
@@ -15,6 +15,7 @@ IUSE="qml"
DEPEND="
~dev-qt/qtcore-${PV}
+ sys-devel/clang:=
qml? ( ~dev-qt/qtdeclarative-${PV} )
"
RDEPEND="${DEPEND}"
@@ -27,5 +28,10 @@ src_prepare() {
qt_use_disable_mod qml qmldevtools-private \
src/qdoc/qdoc.pro
+ export LLVM_INSTALL_DIR="$(llvm-config --prefix)"
+ # this is normally loaded in qttools.pro, so skipped by using
+ # QT_TARGET_SUBDIRS causing build to fail
+ sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die
+
qt5-build_src_prepare
}
diff --git a/dev-qt/qdoc/qdoc-5.11.9999.ebuild
b/dev-qt/qdoc/qdoc-5.11.9999.ebuild
index 983d3432..61789076 100644
--- a/dev-qt/qdoc/qdoc-5.11.9999.ebuild
+++ b/dev-qt/qdoc/qdoc-5.11.9999.ebuild
@@ -15,6 +15,7 @@ IUSE="qml"
DEPEND="
~dev-qt/qtcore-${PV}
+ sys-devel/clang:=
qml? ( ~dev-qt/qtdeclarative-${PV} )
"
RDEPEND="${DEPEND}"
@@ -27,5 +28,10 @@ src_prepare() {
qt_use_disable_mod qml qmldevtools-private \
src/qdoc/qdoc.pro
+ export LLVM_INSTALL_DIR="$(llvm-config --prefix)"
+ # this is normally loaded in qttools.pro, so skipped by using
+ # QT_TARGET_SUBDIRS causing build to fail
+ sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die
+
qt5-build_src_prepare
}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11.0_alpha.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.11.0_alpha.ebuild
index 985b6923..0c80aec3 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.11.0_alpha.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.11.0_alpha.ebuild
@@ -54,3 +54,11 @@ src_prepare() {
qt5-build_src_prepare
}
+
+src_configure() {
+ local myqmakeargs=(
+ --
+ -qml-debug
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11.9999.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.11.9999.ebuild
index 985b6923..0c80aec3 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.11.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.11.9999.ebuild
@@ -54,3 +54,11 @@ src_prepare() {
qt5-build_src_prepare
}
+
+src_configure() {
+ local myqmakeargs=(
+ --
+ -qml-debug
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild
b/dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild
index 56187076..9c89728d 100644
--- a/dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild
+++ b/dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
~dev-qt/qtcore-${PV}
media-libs/fontconfig
>=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.0.6:=
+ >=media-libs/harfbuzz-1.6.0:=
>=sys-libs/zlib-1.2.5
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
diff --git a/dev-qt/qtgui/qtgui-5.11.9999.ebuild
b/dev-qt/qtgui/qtgui-5.11.9999.ebuild
index 56187076..9c89728d 100644
--- a/dev-qt/qtgui/qtgui-5.11.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.11.9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
~dev-qt/qtcore-${PV}
media-libs/fontconfig
>=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.0.6:=
+ >=media-libs/harfbuzz-1.6.0:=
>=sys-libs/zlib-1.2.5
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
