Hello community, here is the log from the commit of package libqt5-creator for openSUSE:Factory checked in at 2020-10-07 14:18:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-creator (Old) and /work/SRC/openSUSE:Factory/.libqt5-creator.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-creator" Wed Oct 7 14:18:12 2020 rev:82 rq:839890 version:4.13.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-creator/libqt5-creator.changes 2020-09-21 17:46:46.205102258 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-creator.new.4249/libqt5-creator.changes 2020-10-07 14:18:18.609477274 +0200 @@ -1,0 +2,8 @@ +Thu Oct 1 18:18:50 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 4.13.2 + https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/dist/changes-4.13.2.md +- Add patch to avoid relying on non-existent clang file copies (boo#1176888) + * 0001-Don-t-rely-on-clang-include-and-binary-copies.patch + +------------------------------------------------------------------- Old: ---- qt-creator-opensource-src-4.13.1.tar.xz New: ---- 0001-Don-t-rely-on-clang-include-and-binary-copies.patch qt-creator-opensource-src-4.13.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-creator.spec ++++++ --- /var/tmp/diff_new_pack.nn132S/_old 2020-10-07 14:18:22.241480162 +0200 +++ /var/tmp/diff_new_pack.nn132S/_new 2020-10-07 14:18:22.245480166 +0200 @@ -23,9 +23,9 @@ %endif %define major_ver 4.13 %define qt5_version 5.12.0 -%define tar_version 4.13.1 +%define tar_version 4.13.2 Name: libqt5-creator -Version: 4.13.1 +Version: 4.13.2 Release: 0 Summary: Integrated Development Environment targeting Qt apps # src/plugins/cmakeprojectmanager/configmodelitemdelegate.* -> LGPL-2.1-only OR LGPL-3.0-only @@ -46,6 +46,8 @@ Patch1: fix-application-output.patch # PATCH-FIX-OPENSUSE Patch2: 0001-Disable-some-plugins.patch +# PATCH-FIX-OPENSUSE +Patch3: 0001-Don-t-rely-on-clang-include-and-binary-copies.patch BuildRequires: cmake BuildRequires: libqt5-qtbase-private-headers-devel >= %{qt5_version} BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{qt5_version} ++++++ 0001-Don-t-rely-on-clang-include-and-binary-copies.patch ++++++ >From fc882219ffbd7372a463788791d7e2d69e0ed194 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Thu, 1 Oct 2020 19:59:56 +0200 Subject: [PATCH] Don't rely on clang include and binary copies The qtcreator build system contains a build target disabled by default which copies the clang include files and binaries into the qtcreator libexec subdir. Instead, we'll use the openSUSE's clang locations directly. This should fix boo#1176888 and work around https://bugreports.qt.io/browse/QTCREATORBUG-24583 and https://bugreports.qt.io/browse/QTCREATORBUG-21972. --- src/libs/clangsupport/CMakeLists.txt | 42 ++-------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/src/libs/clangsupport/CMakeLists.txt b/src/libs/clangsupport/CMakeLists.txt index d1f38507..792566a3 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_RESOURCE_DIR="${IDE_LIBEXEC_PATH}/clang/lib/clang/${CLANG_VERSION}/include" - CLANG_BINDIR="${IDE_LIBEXEC_PATH}/clang/bin" + CLANG_RESOURCE_DIR="${LLVM_LIBRARY_DIR}/clang/${CLANG_VERSION}/include" + CLANG_BINDIR="${LLVM_LIBRARY_DIR}/clang/${CLANG_VERSION}/bin" DEFINES CLANGSUPPORT_BUILD_LIB PUBLIC_INCLUDES "${CMAKE_CURRENT_LIST_DIR}" @@ -146,41 +146,3 @@ add_qtc_library(ClangSupport if (NOT TARGET libclang) return() endif() - -# For the developer build directory -qtc_copy_to_builddir(copy_clang_to_builddir - DIRECTORIES "${LLVM_LIBRARY_DIR}/clang/${CLANG_VERSION}/include" - DESTINATION "${IDE_LIBEXEC_PATH}/clang/lib/clang/${CLANG_VERSION}/include" -) - -foreach(executable clang clang-cl clangd clang-tidy clazy-standalone) - if (EXISTS "${LLVM_TOOLS_BINARY_DIR}/${executable}${CMAKE_EXECUTABLE_SUFFIX}") - qtc_copy_to_builddir(copy_clang_${executable}_to_builddir - FILES "${LLVM_TOOLS_BINARY_DIR}/${executable}${CMAKE_EXECUTABLE_SUFFIX}" - DESTINATION "${IDE_LIBEXEC_PATH}/clang/bin/" - ) - # For the install directory - install(PROGRAMS - "${LLVM_TOOLS_BINARY_DIR}/${executable}${CMAKE_EXECUTABLE_SUFFIX}" - DESTINATION "${IDE_LIBEXEC_PATH}/clang/bin" - COMPONENT Dependencies - EXCLUDE_FROM_ALL - ) - if (IS_SYMLINK "${LLVM_TOOLS_BINARY_DIR}/${executable}${CMAKE_EXECUTABLE_SUFFIX}") - file(READ_SYMLINK - "${LLVM_TOOLS_BINARY_DIR}/${executable}${CMAKE_EXECUTABLE_SUFFIX}" real_executable) - install(PROGRAMS - "${LLVM_TOOLS_BINARY_DIR}/${real_executable}${CMAKE_EXECUTABLE_SUFFIX}" - DESTINATION "${IDE_LIBEXEC_PATH}/clang/bin" - COMPONENT Dependencies - EXCLUDE_FROM_ALL - ) - endif() - endif() -endforeach() - -install(DIRECTORY ${LLVM_LIBRARY_DIR}/clang/${CLANG_VERSION}/include - DESTINATION "${IDE_LIBEXEC_PATH}/clang/lib/clang/${CLANG_VERSION}" - COMPONENT Dependencies - EXCLUDE_FROM_ALL -) -- 2.28.0 ++++++ qt-creator-opensource-src-4.13.1.tar.xz -> qt-creator-opensource-src-4.13.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-creator/qt-creator-opensource-src-4.13.1.tar.xz /work/SRC/openSUSE:Factory/.libqt5-creator.new.4249/qt-creator-opensource-src-4.13.2.tar.xz differ: char 26, line 1
