From 667a6164605736b83144303984ceb031740c8721 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: May 08 2023 06:49:51 +0000 Subject: Update to 10.0.1 --- diff --git a/.gitignore b/.gitignore index abcaf8a..c03b295 100644 --- a/.gitignore +++ b/.gitignore @@ -142,3 +142,6 @@ /qt-creator-opensource-src-10.0.0.tar.xz /cmake-16.0.0.src.tar.xz /clang-16.0.0.src.tar.xz +/clang-16.0.2.src.tar.xz +/cmake-16.0.2.src.tar.xz +/qt-creator-opensource-src-10.0.1.tar.xz diff --git a/qt-creator-clangformat.patch b/qt-creator-clangformat.patch index b228ea2..1c230fd 100644 --- a/qt-creator-clangformat.patch +++ b/qt-creator-clangformat.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qt-creator-opensource-src-10.0.0/cmake/FindClang.cmake qt-creator-opensource-src-10.0.0-new/cmake/FindClang.cmake ---- qt-creator-opensource-src-10.0.0/cmake/FindClang.cmake 2023-03-28 13:08:12.000000000 +0200 -+++ qt-creator-opensource-src-10.0.0-new/cmake/FindClang.cmake 2023-03-30 19:18:06.350524063 +0200 +diff -rupN --no-dereference qt-creator-opensource-src-10.0.1/cmake/FindClang.cmake qt-creator-opensource-src-10.0.1-new/cmake/FindClang.cmake +--- qt-creator-opensource-src-10.0.1/cmake/FindClang.cmake 2023-05-04 04:05:51.000000000 +0200 ++++ qt-creator-opensource-src-10.0.1-new/cmake/FindClang.cmake 2023-05-07 22:47:05.198957437 +0200 @@ -2,9 +2,16 @@ find_package(Clang CONFIG) option(CLANGTOOLING_LINK_CLANG_DYLIB "Force linking of Clang tooling against clang-cpp" NO) @@ -19,9 +19,9 @@ diff -rupN --no-dereference qt-creator-opensource-src-10.0.0/cmake/FindClang.cma endif() if (WIN32 AND TARGET clangTooling) -diff -rupN --no-dereference qt-creator-opensource-src-10.0.0/src/plugins/clangformat/CMakeLists.txt qt-creator-opensource-src-10.0.0-new/src/plugins/clangformat/CMakeLists.txt ---- qt-creator-opensource-src-10.0.0/src/plugins/clangformat/CMakeLists.txt 2023-03-28 13:08:13.000000000 +0200 -+++ qt-creator-opensource-src-10.0.0-new/src/plugins/clangformat/CMakeLists.txt 2023-03-30 19:18:06.350524063 +0200 +diff -rupN --no-dereference qt-creator-opensource-src-10.0.1/src/plugins/clangformat/CMakeLists.txt qt-creator-opensource-src-10.0.1-new/src/plugins/clangformat/CMakeLists.txt +--- qt-creator-opensource-src-10.0.1/src/plugins/clangformat/CMakeLists.txt 2023-05-04 04:05:53.000000000 +0200 ++++ qt-creator-opensource-src-10.0.1-new/src/plugins/clangformat/CMakeLists.txt 2023-05-07 22:47:05.198957437 +0200 @@ -1,6 +1,6 @@ add_qtc_plugin(ClangFormat - CONDITION TARGET ${CLANG_FORMAT_LIB} AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 10.0.0 AND (QTC_CLANG_BUILDMODE_MATCH OR CLANGTOOLING_LINK_CLANG_DYLIB) @@ -31,7 +31,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-10.0.0/src/plugins/clangfo PLUGIN_DEPENDS Core TextEditor CppEditor ProjectExplorer SOURCES clangformatbaseindenter.cpp clangformatbaseindenter.h -@@ -19,7 +19,7 @@ add_qtc_plugin(ClangFormat +@@ -20,7 +20,7 @@ add_qtc_plugin(ClangFormat if(TARGET ClangFormat) # "system" includes, so warnings are ignored diff --git a/qt-creator-debuginfod.patch b/qt-creator-debuginfod.patch index a6c386b..556a1e6 100644 --- a/qt-creator-debuginfod.patch +++ b/qt-creator-debuginfod.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qt-creator-opensource-src-10.0.0/cmake/Findelfutils.cmake qt-creator-opensource-src-10.0.0-new/cmake/Findelfutils.cmake ---- qt-creator-opensource-src-10.0.0/cmake/Findelfutils.cmake 2023-03-28 13:08:12.000000000 +0200 -+++ qt-creator-opensource-src-10.0.0-new/cmake/Findelfutils.cmake 2023-03-30 19:18:05.434536686 +0200 +diff -rupN --no-dereference qt-creator-opensource-src-10.0.1/cmake/Findelfutils.cmake qt-creator-opensource-src-10.0.1-new/cmake/Findelfutils.cmake +--- qt-creator-opensource-src-10.0.1/cmake/Findelfutils.cmake 2023-05-04 04:05:51.000000000 +0200 ++++ qt-creator-opensource-src-10.0.1-new/cmake/Findelfutils.cmake 2023-05-07 22:47:03.496695102 +0200 @@ -32,7 +32,7 @@ find_path(ELFUTILS_INCLUDE_DIR "${ELFUTILS_INSTALL_DIR}" ENV ELFUTILS_INSTALL_DIR "${CMAKE_PREFIX_PATH}" ) diff --git a/qt-creator.spec b/qt-creator.spec index 05f2e43..bb397fc 100644 --- a/qt-creator.spec +++ b/qt-creator.spec @@ -4,11 +4,11 @@ # is not a valid python file, only for the IDE %global _python_bytecompile_errors_terminate_build 0 -%global clangver 16.0.0 +%global clangver 16.0.2 Name: qt-creator -Version: 10.0.0 -Release: 3%{?dist} +Version: 10.0.1 +Release: 1%{?dist} Summary: Cross-platform IDE for Qt License: GPLv3 with exceptions @@ -216,6 +216,9 @@ diff -u %{SOURCE1} $outfile %changelog +* Sun May 07 2023 Sandro Mani +- Update to 10.0.1 + * Thu Apr 06 2023 Sandro Mani - 10.0.0-3 - Switch to clang-16 diff --git a/qt-creator_desktop.patch b/qt-creator_desktop.patch index ef2f57c..6bd0e77 100644 --- a/qt-creator_desktop.patch +++ b/qt-creator_desktop.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qt-creator-opensource-src-10.0.0/share/applications/org.qt-project.qtcreator.desktop qt-creator-opensource-src-10.0.0-new/share/applications/org.qt-project.qtcreator.desktop ---- qt-creator-opensource-src-10.0.0/share/applications/org.qt-project.qtcreator.desktop 2023-03-28 13:08:12.000000000 +0200 -+++ qt-creator-opensource-src-10.0.0-new/share/applications/org.qt-project.qtcreator.desktop 2023-03-30 19:18:03.569562617 +0200 +diff -rupN --no-dereference qt-creator-opensource-src-10.0.1/share/applications/org.qt-project.qtcreator.desktop qt-creator-opensource-src-10.0.1-new/share/applications/org.qt-project.qtcreator.desktop +--- qt-creator-opensource-src-10.0.1/share/applications/org.qt-project.qtcreator.desktop 2023-05-04 04:05:51.000000000 +0200 ++++ qt-creator-opensource-src-10.0.1-new/share/applications/org.qt-project.qtcreator.desktop 2023-05-07 22:47:01.694596568 +0200 @@ -8,5 +8,5 @@ Icon=QtProject-qtcreator StartupWMClass=qtcreator Terminal=false diff --git a/qt-creator_ninja-build.patch b/qt-creator_ninja-build.patch index 3657e51..35556a5 100644 --- a/qt-creator_ninja-build.patch +++ b/qt-creator_ninja-build.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qt-creator-opensource-src-10.0.0/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp qt-creator-opensource-src-10.0.0-new/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp ---- qt-creator-opensource-src-10.0.0/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp 2023-03-28 13:08:13.000000000 +0200 -+++ qt-creator-opensource-src-10.0.0-new/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp 2023-03-30 19:18:02.590576355 +0200 +diff -rupN --no-dereference qt-creator-opensource-src-10.0.1/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp qt-creator-opensource-src-10.0.1-new/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +--- qt-creator-opensource-src-10.0.1/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp 2023-05-04 04:05:54.000000000 +0200 ++++ qt-creator-opensource-src-10.0.1-new/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp 2023-05-07 22:47:00.790049051 +0200 @@ -682,7 +682,7 @@ QVariant CMakeGeneratorKitAspect::defaul auto settings = Internal::CMakeSpecificSettings::instance(); if (settings->ninjaPath.filePath().isEmpty()) { diff --git a/qt-creator_qmake-names.patch b/qt-creator_qmake-names.patch index fdd5881..3e23c77 100644 --- a/qt-creator_qmake-names.patch +++ b/qt-creator_qmake-names.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qt-creator-opensource-src-10.0.0/src/libs/utils/buildablehelperlibrary.cpp qt-creator-opensource-src-10.0.0-new/src/libs/utils/buildablehelperlibrary.cpp ---- qt-creator-opensource-src-10.0.0/src/libs/utils/buildablehelperlibrary.cpp 2023-03-28 13:08:13.000000000 +0200 -+++ qt-creator-opensource-src-10.0.0-new/src/libs/utils/buildablehelperlibrary.cpp 2023-03-30 19:18:04.514549439 +0200 +diff -rupN --no-dereference qt-creator-opensource-src-10.0.1/src/libs/utils/buildablehelperlibrary.cpp qt-creator-opensource-src-10.0.1-new/src/libs/utils/buildablehelperlibrary.cpp +--- qt-creator-opensource-src-10.0.1/src/libs/utils/buildablehelperlibrary.cpp 2023-05-04 04:05:54.000000000 +0200 ++++ qt-creator-opensource-src-10.0.1-new/src/libs/utils/buildablehelperlibrary.cpp 2023-05-07 22:47:02.594146585 +0200 @@ -155,7 +155,12 @@ QStringList BuildableHelperLibrary::poss // On Unix some distributions renamed qmake with a postfix to avoid clashes // On OS X, Qt 4 binary packages also has renamed qmake. There are also symbolic links that are diff --git a/sources b/sources index 39a7288..019a3ee 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cmake-16.0.0.src.tar.xz) = 4f21461aa8165061dbea47dcda4f098957e16bd307484bcb66884cf5a0776197f69a74002d5601229c4630db53ac44049f3f2ce1e96a6bb16ba3df828d387932 -SHA512 (clang-16.0.0.src.tar.xz) = 2a6ff3b4d61b4e9fcb60a6d9dae451170cd91acc25f924a29c18c579ee78af76d2d5eebb2940d61676e2e791fb247ccf9f5377b5528f3a0fa7dd0ac8e72816ba -SHA512 (qt-creator-opensource-src-10.0.0.tar.xz) = 33087c1ca4557a62e03b9a8213d1e00abda78cac09320421497e9908eef3bd454a60e968d7898f9928f90cbf1cdd5c1bea42f1d3f6f9f1095f9a2a24c78a5a01 +SHA512 (clang-16.0.2.src.tar.xz) = 320d39303432f11f0079f0de62b8807a4b3439b2000564844765401557c77f8ab3be2f578bbe586cd2ea4c03128f06f8dbccc3df7984a3d747e2681e98b219f1 +SHA512 (cmake-16.0.2.src.tar.xz) = ce4bd6eddda6cfeeee8523d248b107114189c09e4aae478902798d14fc8fa2bfe316d0bcec44c5d4c36c77484fe6f6a7f0fb758dcd13edbeb322095fc1f6a7a6 +SHA512 (qt-creator-opensource-src-10.0.1.tar.xz) = 20f2748cf324b85db5e63139f1aa657ae2fe01ceffb6d9b689108b0c7a19f340768bbd41ff5a013d24c7063541735508683289454a00ee6559eb80ce6a4bec89