Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 494252 Details for
Bug 630834
>=dev-qt/qtwebengine-5.9.1[system-icu] builds libicuuc part of bundled ICU
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
qtwebengine.patch
qtwebengine.patch (text/plain), 10.97 KB, created by
Arfrever Frehtes Taifersar Arahesis
on 2017-09-12 17:55:56 UTC
(
hide
)
Description:
qtwebengine.patch
Filename:
MIME Type:
Creator:
Arfrever Frehtes Taifersar Arahesis
Created:
2017-09-12 17:55:56 UTC
Size:
10.97 KB
patch
obsolete
>From dd7742ea573c5100ec3e7996908416e7fa74c3fd Mon Sep 17 00:00:00 2001 >From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> >Date: Tue, 12 Sep 2017 17:31:41 +0200 >Subject: [PATCH 1/3] dev-qt/qtwebengine: Pass appropriate options to ninja > 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(+) > >diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild >index 7775bf5c..ed48d921 100644 >--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild >+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild >@@ -74,6 +74,9 @@ DEPEND="${RDEPEND} > 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 > >diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild >index 7775bf5c..ed48d921 100644 >--- a/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild >+++ b/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild >@@ -74,6 +74,9 @@ DEPEND="${RDEPEND} > 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 > >diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild >index 7775bf5c..ed48d921 100644 >--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild >+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild >@@ -74,6 +74,9 @@ DEPEND="${RDEPEND} > 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 > >diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild >index 7775bf5c..ed48d921 100644 >--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild >+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild >@@ -74,6 +74,9 @@ DEPEND="${RDEPEND} > 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 > >-- >2.14.1 > > >From 6cc4df616e69b31a76a86c6bec472d2db1c64fbf Mon Sep 17 00:00:00 2001 >From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> >Date: Tue, 12 Sep 2017 18:09:47 +0200 >Subject: [PATCH 2/3] dev-qt/qtwebengine: Ensure that bundled copy of ICU is > 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(+) > >diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild >index ed48d921..2bcecbf9 100644 >--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild >+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild >@@ -80,6 +80,14 @@ src_prepare() { > # 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 > >diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild >index ed48d921..2bcecbf9 100644 >--- a/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild >+++ b/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild >@@ -80,6 +80,14 @@ src_prepare() { > # 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 > >diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild >index ed48d921..2bcecbf9 100644 >--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild >+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild >@@ -80,6 +80,14 @@ src_prepare() { > # 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 > >diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild >index ed48d921..2bcecbf9 100644 >--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild >+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild >@@ -80,6 +80,14 @@ src_prepare() { > # 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 > >-- >2.14.1 > > >From 89734ecddf45364bbfcf83ce2d4bfc54d547e59d Mon Sep 17 00:00:00 2001 >From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> >Date: Tue, 12 Sep 2017 19:40:45 +0200 >Subject: [PATCH 3/3] dev-qt/qtwebengine: Disable unnecessary building of > 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(+) > >diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild >index 2bcecbf9..d3a6507d 100644 >--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild >+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild >@@ -86,6 +86,9 @@ src_prepare() { > 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 >+ >+ # Disable unnecessary building of libicuuc part of bundled ICU when building GN. >+ sed "s/use_system_icu = false/use_system_icu = true/" -i src/3rdparty/chromium/third_party/icu/BUILD.gn || die > fi > > qt_use_disable_config alsa alsa src/core/config/linux.pri >diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild >index 2bcecbf9..d3a6507d 100644 >--- a/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild >+++ b/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild >@@ -86,6 +86,9 @@ src_prepare() { > 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 >+ >+ # Disable unnecessary building of libicuuc part of bundled ICU when building GN. >+ sed "s/use_system_icu = false/use_system_icu = true/" -i src/3rdparty/chromium/third_party/icu/BUILD.gn || die > fi > > qt_use_disable_config alsa alsa src/core/config/linux.pri >diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild >index 2bcecbf9..d3a6507d 100644 >--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild >+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild >@@ -86,6 +86,9 @@ src_prepare() { > 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 >+ >+ # Disable unnecessary building of libicuuc part of bundled ICU when building GN. >+ sed "s/use_system_icu = false/use_system_icu = true/" -i src/3rdparty/chromium/third_party/icu/BUILD.gn || die > fi > > qt_use_disable_config alsa alsa src/core/config/linux.pri >diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild >index 2bcecbf9..d3a6507d 100644 >--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild >+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild >@@ -86,6 +86,9 @@ src_prepare() { > 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 >+ >+ # Disable unnecessary building of libicuuc part of bundled ICU when building GN. >+ sed "s/use_system_icu = false/use_system_icu = true/" -i src/3rdparty/chromium/third_party/icu/BUILD.gn || die > fi > > qt_use_disable_config alsa alsa src/core/config/linux.pri >-- >2.14.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 630834
:
494252
|
526660