Hello community, here is the log from the commit of package libqt5-creator for openSUSE:Factory checked in at 2020-05-23 17:27:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-creator (Old) and /work/SRC/openSUSE:Factory/.libqt5-creator.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-creator" Sat May 23 17:27:07 2020 rev:78 rq:807774 version:4.12.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-creator/libqt5-creator.changes 2020-05-05 19:03:36.946466449 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-creator.new.2738/libqt5-creator.changes 2020-05-23 17:28:21.487527113 +0200 @@ -1,0 +2,15 @@ +Wed May 20 13:05:00 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 4.12.1. + https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/dist/changes-4.12.1.md?h=4.12 + * Fixed crash when changing font settings + * Fixed availability of `Link with Qt` information on startup + * Fixed crash when loading settings from Qt Creator < 4.11 + * Fixed semantic highlighting + * Fixed wrong symbol highlighting + * Fixed warning for `palette` property +- Drop android-guard-against-kits-without-qt-version.patch. + Fixed upstream. +- Rebase 0001-Fix-build-with-openSUSE-clang9-package.patch + +------------------------------------------------------------------- Old: ---- android-guard-against-kits-without-qt-version.patch qt-creator-opensource-src-4.12.0.tar.xz New: ---- qt-creator-opensource-src-4.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-creator.spec ++++++ --- /var/tmp/diff_new_pack.4syjAL/_old 2020-05-23 17:28:24.891534478 +0200 +++ /var/tmp/diff_new_pack.4syjAL/_new 2020-05-23 17:28:24.895534486 +0200 @@ -24,7 +24,7 @@ %endif Name: libqt5-creator -Version: 4.12.0 +Version: 4.12.1 Release: 0 Summary: Integrated Development Environment targeting Qt apps # src/plugins/cmakeprojectmanager/configmodelitemdelegate.* -> LGPL-2.1-only OR LGPL-3.0-only @@ -38,15 +38,13 @@ Url: https://www.qt.io/ide/ %define major_ver 4.12 %define qt5_version 5.11.0 -%define tar_version 4.12.0 +%define tar_version 4.12.1 Source: https://download.qt.io/official_releases/qtcreator/%{major_ver}/%{tar_version}/qt-creator-opensource-src-%{tar_version}.tar.xz Source1: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE Patch0: 0001-Fix-build-with-openSUSE-clang9-package.patch # PATCH-FIX-OPENSUSE Patch1: fix-application-output.patch -# PATCH-FIX-UPSTREAM -Patch2: android-guard-against-kits-without-qt-version.patch BuildRequires: gdb BuildRequires: libQt5Sql5-sqlite >= %{qt5_version} BuildRequires: libbotan-devel ++++++ 0001-Fix-build-with-openSUSE-clang9-package.patch ++++++ --- /var/tmp/diff_new_pack.4syjAL/_old 2020-05-23 17:28:24.915534530 +0200 +++ /var/tmp/diff_new_pack.4syjAL/_new 2020-05-23 17:28:24.919534538 +0200 @@ -1,4 +1,4 @@ -From 3f4680ba2e05535fa9b4349859e8bf36c40b21eb Mon Sep 17 00:00:00 2001 +From 483bd167b14c708d4d2be882fe99660b67b0b0cb Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Wed, 4 Dec 2019 16:22:53 +0100 Subject: [PATCH] Fix build with openSUSE clang9 package. @@ -14,11 +14,11 @@ 5 files changed, 12 insertions(+), 55 deletions(-) diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js -index d1bd2dd2..70a3c21e 100644 +index 0c15a2a6..114e45b9 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js -@@ -110,24 +110,9 @@ function formattingLibs(llvmConfig, qtcFunctions, targetOS) - var clangVersion = version(llvmConfig) +@@ -113,24 +113,9 @@ function formattingLibs(llvmConfig, qtcFunctions, targetOS) + return []; var libs = [] if (qtcFunctions.versionIsAtLeast(clangVersion, MinimumLLVMVersion)) { - if (qtcFunctions.versionIsAtLeast(clangVersion, "8.0.0")) { @@ -45,7 +45,7 @@ libs = libs.concat(extraLibraries(llvmConfig, targetOS)); } -@@ -137,21 +122,7 @@ function formattingLibs(llvmConfig, qtcFunctions, targetOS) +@@ -140,21 +125,7 @@ function formattingLibs(llvmConfig, qtcFunctions, targetOS) function toolingLibs(llvmConfig, targetOS) { var fixedList = [ @@ -111,7 +111,7 @@ clangpchmanagerbackendmain.cpp ) diff --git a/src/tools/clangrefactoringbackend/source/CMakeLists.txt b/src/tools/clangrefactoringbackend/source/CMakeLists.txt -index 420e630c..e0fff46b 100644 +index f06ddee1..77c9a6da 100644 --- a/src/tools/clangrefactoringbackend/source/CMakeLists.txt +++ b/src/tools/clangrefactoringbackend/source/CMakeLists.txt @@ -2,10 +2,7 @@ add_qtc_library(clangrefactoringbackend_lib STATIC @@ -127,10 +127,10 @@ PUBLIC_INCLUDES ${CLANG_INCLUDE_DIRS} diff --git a/tests/unit/unittest/CMakeLists.txt b/tests/unit/unittest/CMakeLists.txt -index 306c0276..fefb63b1 100644 +index 4e7b97d5..ad6a8719 100644 --- a/tests/unit/unittest/CMakeLists.txt +++ b/tests/unit/unittest/CMakeLists.txt -@@ -243,7 +243,7 @@ if (TARGET libclang) +@@ -248,7 +248,7 @@ if (TARGET libclang) target_link_libraries(unittest PRIVATE libclang) endif() @@ -139,7 +139,7 @@ target_compile_definitions(unittest PRIVATE CLANG_UNIT_TESTS) target_sources(unittest PRIVATE gtest-llvm-printing.cpp -@@ -265,16 +265,10 @@ if (TARGET clangTooling) +@@ -270,16 +270,10 @@ if (TARGET clangTooling) builddependencycollector-test.cpp mockrefactoringclient.h mockrefactoringserver.h @@ -159,5 +159,5 @@ if (TARGET GoogleBenchmark) -- -2.24.0 +2.26.2 ++++++ qt-creator-opensource-src-4.12.0.tar.xz -> qt-creator-opensource-src-4.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-creator/qt-creator-opensource-src-4.12.0.tar.xz /work/SRC/openSUSE:Factory/.libqt5-creator.new.2738/qt-creator-opensource-src-4.12.1.tar.xz differ: char 26, line 1
