commit: bb97d066dd96c3fe812a091a5e70255fc110a955
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 21:07:25 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 21:13:45 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bb97d066
ecm.eclass: Disable overzealous upstream disable-deprecated-before
Upstream detects .git directory in root CMakeLists.txt and adds aggressive
definitions like -DQT_DISABLE_DEPRECATED_BEFORE=0x060000 which means it will
frequently fail to build with newish Qt versions.
Due to this we end up with the weird situation that stable branch fails to
build even though inevitably much older release tarballs build fine.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/ecm.eclass | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 12b31e4ef3..5724c74500 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -423,8 +423,14 @@ ecm_src_prepare() {
done
fi
- # limit playing field of locale stripping to kde-*/ categories
if [[ ${CATEGORY} = kde-* ]] ; then
+ # overzealous upstream disable-deprecated-before by .git dir
detection
+ if [[ -e .git ]]; then
+ sed -e "/^if.*EXISTS.*CMAKE_SOURCE_DIR.*\.git/s/$/ #
removed by ecm.eclass/" \
+ -e
"/^if.*EXISTS.*CMAKE_SOURCE_DIR.*\.git/s/(.*)/(FALSE)/" \
+ -i CMakeLists.txt || die
+ fi
+
# always install unconditionally for kconfigwidgets - if you use
# language X as system language, and there is a combobox with
language
# names, the translated language name for language Y is taken
from
