diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2021-02-13 18:30:46 +0100 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2021-02-14 13:07:53 +0100 |
| commit | e0a236ce2aaf35673906212a7bcc3ab09ec71de6 (patch) | |
| tree | deffc334677ade4909233f22345c779ff763580c /libre/qtcreator/qtcreator-fix-clang-paths.patch | |
| parent | ce9e323e4ce59976339d2b458101ea3eb8f2718a (diff) | |
libre: qtcreator: sync from core from 4.12.4-1 to 4.14.0-4
libre.patch seem not to be needed anymore, as merely not having
the qt5-webengine dependency during build and/or not having any
support for qt5-webengine in various Qt components is enough to
build qtcreator.
Builds without qt5-webengine seem to be used for running tests.
The tests/system/README file inside the qt5-webengine source
code has more information on that.
The qtcreator package still needs to be tested at runtime to
understand if removing the libre.patch has any bad side effects.
Without that patch, qtcreator cannot be installed anymore:
# pacman -S qtcreator
resolving dependencies...
warning: cannot resolve "clang=10.0.1", a dependency of "qtcreator"
:: The following package cannot be upgraded due to unresolvable
dependencies:
qtcreator
:: Do you want to skip the above package for this upgrade? [y/N]
and building a package without the refreshed patch would make it
easier for people to test if it works fine.
As the patch is pretty easy to refresh it shouldn't be too much
time consuming to refresh it if it turns out that it is really
needed.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Diffstat (limited to 'libre/qtcreator/qtcreator-fix-clang-paths.patch')
| -rw-r--r-- | libre/qtcreator/qtcreator-fix-clang-paths.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/libre/qtcreator/qtcreator-fix-clang-paths.patch b/libre/qtcreator/qtcreator-fix-clang-paths.patch new file mode 100644 index 000000000..84a0a43f6 --- /dev/null +++ b/libre/qtcreator/qtcreator-fix-clang-paths.patch @@ -0,0 +1,15 @@ +diff --git a/src/libs/clangsupport/CMakeLists.txt b/src/libs/clangsupport/CMakeLists.txt +index dcaa464710..01cf7580b7 100644 +--- a/src/libs/clangsupport/CMakeLists.txt ++++ b/src/libs/clangsupport/CMakeLists.txt +@@ -5,8 +5,8 @@ add_qtc_library(ClangSupport + PUBLIC_DEPENDS Utils Sqlite Qt5::Core Qt5::Network + PUBLIC_DEFINES + CLANG_VERSION="${CLANG_VERSION}" +- CLANG_INCLUDE_DIR="${IDE_LIBEXEC_PATH}/clang/lib/clang/${CLANG_VERSION}/include" +- CLANG_BINDIR="${IDE_LIBEXEC_PATH}/clang/bin" ++ CLANG_INCLUDE_DIR="/usr/lib/clang/${CLANG_VERSION}/include" ++ CLANG_BINDIR="/usr/bin" + DEFINES CLANGSUPPORT_BUILD_LIB + PUBLIC_INCLUDES + "${CMAKE_CURRENT_LIST_DIR}" |