dev-qt/qtwebengine: add patches to fix build against system ICU >=59

Package-Manager: Portage-2.3.17, Repoman-2.3.6
gentoo · Dec 11, 2017 · 0091001 · 0091001
1 parent bb0e214
commit 0091001
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 0 deletions.
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
@@ -1 +1,2 @@
+DIST qtwebengine-5.10.0-icu-patches.tar.bz2 6821 BLAKE2B b77a63727a73a6f3ff18bc83ba2e29db86fa39556708634fc01013865e48386ecdb3b32d8d3a41449ae336d1d7f98e4dcc6c6aecf3d8f9c39cdcc594902c306e SHA512 10508fe284750c0e5510d298113b7ab076e763f2071943aa6b11e8717b7a3d9e34d91a9b9310a116ecee187f35c2f32e17d21824f4bfadcc7c8472f183651997
 DIST qtwebengine-everywhere-src-5.10.0.tar.xz 209737304 BLAKE2B 8d7871c9f5953e375a4e9590f557406a98d225ae1b531fcedb070441e84dd98bcc4697da0e37015460f3e39dbcee6a3f41532db162f97215c4d7106d55278afa SHA512 7acb4579e4aea7c07654b2523b4d19102288ab06ee1ef5b8bb0ad7b38fa771612336acc56ec02ce85c881c0878a7875955ad73f5f1e2740352234e2f02b9d84e
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
@@ -11,6 +11,10 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
+SRC_URI+=" system-icu? (
+	https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.10.0-icu-patches.tar.bz2
+)"
+
 IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
 
 RDEPEND="
@@ -78,6 +82,11 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+	use system-icu && has_version ">=dev-libs/icu-59" && \
+		PATCHES+=(
+			"${WORKDIR}/${PN}-5.10.0-icu-59.1.patch"
+			"${WORKDIR}/${PN}-5.10.0-icu-60.1.patch"
+		)
 
 	# bug 620444 - ensure local headers are used
 	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die

diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -11,6 +11,10 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
+SRC_URI+=" system-icu? (
+	https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.10.0-icu-patches.tar.bz2
+)"
+
 IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
 
 RDEPEND="
@@ -78,6 +82,11 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+	use system-icu && has_version ">=dev-libs/icu-59" && \
+		PATCHES+=(
+			"${WORKDIR}/${PN}-5.10.0-icu-59.1.patch"
+			"${WORKDIR}/${PN}-5.10.0-icu-60.1.patch"
+		)
 
 	# bug 620444 - ensure local headers are used
 	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die

diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -11,6 +11,10 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
+SRC_URI+=" system-icu? (
+	https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.10.0-icu-patches.tar.bz2
+)"
+
 IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
 
 RDEPEND="
@@ -78,6 +82,11 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+	use system-icu && has_version ">=dev-libs/icu-59" && \
+		PATCHES+=(
+			"${WORKDIR}/${PN}-5.10.0-icu-59.1.patch"
+			"${WORKDIR}/${PN}-5.10.0-icu-60.1.patch"
+		)
 
 	# bug 620444 - ensure local headers are used
 	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		DIST qtwebengine-5.10.0-icu-patches.tar.bz2 6821 BLAKE2B b77a63727a73a6f3ff18bc83ba2e29db86fa39556708634fc01013865e48386ecdb3b32d8d3a41449ae336d1d7f98e4dcc6c6aecf3d8f9c39cdcc594902c306e SHA512 10508fe284750c0e5510d298113b7ab076e763f2071943aa6b11e8717b7a3d9e34d91a9b9310a116ecee187f35c2f32e17d21824f4bfadcc7c8472f183651997
		DIST qtwebengine-everywhere-src-5.10.0.tar.xz 209737304 BLAKE2B 8d7871c9f5953e375a4e9590f557406a98d225ae1b531fcedb070441e84dd98bcc4697da0e37015460f3e39dbcee6a3f41532db162f97215c4d7106d55278afa SHA512 7acb4579e4aea7c07654b2523b4d19102288ab06ee1ef5b8bb0ad7b38fa771612336acc56ec02ce85c881c0878a7875955ad73f5f1e2740352234e2f02b9d84e