| 1 |
commit: 009100134be9053761c0f952418b1f17c5d912b3 |
| 2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 11 10:53:04 2017 +0000 |
| 4 |
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 11 10:53:04 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=00910013 |
| 7 |
|
| 8 |
dev-qt/qtwebengine: add patches to fix build against system ICU >=59 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.17, Repoman-2.3.6 |
| 11 |
|
| 12 |
dev-qt/qtwebengine/Manifest | 1 + |
| 13 |
dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild | 9 +++++++++ |
| 14 |
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 9 +++++++++ |
| 15 |
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 9 +++++++++ |
| 16 |
4 files changed, 28 insertions(+) |
| 17 |
|
| 18 |
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest |
| 19 |
index 61d0c824..a99d18a0 100644 |
| 20 |
--- a/dev-qt/qtwebengine/Manifest |
| 21 |
+++ b/dev-qt/qtwebengine/Manifest |
| 22 |
@@ -1 +1,2 @@ |
| 23 |
+DIST qtwebengine-5.10.0-icu-patches.tar.bz2 6821 BLAKE2B b77a63727a73a6f3ff18bc83ba2e29db86fa39556708634fc01013865e48386ecdb3b32d8d3a41449ae336d1d7f98e4dcc6c6aecf3d8f9c39cdcc594902c306e SHA512 10508fe284750c0e5510d298113b7ab076e763f2071943aa6b11e8717b7a3d9e34d91a9b9310a116ecee187f35c2f32e17d21824f4bfadcc7c8472f183651997 |
| 24 |
DIST qtwebengine-everywhere-src-5.10.0.tar.xz 209737304 BLAKE2B 8d7871c9f5953e375a4e9590f557406a98d225ae1b531fcedb070441e84dd98bcc4697da0e37015460f3e39dbcee6a3f41532db162f97215c4d7106d55278afa SHA512 7acb4579e4aea7c07654b2523b4d19102288ab06ee1ef5b8bb0ad7b38fa771612336acc56ec02ce85c881c0878a7875955ad73f5f1e2740352234e2f02b9d84e |
| 25 |
|
| 26 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild |
| 27 |
index c93317a2..12be341a 100644 |
| 28 |
--- a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild |
| 29 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild |
| 30 |
@@ -11,6 +11,10 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then |
| 31 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 32 |
fi |
| 33 |
|
| 34 |
+SRC_URI+=" system-icu? ( |
| 35 |
+ https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.10.0-icu-patches.tar.bz2 |
| 36 |
+)" |
| 37 |
+ |
| 38 |
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" |
| 39 |
|
| 40 |
RDEPEND=" |
| 41 |
@@ -78,6 +82,11 @@ DEPEND="${RDEPEND} |
| 42 |
|
| 43 |
src_prepare() { |
| 44 |
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |
| 45 |
+ use system-icu && has_version ">=dev-libs/icu-59" && \ |
| 46 |
+ PATCHES+=( |
| 47 |
+ "${WORKDIR}/${PN}-5.10.0-icu-59.1.patch" |
| 48 |
+ "${WORKDIR}/${PN}-5.10.0-icu-60.1.patch" |
| 49 |
+ ) |
| 50 |
|
| 51 |
# bug 620444 - ensure local headers are used |
| 52 |
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die |
| 53 |
|
| 54 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild |
| 55 |
index c93317a2..12be341a 100644 |
| 56 |
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild |
| 57 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild |
| 58 |
@@ -11,6 +11,10 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then |
| 59 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 60 |
fi |
| 61 |
|
| 62 |
+SRC_URI+=" system-icu? ( |
| 63 |
+ https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.10.0-icu-patches.tar.bz2 |
| 64 |
+)" |
| 65 |
+ |
| 66 |
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" |
| 67 |
|
| 68 |
RDEPEND=" |
| 69 |
@@ -78,6 +82,11 @@ DEPEND="${RDEPEND} |
| 70 |
|
| 71 |
src_prepare() { |
| 72 |
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |
| 73 |
+ use system-icu && has_version ">=dev-libs/icu-59" && \ |
| 74 |
+ PATCHES+=( |
| 75 |
+ "${WORKDIR}/${PN}-5.10.0-icu-59.1.patch" |
| 76 |
+ "${WORKDIR}/${PN}-5.10.0-icu-60.1.patch" |
| 77 |
+ ) |
| 78 |
|
| 79 |
# bug 620444 - ensure local headers are used |
| 80 |
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die |
| 81 |
|
| 82 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 83 |
index c93317a2..12be341a 100644 |
| 84 |
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 85 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 86 |
@@ -11,6 +11,10 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then |
| 87 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 88 |
fi |
| 89 |
|
| 90 |
+SRC_URI+=" system-icu? ( |
| 91 |
+ https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.10.0-icu-patches.tar.bz2 |
| 92 |
+)" |
| 93 |
+ |
| 94 |
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" |
| 95 |
|
| 96 |
RDEPEND=" |
| 97 |
@@ -78,6 +82,11 @@ DEPEND="${RDEPEND} |
| 98 |
|
| 99 |
src_prepare() { |
| 100 |
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |
| 101 |
+ use system-icu && has_version ">=dev-libs/icu-59" && \ |
| 102 |
+ PATCHES+=( |
| 103 |
+ "${WORKDIR}/${PN}-5.10.0-icu-59.1.patch" |
| 104 |
+ "${WORKDIR}/${PN}-5.10.0-icu-60.1.patch" |
| 105 |
+ ) |
| 106 |
|
| 107 |
# bug 620444 - ensure local headers are used |
| 108 |
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die |
Archives