diff --git a/.gitignore b/.gitignore index 4e2c900..e617a7b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,39 @@ /qt-creator-opensource-src-3.0.0-rc1.tar.gz /qt-creator-opensource-src-3.0.0.tar.gz /qt-creator-opensource-src-3.0.1.tar.gz +/qt-creator-opensource-src-3.1.0-beta.tar.gz +/qt-creator-opensource-src-3.1.0-rc1.tar.gz +/qt-creator-opensource-src-3.1.1.tar.gz +/qt-creator-opensource-src-3.1.2.tar.gz +/qt-creator-opensource-src-3.2.0-beta1.tar.gz +/qt-creator-opensource-src-3.2.0-rc1.tar.gz +/qt-creator-opensource-src-3.2.0.tar.gz +/qt-creator-opensource-src-3.2.1.tar.gz +/qt-creator-opensource-src-3.2.2.tar.gz +/qt-creator-opensource-src-3.3.0-beta1.tar.gz +/qt-creator-opensource-src-3.3.0-rc1.tar.gz +/qt-creator-opensource-src-3.3.0.tar.gz +/qt-creator-opensource-src-3.3.1.tar.gz +/qt-creator-opensource-src-3.3.2.tar.gz +/qt-creator-opensource-src-3.4.0-beta1.tar.gz +/qt-creator-opensource-src-3.4.0-rc1.tar.gz +/qt-creator-opensource-src-3.4.0.tar.gz +/qt-creator-opensource-src-3.4.1.tar.gz +/qt-creator-opensource-src-3.5.0-1538dca.tar.xz +/qt-creator-opensource-src-3.5.0-beta1.tar.gz +/qt-creator-opensource-src-3.5.0-rc1.tar.gz +/qt-creator-opensource-src-3.5.0.tar.gz +/qt-creator-opensource-src-3.5.1.tar.xz +/qt-creator-opensource-src-3.6.0-beta1.tar.gz +/qt-creator-opensource-src-3.6.0-rc1.tar.gz +/qt-creator-opensource-src-3.6.0.tar.gz +/qt-creator-3.6.1-1.fc25.src.rpm +/qt-creator-opensource-src-3.6.1.tar.gz +/qt-creator-opensource-src-4.0.0-beta1.tar.gz +/qt-creator-opensource-src-4.0.0-rc1.tar.gz +/qt-creator-opensource-src-4.0.0.tar.gz +/qt-creator-opensource-src-4.0.1.tar.gz +/qt-creator-opensource-src-4.0.2.tar.gz +/qt-creator-opensource-src-4.1.0-beta1.tar.gz +/qt-creator-opensource-src-4.1.0-rc1.tar.xz +/qt-creator-opensource-src-4.1.0.tar.xz diff --git a/qt-creator-Fedora-privlibs b/qt-creator-Fedora-privlibs index 452fc4c..3b8dc4d 100644 --- a/qt-creator-Fedora-privlibs +++ b/qt-creator-Fedora-privlibs @@ -1,13 +1,18 @@ %global privlibs libAggregation -%global privlibs %{privlibs}|libAnalyzerBase %global privlibs %{privlibs}|libAndroid +%global privlibs %{privlibs}|libAutoTest %global privlibs %{privlibs}|libAutotoolsProjectManager +%global privlibs %{privlibs}|libBareMetal %global privlibs %{privlibs}|libBazaar +%global privlibs %{privlibs}|libBeautifier %global privlibs %{privlibs}|libBinEditor %global privlibs %{privlibs}|libBookmarks %global privlibs %{privlibs}|libCMakeProjectManager %global privlibs %{privlibs}|libCPlusPlus %global privlibs %{privlibs}|libCVS +%global privlibs %{privlibs}|libClangCodeModel +%global privlibs %{privlibs}|libClangStaticAnalyzer +%global privlibs %{privlibs}|libClangbackendipc %global privlibs %{privlibs}|libClassView %global privlibs %{privlibs}|libClearCase %global privlibs %{privlibs}|libCodePaster @@ -17,9 +22,9 @@ %global privlibs %{privlibs}|libDebugger %global privlibs %{privlibs}|libDesigner %global privlibs %{privlibs}|libDiffEditor +%global privlibs %{privlibs}|libEmacsKeys %global privlibs %{privlibs}|libExtensionSystem %global privlibs %{privlibs}|libFakeVim -%global privlibs %{privlibs}|libFind %global privlibs %{privlibs}|libGLSL %global privlibs %{privlibs}|libGLSLEditor %global privlibs %{privlibs}|libGenericProjectManager @@ -27,15 +32,18 @@ %global privlibs %{privlibs}|libHelloWorld %global privlibs %{privlibs}|libHelp %global privlibs %{privlibs}|libImageViewer +%global privlibs %{privlibs}|libIos %global privlibs %{privlibs}|libLanguageUtils -%global privlibs %{privlibs}|libLocator %global privlibs %{privlibs}|libMacros -%global privlibs %{privlibs}|libMadde %global privlibs %{privlibs}|libMercurial +%global privlibs %{privlibs}|libModelEditor +%global privlibs %{privlibs}|libModeling %global privlibs %{privlibs}|libPerforce %global privlibs %{privlibs}|libProjectExplorer %global privlibs %{privlibs}|libPythonEditor %global privlibs %{privlibs}|libQbsProjectManager +%global privlibs %{privlibs}|libQmakeAndroidSupport +%global privlibs %{privlibs}|libQmakeProjectManager %global privlibs %{privlibs}|libQmlDebug %global privlibs %{privlibs}|libQmlDesigner %global privlibs %{privlibs}|libQmlEditorWidgets @@ -43,24 +51,28 @@ %global privlibs %{privlibs}|libQmlJSEditor %global privlibs %{privlibs}|libQmlJSTools %global privlibs %{privlibs}|libQmlProfiler +%global privlibs %{privlibs}|libQmlProfilerExtension %global privlibs %{privlibs}|libQmlProjectManager %global privlibs %{privlibs}|libQnx -%global privlibs %{privlibs}|libQt4ProjectManager %global privlibs %{privlibs}|libQtSupport %global privlibs %{privlibs}|libQtcSsh %global privlibs %{privlibs}|libRemoteLinux %global privlibs %{privlibs}|libResourceEditor +%global privlibs %{privlibs}|libSqlite %global privlibs %{privlibs}|libSubversion %global privlibs %{privlibs}|libTaskList %global privlibs %{privlibs}|libTextEditor +%global privlibs %{privlibs}|libTimeline %global privlibs %{privlibs}|libTodo %global privlibs %{privlibs}|libUpdateInfo %global privlibs %{privlibs}|libUtils %global privlibs %{privlibs}|libValgrind %global privlibs %{privlibs}|libVcsBase %global privlibs %{privlibs}|libWelcome +%global privlibs %{privlibs}|libWinRt %global privlibs %{privlibs}|libcomponentsplugin +%global privlibs %{privlibs}|libqbs_cpp_scanner +%global privlibs %{privlibs}|libqbs_qt_scanner %global privlibs %{privlibs}|libqbscore +%global privlibs %{privlibs}|libqbsqtprofilesetup %global privlibs %{privlibs}|libqtquickplugin -%global privlibs %{privlibs}|libstyleplugin -%global privlibs %{privlibs}|libzeroconf diff --git a/qt-creator.spec b/qt-creator.spec index 52c531d..36c2e70 100644 --- a/qt-creator.spec +++ b/qt-creator.spec @@ -5,19 +5,18 @@ %global _python_bytecompile_errors_terminate_build 0 Name: qt-creator -Version: 3.5.1 -Release: 4%{?prerelease:.%prerelease}%{?dist} +Version: 4.1.0 +Release: 2%{?prerelease:.%prerelease}%{?dist} Summary: Cross-platform IDE for Qt Group: Development/Tools -License: LGPLv2 or LGPLv3, with exceptions +License: GPLv3 with exceptions URL: http://qt-project.org/wiki/Category:Tools::QtCreator Provides: qtcreator = %{version}-%{release} -Source0: https://download.qt.io/development_releases/qtcreator/3.5/%{version}%{?prerelease:-%prerelease}/qt-creator-opensource-src-%{version}%{?prerelease:-%prerelease}.tar.xz -# Use absolute paths for the specified rpaths, not $ORIGIN-relative paths -# (to fix some /usr/bin/ having rpath $ORIGIN/..) -Patch0: qt-creator_rpath.patch +Source0: http://download.qt.io/%{?prerelease:development}%{?!prerelease:official}_releases/qtcreator/4.0/%{version}%{?prerelease:-%prerelease}/qt-creator-opensource-src-%{version}%{?prerelease:-%prerelease}.tar.xz # In Fedora, the ninja command is called ninja-build -Patch1: qt-creator_ninja-build.patch +Patch0: qt-creator_ninja-build.patch +# Don't add LLVM_INCLUDEPATH to INCLUDES, since it translates to adding -isystem /usr/include to the compiler flags which breaks compilation +Patch1: qt-creator_llvmincdir.patch Source1: qtcreator.desktop Source2: qt-creator-Fedora-privlibs @@ -29,7 +28,7 @@ Requires: qt5-qtquickcontrols Requires: qt5-qtdoc # tight dep on qt5-qtbase used to build, uses some private apis -BuildRequires: qt5-qtbase-private-devel +BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} # we need qt-devel and gcc-c++ to compile programs using qt-creator @@ -37,19 +36,32 @@ Requires: qt5-qtbase-devel Requires: gcc-c++ Requires: %{name}-data = %{version}-%{release} -BuildRequires: qt5-qtbase-devel >= 5.5.0 -BuildRequires: pkgconfig(Qt5Designer) >= 5.5.0 -BuildRequires: pkgconfig(Qt5Script) >= 5.5.0 -BuildRequires: pkgconfig(Qt5XmlPatterns) >= 5.5.0 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.5.0 -BuildRequires: pkgconfig(Qt5WebKit) >= 5.5.0 -BuildRequires: pkgconfig(Qt5Help) >= 5.5.0 + +BuildRequires: qt5-qtbase-devel >= 5.6.0 +BuildRequires: qt5-qdoc +BuildRequires: pkgconfig(Qt5Designer) >= 5.6.0 +BuildRequires: pkgconfig(Qt5Script) >= 5.6.0 +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: desktop-file-utils BuildRequires: botan-devel BuildRequires: diffutils BuildRequires: libappstream-glib -BuildRequires: llvm-devel -BuildRequires: clang-devel +%if 0%{?fedora} > 23 +%global llvm 1 +%global llvm_version 3.8.0 +%endif +%if 0%{?llvm} +BuildRequires: llvm-devel >= %{llvm_version} +BuildRequires: clang-devel >= %{llvm_version} +%endif + + +%description +Qt Creator is a cross-platform IDE (integrated development environment) +tailored to the needs of Qt developers. %package data @@ -60,6 +72,7 @@ BuildArch: noarch %description data Application data for %{name}. + %package translations Summary: Translations for %{name} Requires: %{name}-data = %{version}-%{release} @@ -84,22 +97,21 @@ User documentation for %{name}. %global __provides_exclude ^(%{privlibs})\.so %global __requires_exclude ^(%{privlibs})\.so -%description -Qt Creator is a cross-platform IDE (integrated development environment) -tailored to the needs of Qt developers. %prep %setup -q -n qt-creator-opensource-src-%{version}%{?prerelease:-%prerelease} %patch0 -p1 %patch1 -p1 + %build export QTDIR="%{_qt5_prefix}" export PATH="%{_qt5_bindir}:$PATH" -%qmake_qt5 -r IDE_LIBRARY_BASENAME=%{_lib} USE_SYSTEM_BOTAN=1 CONFIG+=disable_rpath -make %{?_smp_mflags} -make qch_docs %{?_smp_mflags} +%qmake_qt5 -r IDE_LIBRARY_BASENAME=%{_lib} USE_SYSTEM_BOTAN=1 %{?llvm:LLVM_INSTALL_DIR=%{_prefix}} CONFIG+=disable_external_rpath +%make_build +%make_build qch_docs + %install make install INSTALL_ROOT=%{buildroot}/%{_prefix} @@ -130,7 +142,6 @@ done diff -u %{SOURCE2} $outfile || : cat $outfile - %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -144,23 +155,17 @@ fi gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %files %doc README.md -%license LICENSE.LGPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.TXT +%license LICENSE.GPL3-EXCEPT %{_bindir}/qbs %{_bindir}/qbs-config %{_bindir}/qbs-config-ui %{_bindir}/qbs-qmltypes %{_bindir}/qbs-setup-* -%{_bindir}/cpaster -%{_bindir}/buildoutputparser -%{_bindir}/qml2puppet -%{_bindir}/qtpromaker %{_bindir}/qtcreator -%{_bindir}/qtcreator_process_stub -%{_bindir}/sdktool %{_libdir}/qtcreator +%{_libexecdir}/qtcreator/ %{_datadir}/applications/qtcreator.desktop %{_datadir}/appdata/qtcreator.appdata.xml %{_datadir}/icons/hicolor/*/apps/QtProject-qtcreator.png @@ -177,16 +182,93 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog -* Thu Jun 16 2016 Rex Dieter - 3.5.1-4 -- rebuild (Qt 5.6.1) +* Thu Sep 08 2016 Rex Dieter - 4.1.0-2 +- make clang support optional (now buildable on more platforms, including epel7) -* Mon Mar 21 2016 Rex Dieter 3.5.1-3 -- rebuild (Qt 5.6.0) +* Thu Aug 25 2016 Helio Chissini de Castro - 4.1.0-1 +- 4.1.0 stable final released -* Mon Feb 15 2016 Rex Dieter - 3.5.1-2 -- add tight dep on qt5-qtbase version used to build qt-creator +* Fri Aug 12 2016 Helio Chissini de Castro - 4.1.0-0.4.rc1 +- Update appdata as requested + +* Mon Aug 08 2016 Sandro Mani - 4.1.0-0.3.rc1 +- Update to 4.1.0-rc1 + +* Sat Jul 16 2016 Sandro Mani - 4.1.0-0.2.beta1 +- Rebuild (qt5-qtbase) + +* Wed Jul 06 2016 Helio Chissini de Castro - 4.1.0-0.1.beta1 +- Beta1 release of 4.1.0 +- Removed both rpath and build patches not needed anymore + +* Thu Jun 30 2016 Rex Dieter - 4.0.2-2 +- rebuild (qt5-qtbase) + +* Fri Jun 17 2016 Sandro Mani - 4.0.2-1 +- Update to 4.0.2 + +* Fri Jun 10 2016 Rex Dieter - 4.0.1-3 +- Re-add BR: qt5-qtbase-private-devel (got lost?) + +* Fri Jun 10 2016 Jan Grulich - 4.0.1-2 +- Rebuild (qt5-qtbase) + +* Wed Jun 08 2016 Sandro Mani - 4.0.1-1 +- Update to 4.0.1 + +* Wed May 11 2016 Sandro Mani - 4.0.0-1 +- Update to 4.0.0 + +* Wed Apr 20 2016 Helio Chissini de Castro - 4.0.0-0.3.rc1 +- Update to 4.0.0 rc1 + +* Sun Apr 17 2016 Rex Dieter - 4.0.0-0.2.beta2 +- BR: qt5-qtbase-private-devel + +* Thu Mar 24 2016 Sandro Mani - 4.0.0-0.1.beta1 +- Update to 4.0.0 beta1 + +* Wed Mar 16 2016 Sandro Mani - 3.6.1-1 +- Update to 3.6.1 + +* Tue Feb 23 2016 Sandro Mani - 3.6.0-9 +- Rebuild for Qt5 ABI breakage + +* Fri Feb 19 2016 Sandro Mani - 3.6.0-8 +- Rebuild (clang) +- Fix build against Qt 5.6rc + +* Mon Feb 08 2016 Sandro Mani - 3.6.0-7 +- Add qt-creator_llvmincdir.patch to fix FTBFS + +* Mon Feb 08 2016 Rex Dieter 3.6.0-6 - rebuild (botan) +* Fri Feb 05 2016 Rex Dieter 3.6.0-5 +- add tight dep on qt5-qtbase version used to build qt-creator + +* Thu Feb 04 2016 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jan 28 2016 Adam Jackson 3.6.0-3 +- Rebuild for llvm 3.7.1 library split + +* Thu Dec 24 2015 Sandro Mani - 3.6.0-2 +- Ensure ClangCodeModel is built + +* Tue Dec 15 2015 Sandro Mani - 3.6.0-1 +- 3.6.0 release +- Clarify license + +* Fri Nov 27 2015 Helio Chissini de Castro - 3.6.0-0.3.rc1 +- QDoc was splitted to prepare 5.6.0 changes + +* Wed Nov 25 2015 Sandro Mani - 3.6.0-0.2.rc1 +- 3.6.0 rc1 release + +* Tue Oct 27 2015 Sandro Mani - 3.6.0-0.1.beta1 +- 3.6.0 beta1 release + * Thu Oct 15 2015 Sandro Mani - 3.5.1-1 - 3.5.1 release diff --git a/qt-creator_llvmincdir.patch b/qt-creator_llvmincdir.patch new file mode 100644 index 0000000..90e29f1 --- /dev/null +++ b/qt-creator_llvmincdir.patch @@ -0,0 +1,12 @@ +diff -rupN qt-creator-opensource-src-3.6.0/src/tools/clangbackend/clangbackend.pro qt-creator-opensource-src-3.6.0-new/src/tools/clangbackend/clangbackend.pro +--- qt-creator-opensource-src-3.6.0/src/tools/clangbackend/clangbackend.pro 2015-12-11 13:45:01.000000000 +0100 ++++ qt-creator-opensource-src-3.6.0-new/src/tools/clangbackend/clangbackend.pro 2016-02-08 23:04:03.654903983 +0100 +@@ -10,7 +10,7 @@ QT += core network + QT -= gui + + LIBS += $$LLVM_LIBS +-INCLUDEPATH += $$LLVM_INCLUDEPATH ++#INCLUDEPATH += $$LLVM_INCLUDEPATH + + SOURCES += clangbackendmain.cpp + diff --git a/qt-creator_ninja-build.patch b/qt-creator_ninja-build.patch index e7950db..38601b8 100644 --- a/qt-creator_ninja-build.patch +++ b/qt-creator_ninja-build.patch @@ -1,12 +1,12 @@ -diff -rupN qt-creator-opensource-src-3.4.0/src/plugins/cmakeprojectmanager/makestep.cpp qt-creator-opensource-src-3.4.0-new/src/plugins/cmakeprojectmanager/makestep.cpp ---- qt-creator-opensource-src-3.4.0/src/plugins/cmakeprojectmanager/makestep.cpp 2015-04-21 17:56:56.000000000 +0200 -+++ qt-creator-opensource-src-3.4.0-new/src/plugins/cmakeprojectmanager/makestep.cpp 2015-04-28 21:53:37.014334401 +0200 -@@ -316,7 +316,7 @@ QString MakeStep::makeCommand(ProjectExp - if (!bc) - bc = targetsActiveBuildConfiguration(); - if (bc && bc->useNinja()) -- return QLatin1String("ninja"); -+ return QLatin1String("ninja-build"); - - if (tc) - return tc->makeCommand(env); +diff -rupN qt-creator-opensource-src-4.0.0-beta1/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp qt-creator-opensource-src-4.0.0-beta1-new/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +--- qt-creator-opensource-src-4.0.0-beta1/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp 2016-03-22 15:59:58.000000000 +0100 ++++ qt-creator-opensource-src-4.0.0-beta1-new/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp 2016-03-24 13:41:44.234683235 +0100 +@@ -172,7 +172,7 @@ QVariant CMakeGeneratorKitInformation::d + if (it != known.constEnd()) { + Utils::Environment env = Utils::Environment::systemEnvironment(); + k->addToEnvironment(env); +- const Utils::FileName ninjaExec = env.searchInPath(QLatin1String("ninja")); ++ const Utils::FileName ninjaExec = env.searchInPath(QLatin1String("ninja-build")); + if (ninjaExec.isEmpty()) + it = known.constEnd(); // Ignore ninja generator without ninja exectuable + } diff --git a/qtcreator.appdata.xml b/qtcreator.appdata.xml index 7eecc2b..0434c97 100644 --- a/qtcreator.appdata.xml +++ b/qtcreator.appdata.xml @@ -1,32 +1,40 @@ - - qtcreator.desktop - Qt Creator - A cross-platform IDE tailored to the needs of Qt developers - CC-BY-SA - LGPL-3.0 WITH exceptions - -

+ + qtcreator.desktop + Qt Creator +

A cross-platform IDE tailored to the needs of Qt developers + CC-BY-SA-3.0 + + + LGPL-3.0 WITH exceptions + +

Qt Creator provides a cross-platform, complete integrated development environment (IDE) for application developers to create applications for multiple desktop and mobile device platforms, such as Android and iOS.

-

+

Qt Creator enables a team of developers to share a project across different development platforms with a common tool for development and debugging.

-

+

The main goal for Qt Creator is meeting the development needs of Qt developers who are looking for simplicity, usability, productivity, extendibility and openness, while aiming to lower the barrier of entry for newcomers to Qt.

- - - https://wiki.qt.io/images/c/cc/Qtcreator-qtdesigner.png - - https://qt-project.org/wiki/Category:Tools::QtCreator - Qt - qt-creator-owner@fedoraproject.org - + + + + https://wiki.qt.io/images/c/cc/Qtcreator-qtdesigner.png + + + + https://qt-project.org/wiki/Category:Tools::QtCreator + qt-creator-owner@fedoraproject.org + Qt Project + https://bugreports.qt.io/secure/Dashboard.jspa + http://doc.qt.io/qtcreator/index.html + http://wiki.qt.io/Qt-Contribution-Guidelines + diff --git a/qtcreator.desktop b/qtcreator.desktop index a8fbbb4..06b5cfa 100644 --- a/qtcreator.desktop +++ b/qtcreator.desktop @@ -8,3 +8,4 @@ Icon=QtProject-qtcreator Terminal=false Categories=Development;IDE;Qt; MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource; +Keywords=Qt;C++;IDE;Development; diff --git a/sources b/sources index 83bbf1e..d9f9284 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7cc28c98d5edc521c09e447df39c5cd3 qt-creator-opensource-src-3.5.1.tar.xz +c90743aad6e222db88e4d52267b82cff qt-creator-opensource-src-4.1.0.tar.xz