Attachment #526660 for bug #630834

Lines 89-94 src_prepare() { Link Here

(-)a/dev-qt/qtwebengine/qtwebengine-5.10.1.ebuild (+3 lines)
89	"${WORKDIR}/${PN}-5.10.0-icu-60.1.patch"	89	"${WORKDIR}/${PN}-5.10.0-icu-60.1.patch"
90	)	90	)
91		91
		92	# Pass appropriate options to ninja when building GN.
		93	sed -e "s/cmd = \['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py \|\| die
		94
92	# bug 620444 - ensure local headers are used	95	# bug 620444 - ensure local headers are used
93	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die	96	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die
94		97

Lines 89-94 src_prepare() { Link Here

(-)a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild (+3 lines)
89	"${WORKDIR}/${PN}-5.11.0-update-shim-headers.patch"	89	"${WORKDIR}/${PN}-5.11.0-update-shim-headers.patch"
90	)	90	)
91		91
		92	# Pass appropriate options to ninja when building GN.
		93	sed -e "s/cmd = \['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py \|\| die
		94
92	# bug 620444 - ensure local headers are used	95	# bug 620444 - ensure local headers are used
93	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die	96	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die
94		97

Lines 86-91 PATCHES=( Link Here

(-)a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild (+3 lines)
86	src_prepare() {	86	src_prepare() {
87	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )	87	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
88		88
		89	# Pass appropriate options to ninja when building GN.
		90	sed -e "s/cmd = \['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py \|\| die
		91
89	# bug 620444 - ensure local headers are used	92	# bug 620444 - ensure local headers are used
90	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die	93	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die
91		94




			"${WORKDIR}/${PN}-5.11.0-update-shim-headers.patch"
		)

	# Pass appropriate options to ninja when building GN.
	sed -e "s/cmd = \['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die

	# bug 620444 - ensure local headers are used
	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die

- 
bundled copy of ICU is not used.
--
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 13 +++++++++++++
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild  | 13 +++++++++++++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild    | 13 +++++++++++++
3 files changed, 39 insertions(+)




	# bug 620444 - ensure local headers are used
	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die

	if use system-icu; then
		# Sanity check to ensure that bundled copy of ICU is not used.
		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
		local file
		for file in $(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")"); do
			echo "#error This file should not be used!" > "${file}" || die
		done
	fi

	qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
	qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri





	# bug 620444 - ensure local headers are used
	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die

	if use system-icu; then
		# Sanity check to ensure that bundled copy of ICU is not used.
		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
		local file
		for file in $(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")"); do
			echo "#error This file should not be used!" > "${file}" || die
		done
	fi

	qt_use_disable_config alsa alsa src/core/config/linux.pri
	qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri





	# bug 620444 - ensure local headers are used
	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die

	if use system-icu; then
		# Sanity check to ensure that bundled copy of ICU is not used.
		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
		local file
		for file in $(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")"); do
			echo "#error This file should not be used!" > "${file}" || die
		done
	fi

	qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
	qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri

- 
libicuuc part of bundled ICU when building GN.
--
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 3 +++
1 file changed, 3 insertions(+)

Lines 103-108 src_prepare() { Link Here

(-)a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild (-1 / +3 lines)
103	for file in $(find src/3rdparty/chromium/third_party/icu -type f "(" -name ".c" -o -name ".cpp" -o -name "*.h" ")"); do	103	for file in $(find src/3rdparty/chromium/third_party/icu -type f "(" -name ".c" -o -name ".cpp" -o -name "*.h" ")"); do
104	echo "#error This file should not be used!" > "${file}" \|\| die	104	echo "#error This file should not be used!" > "${file}" \|\| die
105	done	105	done
		106
		107	# Disable unnecessary building of libicuuc part of bundled ICU when building GN.
		108	sed "s/use_system_icu = false/use_system_icu = true/" -i src/3rdparty/chromium/third_party/icu/BUILD.gn \|\| die
106	fi	109	fi
107		110
108	qt_use_disable_config alsa alsa src/core/config/linux.pri	111	qt_use_disable_config alsa alsa src/core/config/linux.pri
109	-

Return to bug 630834

Lines 89-94 src_prepare() { Link Here

(-)a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild (-2 / +3 lines)
89	"${WORKDIR}/${PN}-5.11.0-update-shim-headers.patch"	89	"${WORKDIR}/${PN}-5.11.0-update-shim-headers.patch"
90	)	90	)
91		91
		92	# Pass appropriate options to ninja when building GN.
		93	sed -e "s/cmd = \['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py \|\| die
		94
92	# bug 620444 - ensure local headers are used	95	# bug 620444 - ensure local headers are used
93	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die	96	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die
94		97
95	-
96	bundled copy of ICU is not used.	98	bundled copy of ICU is not used.
97	--
98	dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild \| 13 +++++++++++++	99	dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild \| 13 +++++++++++++
99	dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild \| 13 +++++++++++++	100	dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild \| 13 +++++++++++++
100	dev-qt/qtwebengine/qtwebengine-5.9999.ebuild \| 13 +++++++++++++	101	dev-qt/qtwebengine/qtwebengine-5.9999.ebuild \| 13 +++++++++++++
101	3 files changed, 39 insertions(+)	102	3 files changed, 39 insertions(+)