From bb97d066dd96c3fe812a091a5e70255fc110a955 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 18 Apr 2020 23:07:25 +0200 Subject: 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 --- eclass/ecm.eclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'eclass/ecm.eclass') diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 12b31e4ef32..5724c745003 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 -- cgit v1.2.3