diff --git a/.gitignore b/.gitignore index 563e8df..6879536 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ /qt-creator-opensource-src-4.7.0-rc1.tar.xz /qt-creator-opensource-src-4.7.0.tar.xz /qt-creator-opensource-src-4.7.1.tar.xz +/qt-creator-opensource-src-4.8.0-beta1.tar.xz diff --git a/qt-creator-Fedora-privlibs b/qt-creator-Fedora-privlibs index 79e7369..f6a8389 100644 --- a/qt-creator-Fedora-privlibs +++ b/qt-creator-Fedora-privlibs @@ -11,14 +11,17 @@ %global privlibs %{privlibs}|libCPlusPlus %global privlibs %{privlibs}|libCVS %global privlibs %{privlibs}|libClangCodeModel +%global privlibs %{privlibs}|libClangFormat %global privlibs %{privlibs}|libClangTools %global privlibs %{privlibs}|libClangsupport %global privlibs %{privlibs}|libClassView %global privlibs %{privlibs}|libClearCase %global privlibs %{privlibs}|libCodePaster +%global privlibs %{privlibs}|libCompilationDatabaseProjectManager %global privlibs %{privlibs}|libCore %global privlibs %{privlibs}|libCppEditor %global privlibs %{privlibs}|libCppTools +%global privlibs %{privlibs}|libCppcheck %global privlibs %{privlibs}|libDebugger %global privlibs %{privlibs}|libDesigner %global privlibs %{privlibs}|libDiffEditor @@ -33,6 +36,8 @@ %global privlibs %{privlibs}|libHelp %global privlibs %{privlibs}|libImageViewer %global privlibs %{privlibs}|libIos +%global privlibs %{privlibs}|libLanguageClient +%global privlibs %{privlibs}|libLanguageServerProtocol %global privlibs %{privlibs}|libLanguageUtils %global privlibs %{privlibs}|libMacros %global privlibs %{privlibs}|libMercurial diff --git a/qt-creator.spec b/qt-creator.spec index c218bc2..7017069 100644 --- a/qt-creator.spec +++ b/qt-creator.spec @@ -1,12 +1,12 @@ -#define prerelease rc1 +%define prerelease beta1 # We need avoid oython byte compiler to not crash over template .py file which # is not a valid python file, only for the IDE %global _python_bytecompile_errors_terminate_build 0 Name: qt-creator -Version: 4.7.1 -Release: 2%{?prerelease:.%prerelease}%{?dist} +Version: 4.8.0 +Release: 0.1%{?prerelease:.%prerelease}%{?dist} Summary: Cross-platform IDE for Qt License: GPLv3 with exceptions @@ -23,8 +23,6 @@ Patch1: qt-creator_appdata.patch Patch2: qt-creator_desktop.patch # Invoke versioned python interpreter Patch3: qt-creator_python3.patch -# Fix build against clang-7.0 -Patch4: qt-creator_clang7.patch # tight dep on qt5-qtbase used to build, uses some private apis BuildRequires: qt5-qtbase-private-devel @@ -183,6 +181,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Oct 11 2018 Sandro Mani - 4.8.0-0.1.beta1 +- Update to 4.8.0-beta1 + * Fri Sep 21 2018 Jan Grulich - 4.7.1-2 - rebuild (qt5) diff --git a/qt-creator_appdata.patch b/qt-creator_appdata.patch index 9a82101..77ed1d7 100644 --- a/qt-creator_appdata.patch +++ b/qt-creator_appdata.patch @@ -1,6 +1,6 @@ -diff -rupN qt-creator-opensource-src-4.7.1/dist/org.qt-project.qtcreator.appdata.xml qt-creator-opensource-src-4.7.1-new/dist/org.qt-project.qtcreator.appdata.xml ---- qt-creator-opensource-src-4.7.1/dist/org.qt-project.qtcreator.appdata.xml 2018-09-18 10:30:26.000000000 +0200 -+++ qt-creator-opensource-src-4.7.1-new/dist/org.qt-project.qtcreator.appdata.xml 2018-09-20 21:41:36.356792667 +0200 +diff -rupN qt-creator-opensource-src-4.8.0-beta1/dist/org.qt-project.qtcreator.appdata.xml qt-creator-opensource-src-4.8.0-beta1-new/dist/org.qt-project.qtcreator.appdata.xml +--- qt-creator-opensource-src-4.8.0-beta1/dist/org.qt-project.qtcreator.appdata.xml 2018-10-09 14:54:47.000000000 +0200 ++++ qt-creator-opensource-src-4.8.0-beta1-new/dist/org.qt-project.qtcreator.appdata.xml 2018-10-11 11:30:54.275801743 +0200 @@ -1,6 +1,8 @@ diff --git a/qt-creator_clang7.patch b/qt-creator_clang7.patch deleted file mode 100644 index a019697..0000000 --- a/qt-creator_clang7.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -rupN qt-creator-opensource-src-4.7.1/src/tools/clangbackend/source/clangbackend_global.h qt-creator-opensource-src-4.7.1-new/src/tools/clangbackend/source/clangbackend_global.h ---- qt-creator-opensource-src-4.7.1/src/tools/clangbackend/source/clangbackend_global.h 2018-09-18 10:30:26.000000000 +0200 -+++ qt-creator-opensource-src-4.7.1-new/src/tools/clangbackend/source/clangbackend_global.h 2018-09-20 23:34:47.601417022 +0200 -@@ -38,22 +38,22 @@ enum class PreferredTranslationUnit - - // CLANG-UPGRADE-CHECK: Remove IS_PRETTY_DECL_SUPPORTED once we require clang >= 7.0 - #if defined(CINDEX_VERSION_HAS_PRETTYDECL_BACKPORTED) || CINDEX_VERSION_MINOR >= 46 --# define IS_PRETTY_DECL_SUPPORTED -+// # define IS_PRETTY_DECL_SUPPORTED - #endif - - // CLANG-UPGRADE-CHECK: Remove IS_INVALIDDECL_SUPPORTED once we require clang >= 7.0 - #if defined(CINDEX_VERSION_HAS_ISINVALIDECL_BACKPORTED) || CINDEX_VERSION_MINOR >= 46 --# define IS_INVALIDDECL_SUPPORTED -+// # define IS_INVALIDDECL_SUPPORTED - #endif - - // CLANG-UPGRADE-CHECK: Remove IS_LIMITSKIPFUNCTIONBODIESTOPREAMBLE_SUPPORTED once we require clang >= 7.0 - #if defined(CINDEX_VERSION_HAS_LIMITSKIPFUNCTIONBODIESTOPREAMBLE_BACKPORTED) || CINDEX_VERSION_MINOR >= 46 --# define IS_LIMITSKIPFUNCTIONBODIESTOPREAMBLE_SUPPORTED -+// # define IS_LIMITSKIPFUNCTIONBODIESTOPREAMBLE_SUPPORTED - #endif - - // CLANG-UPGRADE-CHECK: Remove IS_SKIPWARNINGSFROMINCLUDEDFILES_SUPPORTED once we require clang >= 7.0 - #if defined(CINDEX_VERSION_HAS_SKIPWARNINGSFROMINCLUDEDFILES_BACKPORTED) || CINDEX_VERSION_MINOR >= 46 --# define IS_SKIPWARNINGSFROMINCLUDEDFILES_SUPPORTED -+// # define IS_SKIPWARNINGSFROMINCLUDEDFILES_SUPPORTED - #endif - - } // namespace ClangBackEnd diff --git a/qt-creator_desktop.patch b/qt-creator_desktop.patch index b70e392..30443f7 100644 --- a/qt-creator_desktop.patch +++ b/qt-creator_desktop.patch @@ -1,6 +1,6 @@ -diff -rupN qt-creator-opensource-src-4.7.1/dist/org.qt-project.qtcreator.desktop qt-creator-opensource-src-4.7.1-new/dist/org.qt-project.qtcreator.desktop ---- qt-creator-opensource-src-4.7.1/dist/org.qt-project.qtcreator.desktop 2018-09-18 10:30:26.000000000 +0200 -+++ qt-creator-opensource-src-4.7.1-new/dist/org.qt-project.qtcreator.desktop 2018-09-20 21:41:36.759792645 +0200 +diff -rupN qt-creator-opensource-src-4.8.0-beta1/dist/org.qt-project.qtcreator.desktop qt-creator-opensource-src-4.8.0-beta1-new/dist/org.qt-project.qtcreator.desktop +--- qt-creator-opensource-src-4.8.0-beta1/dist/org.qt-project.qtcreator.desktop 2018-10-09 14:54:47.000000000 +0200 ++++ qt-creator-opensource-src-4.8.0-beta1-new/dist/org.qt-project.qtcreator.desktop 2018-10-11 11:30:54.948801705 +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 a532e25..f8038d7 100644 --- a/qt-creator_ninja-build.patch +++ b/qt-creator_ninja-build.patch @@ -1,7 +1,7 @@ -diff -rupN qt-creator-opensource-src-4.7.1/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp qt-creator-opensource-src-4.7.1-new/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp ---- qt-creator-opensource-src-4.7.1/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp 2018-09-18 10:30:26.000000000 +0200 -+++ qt-creator-opensource-src-4.7.1-new/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp 2018-09-20 21:41:35.929792690 +0200 -@@ -322,7 +322,7 @@ QVariant CMakeGeneratorKitInformation::d +diff -rupN qt-creator-opensource-src-4.8.0-beta1/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp qt-creator-opensource-src-4.8.0-beta1-new/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +--- qt-creator-opensource-src-4.8.0-beta1/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp 2018-10-09 14:54:47.000000000 +0200 ++++ qt-creator-opensource-src-4.8.0-beta1-new/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp 2018-10-11 11:30:53.581801781 +0200 +@@ -325,7 +325,7 @@ QVariant CMakeGeneratorKitInformation::d if (it != known.constEnd()) { Utils::Environment env = Utils::Environment::systemEnvironment(); k->addToEnvironment(env); diff --git a/qt-creator_python3.patch b/qt-creator_python3.patch index 4043c8e..364eb67 100644 --- a/qt-creator_python3.patch +++ b/qt-creator_python3.patch @@ -1,6 +1,6 @@ -diff -rupN qt-creator-opensource-src-4.7.1/qtcreator.pro qt-creator-opensource-src-4.7.1-new/qtcreator.pro ---- qt-creator-opensource-src-4.7.1/qtcreator.pro 2018-09-18 10:30:26.000000000 +0200 -+++ qt-creator-opensource-src-4.7.1-new/qtcreator.pro 2018-09-20 22:32:59.520622127 +0200 +diff -rupN qt-creator-opensource-src-4.8.0-beta1/qtcreator.pro qt-creator-opensource-src-4.8.0-beta1-new/qtcreator.pro +--- qt-creator-opensource-src-4.8.0-beta1/qtcreator.pro 2018-10-09 14:54:47.000000000 +0200 ++++ qt-creator-opensource-src-4.8.0-beta1-new/qtcreator.pro 2018-10-11 11:30:55.610801669 +0200 @@ -112,13 +112,13 @@ macx { BINDIST_SOURCE = "$$OUT_PWD/bin/$${IDE_APP_TARGET}.app" deployqt.commands = $$PWD/scripts/deployqtHelper_mac.sh \"$${APPBUNDLE}\" \"$$[QT_INSTALL_BINS]\" \"$$[QT_INSTALL_TRANSLATIONS]\" \"$$[QT_INSTALL_PLUGINS]\" \"$$[QT_INSTALL_IMPORTS]\" \"$$[QT_INSTALL_QML]\" @@ -30,18 +30,18 @@ diff -rupN qt-creator-opensource-src-4.7.1/qtcreator.pro qt-creator-opensource-s win32 { deployqt.commands ~= s,/,\\\\,g -diff -rupN qt-creator-opensource-src-4.7.1/src/libs/3rdparty/botan/configure.py qt-creator-opensource-src-4.7.1-new/src/libs/3rdparty/botan/configure.py ---- qt-creator-opensource-src-4.7.1/src/libs/3rdparty/botan/configure.py 2018-09-18 10:30:26.000000000 +0200 -+++ qt-creator-opensource-src-4.7.1-new/src/libs/3rdparty/botan/configure.py 2018-09-20 22:34:33.658616920 +0200 +diff -rupN qt-creator-opensource-src-4.8.0-beta1/src/libs/3rdparty/botan/configure.py qt-creator-opensource-src-4.8.0-beta1-new/src/libs/3rdparty/botan/configure.py +--- qt-creator-opensource-src-4.8.0-beta1/src/libs/3rdparty/botan/configure.py 2018-10-09 14:54:47.000000000 +0200 ++++ qt-creator-opensource-src-4.8.0-beta1-new/src/libs/3rdparty/botan/configure.py 2018-10-11 11:30:55.611801669 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Configuration program for botan -diff -rupN qt-creator-opensource-src-4.7.1/src/libs/botan/botan.pro qt-creator-opensource-src-4.7.1-new/src/libs/botan/botan.pro ---- qt-creator-opensource-src-4.7.1/src/libs/botan/botan.pro 2018-09-18 10:30:26.000000000 +0200 -+++ qt-creator-opensource-src-4.7.1-new/src/libs/botan/botan.pro 2018-09-20 22:34:18.518617758 +0200 +diff -rupN qt-creator-opensource-src-4.8.0-beta1/src/libs/botan/botan.pro qt-creator-opensource-src-4.8.0-beta1-new/src/libs/botan/botan.pro +--- qt-creator-opensource-src-4.8.0-beta1/src/libs/botan/botan.pro 2018-10-09 14:54:47.000000000 +0200 ++++ qt-creator-opensource-src-4.8.0-beta1-new/src/libs/botan/botan.pro 2018-10-11 11:30:55.611801669 +0200 @@ -44,7 +44,7 @@ configure.input = configure_inputs configure.output = $$BOTAN_BUILD_DIR/Makefile configure.variable_out = BOTAN_MAKEFILE diff --git a/sources b/sources index 3f6dff3..c544340 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qt-creator-opensource-src-4.7.1.tar.xz) = 839db5409c65b33293fcd21bbf3c6ec1900f640a05451d94d8d6df0421bb56d34f1fd98b9dc5a5f1ab2cb05a65dc2b23532b44c0687c3ca9d310b629474d2461 +SHA512 (qt-creator-opensource-src-4.8.0-beta1.tar.xz) = 9fe504ca93d07cd15d592d88082941b8dcdbc695943a45c3769e13581b2cbf36f066a8b554ef48b83dc3c5bf7214dd2a7b8d1b6e7a8b92eba251815db622ab92