commit: 86001869ab83fc378c6a84e5d8be85d9479e3a29 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Aug 13 13:57:21 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Aug 13 14:47:42 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=86001869
dev-qt/qtcore: Drop IUSE=icu and configure w/ -no-icu unconditionally Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-qt/qtcore/files/qtcore-4.8.7-icu-59.patch | 28 +++++++++++++++++++++++++++ dev-qt/qtcore/qtcore-4.8.7-r4.ebuild | 5 ++--- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtcore/files/qtcore-4.8.7-icu-59.patch b/dev-qt/qtcore/files/qtcore-4.8.7-icu-59.patch new file mode 100644 index 00000000..3edcdef0 --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-4.8.7-icu-59.patch @@ -0,0 +1,28 @@ +From: Fabian Vogt <[email protected]> +Subject: Fix build with ICU >= 59 + +ICU >= 59 requires C++11 for its header files. +Qt can't be compiled with -std=c++11 as a whole, so only enable +it for qlocale_icu.cpp. + +Index: qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri +=================================================================== +--- qt-everywhere-opensource-src-4.8.7.orig/src/corelib/tools/tools.pri ++++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri +@@ -102,7 +102,15 @@ contains(QT_CONFIG, zlib):include($$PWD/ + else:include($$PWD/../../3rdparty/zlib_dependency.pri) + + contains(QT_CONFIG,icu) { +- SOURCES += tools/qlocale_icu.cpp ++ cpp11.name = cpp11 ++ cpp11.input = SOURCES_CPP11 ++ cpp11.dependency_type = TYPE_C ++ cpp11.variable_out = OBJECTS ++ cpp11.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${first(QMAKE_EXT_OBJ)} ++ cpp11.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++11 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} ++ QMAKE_EXTRA_COMPILERS += cpp11 ++ ++ SOURCES_CPP11 += tools/qlocale_icu.cpp + DEFINES += QT_USE_ICU + } + diff --git a/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild index ef90ab4c..5f628593 100644 --- a/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild +++ b/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild @@ -10,13 +10,12 @@ if [[ ${QT4_BUILD_TYPE} == release ]]; then KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" fi -IUSE="+glib iconv icu libressl qt3support ssl" +IUSE="+glib iconv libressl qt3support ssl" DEPEND=" >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] ) - icu? ( <dev-libs/icu-59:=[${MULTILIB_USEDEP}] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.1:=[sslv3,${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) @@ -85,7 +84,7 @@ multilib_src_configure() { -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb $(qt_use glib) $(qt_use iconv) - $(qt_use icu) + -no-icu $(use ssl && echo -openssl-linked || echo -no-openssl) $(qt_use qt3support) )
