| 1 |
commit: 69102d1618507b0bcf94f166ca7b01735150cdcc |
| 2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 22 09:54:29 2018 +0000 |
| 4 |
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 22 10:19:49 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=69102d16 |
| 7 |
|
| 8 |
dev-qt: add changes from 5.9999 to 5.11 |
| 9 |
|
| 10 |
The 5.11.9999 ebuilds were mistakingly created using the 5.10.9999 |
| 11 |
ebuilds as their base, thus missing some of the changes in 5.9999. |
| 12 |
|
| 13 |
Thanks to [Arfrever] for pointing it out. |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 16 |
|
| 17 |
dev-qt/qdoc/qdoc-5.11.0_alpha.ebuild | 6 ++++++ |
| 18 |
dev-qt/qdoc/qdoc-5.11.9999.ebuild | 6 ++++++ |
| 19 |
dev-qt/qtdeclarative/qtdeclarative-5.11.0_alpha.ebuild | 8 ++++++++ |
| 20 |
dev-qt/qtdeclarative/qtdeclarative-5.11.9999.ebuild | 8 ++++++++ |
| 21 |
dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild | 2 +- |
| 22 |
dev-qt/qtgui/qtgui-5.11.9999.ebuild | 2 +- |
| 23 |
6 files changed, 30 insertions(+), 2 deletions(-) |
| 24 |
|
| 25 |
diff --git a/dev-qt/qdoc/qdoc-5.11.0_alpha.ebuild b/dev-qt/qdoc/qdoc-5.11.0_alpha.ebuild |
| 26 |
index 983d3432..61789076 100644 |
| 27 |
--- a/dev-qt/qdoc/qdoc-5.11.0_alpha.ebuild |
| 28 |
+++ b/dev-qt/qdoc/qdoc-5.11.0_alpha.ebuild |
| 29 |
@@ -15,6 +15,7 @@ IUSE="qml" |
| 30 |
|
| 31 |
DEPEND=" |
| 32 |
~dev-qt/qtcore-${PV} |
| 33 |
+ sys-devel/clang:= |
| 34 |
qml? ( ~dev-qt/qtdeclarative-${PV} ) |
| 35 |
" |
| 36 |
RDEPEND="${DEPEND}" |
| 37 |
@@ -27,5 +28,10 @@ src_prepare() { |
| 38 |
qt_use_disable_mod qml qmldevtools-private \ |
| 39 |
src/qdoc/qdoc.pro |
| 40 |
|
| 41 |
+ export LLVM_INSTALL_DIR="$(llvm-config --prefix)" |
| 42 |
+ # this is normally loaded in qttools.pro, so skipped by using |
| 43 |
+ # QT_TARGET_SUBDIRS causing build to fail |
| 44 |
+ sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die |
| 45 |
+ |
| 46 |
qt5-build_src_prepare |
| 47 |
} |
| 48 |
|
| 49 |
diff --git a/dev-qt/qdoc/qdoc-5.11.9999.ebuild b/dev-qt/qdoc/qdoc-5.11.9999.ebuild |
| 50 |
index 983d3432..61789076 100644 |
| 51 |
--- a/dev-qt/qdoc/qdoc-5.11.9999.ebuild |
| 52 |
+++ b/dev-qt/qdoc/qdoc-5.11.9999.ebuild |
| 53 |
@@ -15,6 +15,7 @@ IUSE="qml" |
| 54 |
|
| 55 |
DEPEND=" |
| 56 |
~dev-qt/qtcore-${PV} |
| 57 |
+ sys-devel/clang:= |
| 58 |
qml? ( ~dev-qt/qtdeclarative-${PV} ) |
| 59 |
" |
| 60 |
RDEPEND="${DEPEND}" |
| 61 |
@@ -27,5 +28,10 @@ src_prepare() { |
| 62 |
qt_use_disable_mod qml qmldevtools-private \ |
| 63 |
src/qdoc/qdoc.pro |
| 64 |
|
| 65 |
+ export LLVM_INSTALL_DIR="$(llvm-config --prefix)" |
| 66 |
+ # this is normally loaded in qttools.pro, so skipped by using |
| 67 |
+ # QT_TARGET_SUBDIRS causing build to fail |
| 68 |
+ sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die |
| 69 |
+ |
| 70 |
qt5-build_src_prepare |
| 71 |
} |
| 72 |
|
| 73 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11.0_alpha.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.11.0_alpha.ebuild |
| 74 |
index 985b6923..0c80aec3 100644 |
| 75 |
--- a/dev-qt/qtdeclarative/qtdeclarative-5.11.0_alpha.ebuild |
| 76 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.11.0_alpha.ebuild |
| 77 |
@@ -54,3 +54,11 @@ src_prepare() { |
| 78 |
|
| 79 |
qt5-build_src_prepare |
| 80 |
} |
| 81 |
+ |
| 82 |
+src_configure() { |
| 83 |
+ local myqmakeargs=( |
| 84 |
+ -- |
| 85 |
+ -qml-debug |
| 86 |
+ ) |
| 87 |
+ qt5-build_src_configure |
| 88 |
+} |
| 89 |
|
| 90 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.11.9999.ebuild |
| 91 |
index 985b6923..0c80aec3 100644 |
| 92 |
--- a/dev-qt/qtdeclarative/qtdeclarative-5.11.9999.ebuild |
| 93 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.11.9999.ebuild |
| 94 |
@@ -54,3 +54,11 @@ src_prepare() { |
| 95 |
|
| 96 |
qt5-build_src_prepare |
| 97 |
} |
| 98 |
+ |
| 99 |
+src_configure() { |
| 100 |
+ local myqmakeargs=( |
| 101 |
+ -- |
| 102 |
+ -qml-debug |
| 103 |
+ ) |
| 104 |
+ qt5-build_src_configure |
| 105 |
+} |
| 106 |
|
| 107 |
diff --git a/dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild b/dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild |
| 108 |
index 56187076..9c89728d 100644 |
| 109 |
--- a/dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild |
| 110 |
+++ b/dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild |
| 111 |
@@ -29,7 +29,7 @@ RDEPEND=" |
| 112 |
~dev-qt/qtcore-${PV} |
| 113 |
media-libs/fontconfig |
| 114 |
>=media-libs/freetype-2.6.1:2 |
| 115 |
- >=media-libs/harfbuzz-1.0.6:= |
| 116 |
+ >=media-libs/harfbuzz-1.6.0:= |
| 117 |
>=sys-libs/zlib-1.2.5 |
| 118 |
virtual/opengl |
| 119 |
dbus? ( ~dev-qt/qtdbus-${PV} ) |
| 120 |
|
| 121 |
diff --git a/dev-qt/qtgui/qtgui-5.11.9999.ebuild b/dev-qt/qtgui/qtgui-5.11.9999.ebuild |
| 122 |
index 56187076..9c89728d 100644 |
| 123 |
--- a/dev-qt/qtgui/qtgui-5.11.9999.ebuild |
| 124 |
+++ b/dev-qt/qtgui/qtgui-5.11.9999.ebuild |
| 125 |
@@ -29,7 +29,7 @@ RDEPEND=" |
| 126 |
~dev-qt/qtcore-${PV} |
| 127 |
media-libs/fontconfig |
| 128 |
>=media-libs/freetype-2.6.1:2 |
| 129 |
- >=media-libs/harfbuzz-1.0.6:= |
| 130 |
+ >=media-libs/harfbuzz-1.6.0:= |
| 131 |
>=sys-libs/zlib-1.2.5 |
| 132 |
virtual/opengl |
| 133 |
dbus? ( ~dev-qt/qtdbus-${PV} ) |
Archives