diff options
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild | 8 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch | 16 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild | 4 |
3 files changed, 4 insertions, 24 deletions
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild index 0c80aec..ab3ac31 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild @@ -56,9 +56,9 @@ src_prepare() { } src_configure() { - local myqmakeargs=( - -- - -qml-debug - ) +# local myqmakeargs=( +# -- +# -qml-debug +# ) qt5-build_src_configure } diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch deleted file mode 100644 index 9866ab9..0000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix build with >=ICU-60 - -Bug: https://bugs.gentoo.org/639220 -Bug: https://bugreports.qt.io/browse/QTBUG-64925 - ---- a/src/3rdparty/chromium/components/url_formatter/url_formatter.cc -+++ b/src/3rdparty/chromium/components/url_formatter/url_formatter.cc -@@ -488,7 +488,7 @@ - // are added to the allowed set. The list has to be updated when a new - // version of Unicode is released. The current version is 9.0.0 and ICU 60 - // will have Unicode 10.0 data. --#if U_ICU_VERSION_MAJOR_NUM < 60 -+#if U_ICU_VERSION_MAJOR_NUM < 60 || defined(TOOLKIT_QT) - const icu::UnicodeSet aspirational_scripts( - icu::UnicodeString( - // Unified Canadian Syllabics diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild index 81e88ac..d101c4d 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild @@ -85,10 +85,6 @@ src_prepare() { "${FILESDIR}/build_fix.patch" "${FILESDIR}/build_fix2.patch" ) - use system-icu && has_version ">=dev-libs/icu-59" && \ - PATCHES+=( - "${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 |