From d5e4ca84df071e364afc0d3d7b3f3e429475499d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sep 21 2018 07:50:02 +0000 Subject: Update to 4.7.1 --- diff --git a/.gitignore b/.gitignore index bc83bfa..563e8df 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ /qt-creator-opensource-src-4.7.0-beta2.tar.xz /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 diff --git a/qt-creator-Fedora-privlibs b/qt-creator-Fedora-privlibs index 2895c1e..79e7369 100644 --- a/qt-creator-Fedora-privlibs +++ b/qt-creator-Fedora-privlibs @@ -11,8 +11,6 @@ %global privlibs %{privlibs}|libCPlusPlus %global privlibs %{privlibs}|libCVS %global privlibs %{privlibs}|libClangCodeModel -%global privlibs %{privlibs}|libClangPchManager -%global privlibs %{privlibs}|libClangRefactoring %global privlibs %{privlibs}|libClangTools %global privlibs %{privlibs}|libClangsupport %global privlibs %{privlibs}|libClassView diff --git a/qt-creator.spec b/qt-creator.spec index 64b86c3..895b537 100644 --- a/qt-creator.spec +++ b/qt-creator.spec @@ -5,7 +5,7 @@ %global _python_bytecompile_errors_terminate_build 0 Name: qt-creator -Version: 4.7.0 +Version: 4.7.1 Release: 1%{?prerelease:.%prerelease}%{?dist} Summary: Cross-platform IDE for Qt @@ -21,6 +21,12 @@ Patch0: qt-creator_ninja-build.patch Patch1: qt-creator_appdata.patch # Fix leading whitespace in desktop file Patch2: qt-creator_desktop.patch +%if 0%{fedora} >= 30 +# Invoke versioned python interpreter +Patch3: qt-creator_python3.patch +# Fix build against clang-7.0 +Patch4: qt-creator_clang7.patch +%endif # tight dep on qt5-qtbase used to build, uses some private apis BuildRequires: qt5-qtbase-private-devel @@ -34,6 +40,7 @@ BuildRequires: pkgconfig(Qt5XmlPatterns) >= 5.6.0 BuildRequires: pkgconfig(Qt5X11Extras) >= 5.6.0 BuildRequires: pkgconfig(Qt5WebKit) >= 5.6.0 BuildRequires: pkgconfig(Qt5Help) >= 5.6.0 +BuildRequires: python3 BuildRequires: qbs-devel BuildRequires: desktop-file-utils BuildRequires: botan-devel @@ -178,6 +185,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Sep 20 2018 Sandro Mani - 4.7.1-1 +- Update to 4.7.1 + * Wed Jul 18 2018 Sandro Mani - 4.7.0-1 - Update to 4.7.0 diff --git a/qt-creator_appdata.patch b/qt-creator_appdata.patch index 3791fba..9a82101 100644 --- a/qt-creator_appdata.patch +++ b/qt-creator_appdata.patch @@ -1,6 +1,6 @@ -diff -rupN qt-creator-opensource-src-4.7.0-beta1/dist/org.qt-project.qtcreator.appdata.xml qt-creator-opensource-src-4.7.0-beta1-new/dist/org.qt-project.qtcreator.appdata.xml ---- qt-creator-opensource-src-4.7.0-beta1/dist/org.qt-project.qtcreator.appdata.xml 2018-06-04 06:52:27.000000000 +0200 -+++ qt-creator-opensource-src-4.7.0-beta1-new/dist/org.qt-project.qtcreator.appdata.xml 2018-06-07 10:31:39.423923645 +0200 +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 @@ -1,6 +1,8 @@ diff --git a/qt-creator_clang7.patch b/qt-creator_clang7.patch new file mode 100644 index 0000000..a019697 --- /dev/null +++ b/qt-creator_clang7.patch @@ -0,0 +1,30 @@ +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 0efc6f0..b70e392 100644 --- a/qt-creator_desktop.patch +++ b/qt-creator_desktop.patch @@ -1,8 +1,8 @@ -diff -rupN qt-creator-opensource-src-4.7.0-beta1/dist/org.qt-project.qtcreator.desktop qt-creator-opensource-src-4.7.0-beta1-new/dist/org.qt-project.qtcreator.desktop ---- qt-creator-opensource-src-4.7.0-beta1/dist/org.qt-project.qtcreator.desktop 2018-06-04 06:52:27.000000000 +0200 -+++ qt-creator-opensource-src-4.7.0-beta1-new/dist/org.qt-project.qtcreator.desktop 2018-06-07 10:31:39.773923625 +0200 -@@ -7,5 +7,5 @@ X-KDE-StartupNotify=true - Icon=QtProject-qtcreator +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 +@@ -8,5 +8,5 @@ Icon=QtProject-qtcreator + StartupWMClass=qtcreator Terminal=false Categories=Development;IDE;Qt; -MimeType= text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource; diff --git a/qt-creator_ninja-build.patch b/qt-creator_ninja-build.patch index b2c4f9a..a532e25 100644 --- a/qt-creator_ninja-build.patch +++ b/qt-creator_ninja-build.patch @@ -1,6 +1,6 @@ -diff -rupN qt-creator-opensource-src-4.7.0-beta1/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp qt-creator-opensource-src-4.7.0-beta1-new/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp ---- qt-creator-opensource-src-4.7.0-beta1/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp 2018-06-04 06:52:27.000000000 +0200 -+++ qt-creator-opensource-src-4.7.0-beta1-new/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp 2018-06-07 10:31:39.057923665 +0200 +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 if (it != known.constEnd()) { Utils::Environment env = Utils::Environment::systemEnvironment(); diff --git a/qt-creator_python3.patch b/qt-creator_python3.patch new file mode 100644 index 0000000..4043c8e --- /dev/null +++ b/qt-creator_python3.patch @@ -0,0 +1,53 @@ +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 +@@ -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]\" + codesign.commands = codesign --deep -s \"$(SIGNING_IDENTITY)\" $(SIGNING_FLAGS) \"$${APPBUNDLE}\" +- dmg.commands = python -u \"$$PWD/scripts/makedmg.py\" \"$${BASENAME}.dmg\" \"Qt Creator\" \"$$IDE_SOURCE_TREE\" \"$$OUT_PWD/bin\" ++ dmg.commands = python3 -u \"$$PWD/scripts/makedmg.py\" \"$${BASENAME}.dmg\" \"Qt Creator\" \"$$IDE_SOURCE_TREE\" \"$$OUT_PWD/bin\" + #dmg.depends = deployqt + QMAKE_EXTRA_TARGETS += codesign dmg + } else { + BINDIST_SOURCE = "$(INSTALL_ROOT)$$QTC_PREFIX" + BINDIST_EXCLUDE_ARG = "--exclude-toplevel" +- deployqt.commands = python -u $$PWD/scripts/deployqt.py -i \"$(INSTALL_ROOT)$$QTC_PREFIX/bin/$${IDE_APP_TARGET}\" \"$(QMAKE)\" ++ deployqt.commands = python3 -u $$PWD/scripts/deployqt.py -i \"$(INSTALL_ROOT)$$QTC_PREFIX/bin/$${IDE_APP_TARGET}\" \"$(QMAKE)\" + deployqt.depends = install + win32 { + deployartifacts.depends = install +@@ -140,9 +140,9 @@ isEmpty(INSTALLER_ARCHIVE_FROM_ENV) { + INSTALLER_ARCHIVE_DEBUG = $$INSTALLER_ARCHIVE + INSTALLER_ARCHIVE_DEBUG ~= s/(.*)[.]7z/\1-debug.7z + +-bindist.commands = python -u $$PWD/scripts/createDistPackage.py $$OUT_PWD/$${BASENAME}.7z \"$$BINDIST_SOURCE\" +-bindist_installer.commands = python -u $$PWD/scripts/createDistPackage.py $$BINDIST_EXCLUDE_ARG $${INSTALLER_ARCHIVE} \"$$BINDIST_SOURCE\" +-bindist_debug.commands = python -u $$PWD/scripts/createDistPackage.py --debug $$BINDIST_EXCLUDE_ARG $${INSTALLER_ARCHIVE_DEBUG} \"$$BINDIST_SOURCE\" ++bindist.commands = python3 -u $$PWD/scripts/createDistPackage.py $$OUT_PWD/$${BASENAME}.7z \"$$BINDIST_SOURCE\" ++bindist_installer.commands = python3 -u $$PWD/scripts/createDistPackage.py $$BINDIST_EXCLUDE_ARG $${INSTALLER_ARCHIVE} \"$$BINDIST_SOURCE\" ++bindist_debug.commands = python3 -u $$PWD/scripts/createDistPackage.py --debug $$BINDIST_EXCLUDE_ARG $${INSTALLER_ARCHIVE_DEBUG} \"$$BINDIST_SOURCE\" + + 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 +@@ -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 +@@ -44,7 +44,7 @@ configure.input = configure_inputs + configure.output = $$BOTAN_BUILD_DIR/Makefile + configure.variable_out = BOTAN_MAKEFILE + configure.commands = cd $$BOTAN_BUILD_DIR_FOR_SHELL && \ +- python $$CONFIGURE_FILE_PATH_FOR_SHELL \ ++ python3 $$CONFIGURE_FILE_PATH_FOR_SHELL \ + --cc=$$BOTAN_CC_TYPE --cc-bin=$$shell_quote($$QMAKE_CXX) \ + $$BOTAN_ARCH_SWITCH $$BOTAN_OS_SWITCH $$OTHER_FLAGS + QMAKE_EXTRA_COMPILERS += configure diff --git a/sources b/sources index 4f573a3..3f6dff3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qt-creator-opensource-src-4.7.0.tar.xz) = 97843bf223b1643172e71f5c0570074567b39b1abc39650f70aef33b77ffb98022ed3f1dc78fef6f3fc32517188da58b0b37d3be432a581b2dded6fdb57a20a7 +SHA512 (qt-creator-opensource-src-4.7.1.tar.xz) = 839db5409c65b33293fcd21bbf3c6ec1900f640a05451d94d8d6df0421bb56d34f1fd98b9dc5a5f1ab2cb05a65dc2b23532b44c0687c3ca9d310b629474d2461