.gear/rules | 5 + .../tags/e42e2349498696dc0e2de81d713417b492cf41fd | 6 + .gear/tags/list | 3 + .gear/upstream/filter-tag | 1 + .gear/upstream/remotes | 3 + .gear/upstream/transform-tag | 1 + 0001-Link-against-libclang-cpp.so.patch | 29 ++ qt-creator.spec | 425 +++++++++++++++++++++ .../applications/org.qt-project.qtcreator.desktop | 1 + src/share/qtcreator/externaltools/lrelease.xml | 2 +- src/share/qtcreator/externaltools/lupdate.xml | 2 +- src/share/qtcreator/externaltools/qmlscene.xml | 2 +- src/share/qtcreator/externaltools/qmlviewer.xml | 2 +- 13 files changed, 478 insertions(+), 4 deletions(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000000..b368b997aa --- /dev/null +++ b/.gear/rules @@ -0,0 +1,5 @@ +copy?: *.patch +tar: v@version@:. +diff: v@version@:. . +tar: qbs-sources:. name=qbs base=src/shared/qbs +tar: perfparser:. name=perfparser base=src/tools/perfparser diff --git a/.gear/tags/e42e2349498696dc0e2de81d713417b492cf41fd b/.gear/tags/e42e2349498696dc0e2de81d713417b492cf41fd new file mode 100644 index 0000000000..01726f7509 --- /dev/null +++ b/.gear/tags/e42e2349498696dc0e2de81d713417b492cf41fd @@ -0,0 +1,6 @@ +object c34b9502275d0d1d5b88d7a63bff076e2a164836 +type commit +tag v4.14.2 +tagger Eike Ziller 1616410777 +0100 + +Qt Creator v4.14.2 diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000000..07f1c93834 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1,3 @@ +6998eeec65ad30d67495e71dc3e2486c5a390d32 perfparser +a5c9fa92c86982e0260f691ea27b790748851db6 qbs-sources +e42e2349498696dc0e2de81d713417b492cf41fd v4.14.2 diff --git a/.gear/upstream/filter-tag b/.gear/upstream/filter-tag new file mode 100755 index 0000000000..dc44a098c0 --- /dev/null +++ b/.gear/upstream/filter-tag @@ -0,0 +1 @@ +grep '^v[0-9.]\+$' diff --git a/.gear/upstream/remotes b/.gear/upstream/remotes new file mode 100644 index 0000000000..71a4692bb0 --- /dev/null +++ b/.gear/upstream/remotes @@ -0,0 +1,3 @@ +[remote "upstream"] + url = git://code.qt.io/qt-creator/qt-creator.git + fetch = +refs/heads/*:refs/remotes/upstream/* diff --git a/.gear/upstream/transform-tag b/.gear/upstream/transform-tag new file mode 100755 index 0000000000..9c1bb0fd90 --- /dev/null +++ b/.gear/upstream/transform-tag @@ -0,0 +1 @@ +sed 's/^v\([0-9.]\+\)\(-rc[0-9]\)\?$/\1/' diff --git a/0001-Link-against-libclang-cpp.so.patch b/0001-Link-against-libclang-cpp.so.patch new file mode 100644 index 0000000000..5c8df08f77 --- /dev/null +++ b/0001-Link-against-libclang-cpp.so.patch @@ -0,0 +1,29 @@ +diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri +index 28c2d0d326..e986123d23 100644 +--- a/src/shared/clang/clang_installation.pri ++++ b/src/shared/clang/clang_installation.pri +@@ -204,11 +204,8 @@ isEmpty(LLVM_VERSION) { + CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h + exists($$CLANGFORMAT_MAIN_HEADER) { + exists($$LLVM_LIBDIR/*clangBasic*) { +- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic +- ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \ +- -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ +- -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ +- -lclangASTMatchers -lclangAST -lclangLex -lclangBasic ++ CLANGFORMAT_LIBS=-lclang-cpp ++ ALL_CLANG_LIBS=-lclang-cpp + win32:CLANGFORMAT_LIBS += -lversion + } else { + CLANGFORMAT_LIBS = -lclang-cpp +@@ -241,9 +238,7 @@ isEmpty(LLVM_VERSION) { + QTC_ENABLE_CLANG_REFACTORING=$$(QTC_ENABLE_CLANG_REFACTORING) + !isEmpty(QTC_ENABLE_CLANG_REFACTORING) { + exists($$LLVM_LIBDIR/*clangBasic*) { +- CLANGTOOLING_LIBS=-lclangTooling -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ +- -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ +- -lclangASTMatchers -lclangToolingCore -lclangAST -lclangLex -lclangBasic ++ CLANGTOOLING_LIBS=-lclang-cpp + win32:CLANGTOOLING_LIBS += -lversion + } else { + CLANGTOOLING_LIBS = -lclang-cpp diff --git a/qt-creator.spec b/qt-creator.spec new file mode 100644 index 0000000000..a25fd756b3 --- /dev/null +++ b/qt-creator.spec @@ -0,0 +1,425 @@ +%define _unpackaged_files_terminate_build 1 + +%def_with ClangCodeModel +%define llvm_version 11.0 + +%add_findreq_skiplist %_datadir/qtcreator/* +%add_findprov_skiplist %_datadir/qtcreator/* + +Name: qt-creator +Version: 4.14.2 +Release: alt1 + +Summary: Cross-platform IDE for Qt +License: GPL-3.0 with Qt-GPL-exception-1.0 and MIT and LGPL-2.0 and LGPL-2.1 and LGPL-3.0 and BSD-3-Clause and BSL-1.0 and ALT-Public-Domain +Group: Development/Tools + +Url: http://qt-project.org/wiki/Category:Tools::QtCreator +Packager: Andrey Cherepanov + +Source: %name-%version.tar +# VCS: git://code.qt.io/qt-creator/qt-creator.git +Source1: qbs.tar +Source2: perfparser.tar + +Patch0: %name-%version-%release.patch +Patch1: 0001-Link-against-libclang-cpp.so.patch + +Requires: %name-data = %EVR +Provides: qtcreator = %EVR +Obsoletes: qtcreator-clangcodemodel +Provides: qtcreator-clangcodemodel = %EVR +Provides: qbs = 1.14.0 +Obsoletes: qbs < 1.14.0 + +BuildRequires(pre): qt5-base-devel >= 5.9.0 +BuildRequires(pre): rpm-build-python3 +BuildRequires: gcc-c++ +BuildRequires: qt5-designer >= 5.9.0 +BuildRequires: qt5-script-devel >= 5.9.0 +BuildRequires: qt5-declarative-devel >= 5.9.0 +%ifnarch %e2k +# NB: there's rpm-macros-qt5-webengine out there +BuildRequires: qt5-webkit-devel >= 5.9.0 +%endif +BuildRequires: qt5-x11extras-devel >= 5.9.0 +BuildRequires: qt5-xmlpatterns-devel >= 5.9.0 +BuildRequires: qt5-tools-devel >= 5.9.0 +%if_with ClangCodeModel +BuildRequires: llvm%llvm_version-devel +BuildRequires: llvm%llvm_version-devel-static +BuildRequires: clang%llvm_version-devel +BuildRequires: clang%llvm_version-devel-static +BuildRequires: clang%llvm_version +BuildRequires: lld%llvm_version +%endif +BuildRequires: libsystemd-devel + +Requires: qt5-quickcontrols +# Add Qt5 build environment to build Qt project +Requires: qt5-base-devel +Requires: qt5-translations +Requires: qt5-tools + +%ifarch %e2k +# error: cpio archive too big - 4446M +%global __find_debuginfo_files %nil +%endif + +%description +Qt Creator (previously known as Project Greenhouse) is a new, +lightweight, cross-platform integrated development environment (IDE) +designed to make development with the Qt application framework +even faster and easier. + +%package doc +Summary: %name docs +Group: Documentation +BuildArch: noarch +Requires: %name +Requires: qt5-base-doc + +%description doc +Documentation for %name + +%package data +Summary: Data files for %name +Group: Development/Tools +BuildArch: noarch +Requires: %name + +%description data +Data files for %name + +%prep +%setup +# Unpack submodules content +tar xf %SOURCE1 +tar xf %SOURCE2 +sed -i 's,tools\/qdoc3,bin,' doc/doc.pri +#subst 's,share\/doc\/qtcreator,share\/qtcreator\/doc,' doc/doc.pri src/plugins/help/helpplugin.cpp +%patch0 -p1 +%patch1 -p1 +%ifarch %e2k +# strip UTF-8 BOM, lcc 1.23 won't ignore it yet +find src -type f -print0 -name '*.cpp' -o -name '*.h' | + xargs -r0 sed -ri 's,^\xEF\xBB\xBF,,' +%endif +# Use Python3 for Python scripts +subst 's@#!.*python[23]\?@#!%__python3@' `find . -name \*.py` \ + src/shared/qbs/src/3rdparty/python/bin/dmgbuild \ + src/libs/qt-breakpad/qtbreakpadsymbols + +%build +export QTDIR=%_qt5_prefix +export PATH="%{_qt5_bindir}:$PATH" +%ifarch %e2k +# fool sqlite into building with lcc +sed -i 's,^QMAKE_CFLAGS_WARN_ON.*$,& -D__INTEL_COMPILER,' src/libs/3rdparty/sqlite/sqlite.pri +%endif +%if_with ClangCodeModel +export LLVM_INSTALL_DIR="%_prefix" +%remove_optflags -frecord-gcc-switches +%endif + +%qmake_qt5 -r IDE_LIBRARY_BASENAME=%_lib \ + CONFIG+="disable_external_rpath" \ + QMAKE_STRIP= \ + CONFIG+="journald" \ +%if_with ClangCodeModel + -spec linux-clang \ + QMAKE_LFLAGS+="-fuse-ld=lld" \ +%endif + %nil + +%make_build +%make_build qch_docs + +%install +%install_qt5 INSTALL_ROOT=%buildroot/%_prefix +%install_qt5 INSTALL_ROOT=%buildroot/%_prefix install_inst_qch_docs + +# Remove Windows cdb debugger support to prevent unmet python2.7(cdbext) +rm -f %buildroot%_datadir/qtcreator/debugger/cdbbridge.py + +# Make symlink to prevent package upgrade failure +rm -rf %buildroot%_datadir/qtcreator/qbs/share/qbs/examples/cocoa-application/CocoaApplication/en_US.lproj +ln -s en.lproj %buildroot%_datadir/qtcreator/qbs/share/qbs/examples/cocoa-application/CocoaApplication/en_US.lproj + +%files +%doc README* LICENSE* +%_bindir/* +%_libdir/qtcreator +%dir %_libdir/qtcreator/plugins +%_prefix/libexec/qtcreator +%_iconsdir/hicolor/*/apps/QtProject-qtcreator.png +%_desktopdir/*.desktop +%_datadir/metainfo/*.xml + +%files doc +%_defaultdocdir/qtcreator + +%files data +%dir %_datadir/qtcreator +%_datadir/qtcreator/* + +%changelog +* Mon Mar 22 2021 Andrey Cherepanov 4.14.2-alt1 +- New version. + +* Thu Feb 25 2021 Andrey Cherepanov 4.14.1-alt1 +- New version. + +* Mon Dec 21 2020 Andrey Cherepanov 4.14.0-alt1 +- New version. +- Add qt5-base-doc to qt-creator-doc requirements. + +* Fri Nov 20 2020 Andrey Cherepanov 4.13.3-alt1 +- New version. + +* Sun Oct 04 2020 Andrey Cherepanov 4.13.2-alt1 +- New version. + +* Thu Sep 17 2020 Andrey Cherepanov 4.13.1-alt1 +- New version. + +* Mon Sep 14 2020 Andrey Cherepanov 4.13.0-alt3 +- Update Russian translations from upstream. + +* Tue Sep 08 2020 Andrey Cherepanov 4.13.0-alt2 +- Add changelog entry from p9 branch. + +* Thu Sep 03 2020 Andrey Cherepanov 4.13.0-alt1 +- New version. +- Enable journald support. + +* Thu Jul 09 2020 Andrey Cherepanov 4.12.4-alt0.1.p9 +- Backport new version to p9 branch. + +* Thu Jul 09 2020 Andrey Cherepanov 4.12.4-alt1 +- New version. + +* Thu Jun 18 2020 Andrey Cherepanov 4.12.3-alt1 +- New version. + +* Wed Jun 03 2020 Andrey Cherepanov 4.12.2-alt1 +- New version. + +* Thu May 28 2020 Andrey Cherepanov 4.12.1-alt2 +- Build with LLVM 10.0. + +* Wed May 20 2020 Andrey Cherepanov 4.12.1-alt1 +- New version. + +* Tue Apr 28 2020 Andrey Cherepanov 4.12.0-alt1 +- New stable version. + +* Mon Apr 13 2020 Andrey Cherepanov 4.12.0-alt0.1.rc1 +- New version (RC1). + +* Sat Apr 04 2020 Andrey Cherepanov 4.11.2-alt1 +- New version. +- Build with ClangCodeModel plugin. + +* Wed Feb 12 2020 Andrey Cherepanov 4.11.1-alt2 +- Add Russian localization to desktop file (ALT #36851). + +* Fri Feb 07 2020 Andrey Cherepanov 4.11.1-alt1 +- New version. + +* Mon Dec 16 2019 Andrey Cherepanov 4.11.0-alt1 +- New version. +- Build without ClangCodeModel due to the lack of LLVM 8.x in repository. +- Fix license. +- Set python3 as interpreter of Python scripts. + +* Fri Nov 08 2019 Andrey Cherepanov 4.9.2-alt4 +- Add to requirements qt5-tran slations and qt5-tools. + +* Fri Nov 01 2019 Andrey Cherepanov 4.9.2-alt3 +- Add Qt5 build environment to build Qt project (ALT #37403). + +* Wed Oct 02 2019 Michael Shigorin 4.9.2-alt2 +- E2K: + + fix build with dummy-qt5-webkit-devel dropped + + fix BOM oneliner according to Secure Packaging Policy +- Added explicit BR: qt5-declarative-devel. +- Minor spec cleanup. + +* Mon Jul 01 2019 Andrey Cherepanov 4.9.2-alt1 +- New version. + +* Tue Jun 18 2019 Andrey Cherepanov 4.9.1-alt2 +- Build qbsprojectmanager plugin with bundled qbs (ALT #36917). +- Use ALT-specific Qt5 utilities names. +- Build perfparser from submodule. + +* Thu May 30 2019 Andrey Cherepanov 4.9.1-alt1 +- New version. + +* Sun May 05 2019 Michael Shigorin 4.9.0-alt2.1 +- E2K: fix build (and disable overly large debuginfo subpackage) + +* Mon Apr 22 2019 Aleksei Nikiforov 4.9.0-alt2 +- Updated build dependencies: libbotan is no longer required. + +* Tue Apr 16 2019 Andrey Cherepanov 4.9.0-alt1 +- New version (ALT #36600). + +* Wed Mar 06 2019 Andrey Cherepanov 4.8.2-alt1 +- New version. + +* Thu Jan 17 2019 Andrey Cherepanov 4.8.1-alt1 +- New version. + +* Fri Dec 07 2018 Andrey Cherepanov 4.8.0-alt1 +- New version. + +* Wed Oct 31 2018 Andrey Cherepanov 4.7.2-alt1 +- New version. + +* Fri Sep 21 2018 Aleksei Nikiforov 4.7.1-alt1 +- Updated to upstream version 4.7.1. +- Updated runtime dependencies. + +* Tue Sep 04 2018 Aleksei Nikiforov 4.7.0-alt1 +- Updated to upstream version 4.7.0. +- Applied patch from upstream for supporting libbotan-2. +- Removed clangcodemodel subpackage. +- Spec cleanup. + +* Mon Jun 11 2018 Andrey Cherepanov 4.6.2-alt1 +- New version. + +* Thu May 03 2018 Andrey Cherepanov 4.6.1-alt1 +- New version. + +* Tue Apr 10 2018 Aleksei Nikiforov 4.6.0-alt1 +- Updated to upstream version 4.6.0. +- Added debuginfo (Closes: #34153). +- Enabled parallel build. + +* Sat Oct 14 2017 Andrey Cherepanov 4.4.1-alt2 +- Package ClangCodeModel (ALT #33943) + +* Fri Oct 06 2017 Andrey Cherepanov 4.4.1-alt1 +- New version +- Add optional build ClangCodeModel plugin (disabled by default) + +* Thu Sep 07 2017 Andrey Cherepanov 4.4.0-alt1 +- New version + +* Sat Jul 01 2017 Andrey Cherepanov 4.3.1-alt1 +- New version + +* Thu May 25 2017 Andrey Cherepanov 4.3.0-alt1 +- New version + +* Sun Apr 23 2017 Andrey Cherepanov 4.2.2-alt1 +- New version + +* Tue Jan 24 2017 Andrey Cherepanov 4.2.1-alt1 +- new version 4.2.1 + +* Sat Dec 17 2016 Andrey Cherepanov 4.2.0-alt1 +- new version 4.2.0 +- provides qtcreator +- remove Windows cdb debugger support to prevent unmet python2.7(cdbext) + +* Fri Aug 26 2016 Andrey Cherepanov 4.1.0-alt1 +- new version 4.1.0 + +* Sun Jun 19 2016 Andrey Cherepanov 4.0.2-alt1 +- new version 4.0.2 + +* Fri Jun 10 2016 Andrey Cherepanov 4.0.1-alt1 +- new version 4.0.1 + +* Fri May 13 2016 Andrey Cherepanov 4.0.0-alt1 +- New version + +* Tue Mar 29 2016 Sergey V Turchin 3.6.0-alt1.1 +- NMU: Rebuild with new Qt5 + +* Mon Dec 28 2015 Andrey Cherepanov 3.6.0-alt1 +- New version +- Build with Qt5 (closes #31175) + +* Fri Feb 07 2014 Evgeny Sinelnikov 3.0.1-alt1 +- update to newest version with multiple improvements + +* Sun Feb 02 2014 Evgeny Sinelnikov 2.8.1-alt1 +- update to new version (closes #29569) + +* Thu Apr 11 2013 Anatoly Lyutin 2.7.0-alt1 +- new version (closes #28740) + +* Tue Dec 18 2012 Anatoly Lyutin 2.6.0-alt2 +- true 2.6.0 (closes #28152) + +* Mon Nov 26 2012 Anatoly Lyutin 2.6.0-alt1 +- new version (closes #27938) + +* Fri May 11 2012 Anatoly Lyutin 2.5.0-alt1 +- new version + +* Mon Jan 09 2012 Anatoly Lyutin 2.4.0-alt1 +- new version + +* Sat Oct 22 2011 Vitaly Kuznetsov 2.3.0-alt1.1 +- Rebuild with Python-2.7 + +* Thu Sep 22 2011 Anatoly Lyutin 2.3.0-alt1 +- new version (closes #26219) + +* Fri Aug 05 2011 Anatoly Lyutin 2.2.1-alt1 +- new version + +* Mon Jun 06 2011 Anatoly Lyutin 2.2.0-alt1 +- update to 2.2.0 + +* Fri Mar 04 2011 Anatoly Lyutin 2.1.0-alt1 +- update to 2.1.0 + +* Wed Jul 28 2010 Anatoly Lyutin 2.0.0-alt1 +- update to 2.0.0 + +* Mon Mar 01 2010 Boris Savelev 1.3.1-alt1 +- new version + +* Tue Dec 15 2009 Boris Savelev 1.3.0-alt1 +- new version (closes: #22547) + +* Sun Aug 30 2009 Boris Savelev 1.2.1-alt3.g26a3a3e +- build from upstream git + +* Wed Aug 05 2009 Boris Savelev 1.2.1-alt2.g0dbe82f +- new version + +* Thu Jul 16 2009 Boris Savelev 1.2.1-alt1.gba2a5a6 +- new version + +* Tue Jun 30 2009 Boris Savelev 1.2.0-alt2.g6315f14 +- build from upstream git +- add translations (closes:#20605) + +* Fri Jun 26 2009 Boris Savelev 1.2.0-alt1.g934ee44 +- version up + +* Mon May 25 2009 Boris Savelev 1.1.0-alt6.gcf7cd73 +- add %_bindir/qtcreator_process_stub (fix #20171) + +* Mon May 11 2009 Boris Savelev 1.1.0-alt5.gcf7cd73 +- build from upstream git + +* Sun May 03 2009 Boris Savelev 1.1.0-alt4.ga1dc8f5 +- build from upstream git + +* Tue Apr 28 2009 Boris Savelev 1.1.0-alt3.git.124.g092d8ca +- build from upstream git + +* Tue Apr 28 2009 Boris Savelev 1.1.0-alt2 +- build doc (fix #19799) + +* Thu Apr 23 2009 Boris Savelev 1.1.0-alt1 +- initial build for Sisyphus from Fedora diff --git a/share/applications/org.qt-project.qtcreator.desktop b/share/applications/org.qt-project.qtcreator.desktop index 034721891d..0a9b224587 100644 --- a/share/applications/org.qt-project.qtcreator.desktop +++ b/share/applications/org.qt-project.qtcreator.desktop @@ -3,6 +3,7 @@ Type=Application Exec=qtcreator %F Name=Qt Creator GenericName=C++ IDE for developing Qt applications +GenericName[ru]=Среда разработки приложений на Qt X-KDE-StartupNotify=true Icon=QtProject-qtcreator StartupWMClass=qtcreator diff --git a/src/share/qtcreator/externaltools/lrelease.xml b/src/share/qtcreator/externaltools/lrelease.xml index f35d6d8186..639cee3405 100644 --- a/src/share/qtcreator/externaltools/lrelease.xml +++ b/src/share/qtcreator/externaltools/lrelease.xml @@ -32,8 +32,8 @@ Linguist 2 + lrelease-qt5 %{CurrentDocument:Project:QT_INSTALL_BINS}/lrelease - lrelease %{CurrentDocument:Project:FilePath} %{CurrentDocument:Project:Path} CurrentDocument:Project:BuildConfig:Env diff --git a/src/share/qtcreator/externaltools/lupdate.xml b/src/share/qtcreator/externaltools/lupdate.xml index 693d2c0601..3e01bb0401 100644 --- a/src/share/qtcreator/externaltools/lupdate.xml +++ b/src/share/qtcreator/externaltools/lupdate.xml @@ -32,8 +32,8 @@ Linguist 1 + lupdate-qt5 %{CurrentDocument:Project:QT_INSTALL_BINS}/lupdate - lupdate %{CurrentDocument:Project:FilePath} %{CurrentDocument:Project:Path} CurrentDocument:Project:BuildConfig:Env diff --git a/src/share/qtcreator/externaltools/qmlscene.xml b/src/share/qtcreator/externaltools/qmlscene.xml index a414a3f7cb..082d06368e 100644 --- a/src/share/qtcreator/externaltools/qmlscene.xml +++ b/src/share/qtcreator/externaltools/qmlscene.xml @@ -32,8 +32,8 @@ Qt Quick 1 + qmlscene-qt5 %{CurrentDocument:Project:QT_INSTALL_BINS}/qmlscene - qmlscene %{CurrentDocument:FilePath} %{CurrentDocument:Path} QT_LOGGING_TO_CONSOLE%3D1 diff --git a/src/share/qtcreator/externaltools/qmlviewer.xml b/src/share/qtcreator/externaltools/qmlviewer.xml index 32a362d6b8..eab1e1aa1e 100644 --- a/src/share/qtcreator/externaltools/qmlviewer.xml +++ b/src/share/qtcreator/externaltools/qmlviewer.xml @@ -32,8 +32,8 @@ Qt Quick 1 + qmlviewer-qt4 %{CurrentDocument:Project:QT_INSTALL_BINS}/qmlviewer - qmlviewer %{CurrentDocument:FilePath} %{CurrentDocument:Path} QT_LOGGING_TO_CONSOLE%3D1