Attachment #494252 for bug #630834

Lines 74-79 DEPEND="${RDEPEND} Link Here

(-)a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild (+3 lines)
74	src_prepare() {	74	src_prepare() {
75	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )	75	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
76		76
		77	# Pass appropriate options to ninja when building GN.
		78	sed -e "s/cmd = \['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py \|\| die
		79
77	# bug 620444 - ensure local headers are used	80	# bug 620444 - ensure local headers are used
78	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die	81	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die
79		82

Lines 74-79 DEPEND="${RDEPEND} Link Here

(-)a/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild (+3 lines)
74	src_prepare() {	74	src_prepare() {
75	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )	75	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
76		76
		77	# Pass appropriate options to ninja when building GN.
		78	sed -e "s/cmd = \['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py \|\| die
		79
77	# bug 620444 - ensure local headers are used	80	# bug 620444 - ensure local headers are used
78	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die	81	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die
79		82

Lines 74-79 DEPEND="${RDEPEND} Link Here

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




src_prepare() {
	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.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

- 
not used.
--
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 8 ++++++++
dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild     | 8 ++++++++
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild  | 8 ++++++++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild    | 8 ++++++++
4 files changed, 32 insertions(+)

Lines 80-85 src_prepare() { Link Here

(-)a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild (+8 lines)
80	# bug 620444 - ensure local headers are used	80	# bug 620444 - ensure local headers are used
81	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die	81	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die
82		82
		83	if use system-icu; then
		84	# Ensure that bundled copy of ICU is not used.
		85	local file
		86	for file in $(find src/3rdparty/chromium/third_party/icu -type f "(" -name ".c" -o -name ".cpp" -o -name "*.h" ")"); do
		87	echo "#error This file should not be used!" > "${file}" \|\| die
		88	done
		89	fi
		90
83	qt_use_disable_config alsa alsa src/core/config/linux.pri	91	qt_use_disable_config alsa alsa src/core/config/linux.pri
84	qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri	92	qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
85		93

Lines 80-85 src_prepare() { Link Here

(-)a/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild (+8 lines)
80	# bug 620444 - ensure local headers are used	80	# bug 620444 - ensure local headers are used
81	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die	81	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die
82		82
		83	if use system-icu; then
		84	# Ensure that bundled copy of ICU is not used.
		85	local file
		86	for file in $(find src/3rdparty/chromium/third_party/icu -type f "(" -name ".c" -o -name ".cpp" -o -name "*.h" ")"); do
		87	echo "#error This file should not be used!" > "${file}" \|\| die
		88	done
		89	fi
		90
83	qt_use_disable_config alsa alsa src/core/config/linux.pri	91	qt_use_disable_config alsa alsa src/core/config/linux.pri
84	qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri	92	qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
85		93

Lines 80-85 src_prepare() { Link Here

(-)a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild (+8 lines)
80	# bug 620444 - ensure local headers are used	80	# bug 620444 - ensure local headers are used
81	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die	81	find "${S}" -type f -name "*.pr[fio]" \| xargs sed -i -e 's\|INCLUDEPATH += \|&$$QTWEBENGINE_ROOT/include \|' \|\| die
82		82
		83	if use system-icu; then
		84	# Ensure that bundled copy of ICU is not used.
		85	local file
		86	for file in $(find src/3rdparty/chromium/third_party/icu -type f "(" -name ".c" -o -name ".cpp" -o -name "*.h" ")"); do
		87	echo "#error This file should not be used!" > "${file}" \|\| die
		88	done
		89	fi
		90
83	qt_use_disable_config alsa alsa src/core/config/linux.pri	91	qt_use_disable_config alsa alsa src/core/config/linux.pri
84	qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri	92	qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
85		93




	# 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
		# Ensure that bundled copy of ICU is not used.
		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

- 
libicuuc part of bundled ICU when building GN.
--
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 3 +++
dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild     | 3 +++
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild  | 3 +++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild    | 3 +++
4 files changed, 12 insertions(+)

Lines 86-91 src_prepare() { Link Here

(-)a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild (+3 lines)
86	for file in $(find src/3rdparty/chromium/third_party/icu -type f "(" -name ".c" -o -name ".cpp" -o -name "*.h" ")"); do	86	for file in $(find src/3rdparty/chromium/third_party/icu -type f "(" -name ".c" -o -name ".cpp" -o -name "*.h" ")"); do
87	echo "#error This file should not be used!" > "${file}" \|\| die	87	echo "#error This file should not be used!" > "${file}" \|\| die
88	done	88	done
		89
		90	# Disable unnecessary building of libicuuc part of bundled ICU when building GN.
		91	sed "s/use_system_icu = false/use_system_icu = true/" -i src/3rdparty/chromium/third_party/icu/BUILD.gn \|\| die
89	fi	92	fi
90		93
91	qt_use_disable_config alsa alsa src/core/config/linux.pri	94	qt_use_disable_config alsa alsa src/core/config/linux.pri

Lines 86-91 src_prepare() { Link Here

(-)a/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild (+3 lines)
86	for file in $(find src/3rdparty/chromium/third_party/icu -type f "(" -name ".c" -o -name ".cpp" -o -name "*.h" ")"); do	86	for file in $(find src/3rdparty/chromium/third_party/icu -type f "(" -name ".c" -o -name ".cpp" -o -name "*.h" ")"); do
87	echo "#error This file should not be used!" > "${file}" \|\| die	87	echo "#error This file should not be used!" > "${file}" \|\| die
88	done	88	done
		89
		90	# Disable unnecessary building of libicuuc part of bundled ICU when building GN.
		91	sed "s/use_system_icu = false/use_system_icu = true/" -i src/3rdparty/chromium/third_party/icu/BUILD.gn \|\| die
89	fi	92	fi
90		93
91	qt_use_disable_config alsa alsa src/core/config/linux.pri	94	qt_use_disable_config alsa alsa src/core/config/linux.pri

Lines 86-91 src_prepare() { Link Here

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

Lines 86-91 src_prepare() { Link Here

(-)a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild (-1 / +3 lines)
86	for file in $(find src/3rdparty/chromium/third_party/icu -type f "(" -name ".c" -o -name ".cpp" -o -name "*.h" ")"); do	86	for file in $(find src/3rdparty/chromium/third_party/icu -type f "(" -name ".c" -o -name ".cpp" -o -name "*.h" ")"); do
87	echo "#error This file should not be used!" > "${file}" \|\| die	87	echo "#error This file should not be used!" > "${file}" \|\| die
88	done	88	done
		89
		90	# Disable unnecessary building of libicuuc part of bundled ICU when building GN.
		91	sed "s/use_system_icu = false/use_system_icu = true/" -i src/3rdparty/chromium/third_party/icu/BUILD.gn \|\| die
89	fi	92	fi
90		93
91	qt_use_disable_config alsa alsa src/core/config/linux.pri	94	qt_use_disable_config alsa alsa src/core/config/linux.pri
92	-

Return to bug 630834