From: Bartek Szady Date: Sun, 25 Jun 2017 12:15:02 +0000 (+0200) Subject: - updated to 4.3.0 X-Git-Tag: auto/th/qt-creator-4.3.0-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fqt-creator.git;a=commitdiff_plain;h=f6428af - updated to 4.3.0 --- diff --git a/qt-creator-libexec.patch b/qt-creator-libexec.patch index d06f2e4..25ded8e 100644 --- a/qt-creator-libexec.patch +++ b/qt-creator-libexec.patch @@ -18,28 +18,3 @@ INSTALL_DATA_PATH = $$QTC_PREFIX/share/qtcreator INSTALL_DOC_PATH = $$QTC_PREFIX/share/doc/qtcreator INSTALL_BIN_PATH = $$QTC_PREFIX/bin ---- qt-creator-opensource-src-3.6.1/src/plugins/coreplugin/icore.cpp.orig 2016-03-08 12:30:19.000000000 +0100 -+++ qt-creator-opensource-src-3.6.1/src/plugins/coreplugin/icore.cpp 2016-09-27 22:33:01.376312984 +0200 -@@ -435,21 +435,7 @@ - */ - QString ICore::libexecPath() - { -- QString path; -- switch (Utils::HostOsInfo::hostOs()) { -- case Utils::OsTypeWindows: -- path = QCoreApplication::applicationDirPath(); -- break; -- case Utils::OsTypeMac: -- path = QCoreApplication::applicationDirPath() + QLatin1String("/../Resources"); -- break; -- case Utils::OsTypeLinux: -- case Utils::OsTypeOtherUnix: -- case Utils::OsTypeOther: -- path = QCoreApplication::applicationDirPath() + QLatin1String("/../libexec/qtcreator"); -- break; -- } -- return QDir::cleanPath(path); -+ return QDir::cleanPath(QLatin1String("/usr/" IDE_LIBRARY_BASENAME "/qtcreator")); - } - - static QString compilerString() diff --git a/qt-creator.desktop b/qt-creator.desktop deleted file mode 100644 index db88ca4..0000000 --- a/qt-creator.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Exec=qtcreator %F -Name=Qt Creator -GenericName=C++ IDE for developing Qt applications -X-KDE-StartupNotify=true -Icon=QtProject-qtcreator -Terminal=false -Categories=Qt;Development;IDE; -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; diff --git a/qt-creator.spec b/qt-creator.spec index e0ff22b..41e6d60 100644 --- a/qt-creator.spec +++ b/qt-creator.spec @@ -1,40 +1,39 @@ Summary: An IDE tailored to the needs of Qt developers Summary(pl.UTF-8): IDE dostosowane do potrzeb developerow Qt Name: qt-creator -Version: 4.1.0 -Release: 2 +Version: 4.3.0 +Release: 1 Epoch: 1 License: LGPL v2.1 Group: X11/Development/Tools -Source0: http://download.qt.io/official_releases/qtcreator/4.1/%{version}/%{name}-opensource-src-%{version}.tar.xz -# Source0-md5: c90743aad6e222db88e4d52267b82cff -Source1: %{name}.desktop +Source0: http://download.qt.io/official_releases/qtcreator/4.3/%{version}/%{name}-opensource-src-%{version}.tar.xz +# Source0-md5: b8059b45c8b02a8d52d2d2e46b7b740b Patch0: %{name}-libexec.patch URL: http://doc.qt.io/qt-5/topics-app-development.html -BuildRequires: Qt5Concurrent-devel >= 5.4.0 -BuildRequires: Qt5Declarative-devel >= 5.4.0 -BuildRequires: Qt5Designer-devel >= 5.4.0 -BuildRequires: Qt5Gui-devel >= 5.4.0 -BuildRequires: Qt5Help-devel >= 5.4.0 -BuildRequires: Qt5Network-devel >= 5.4.0 -BuildRequires: Qt5Script-devel >= 5.4.0 -BuildRequires: Qt5Svg-devel >= 5.4.0 -BuildRequires: Qt5UiTools-devel >= 5.4.0 -BuildRequires: Qt5WebKit-devel >= 5.4.0 -BuildRequires: Qt5Xml-devel >= 5.4.0 -BuildRequires: clang-devel >= 3.8.0 +BuildRequires: Qt5Concurrent-devel >= 5.6.0 +BuildRequires: Qt5Designer-devel >= 5.6.0 +BuildRequires: Qt5Gui-devel >= 5.6.0 +BuildRequires: Qt5Help-devel >= 5.6.0 +BuildRequires: Qt5Network-devel >= 5.6.0 +BuildRequires: Qt5Script-devel >= 5.6.0 +BuildRequires: Qt5Svg-devel >= 5.6.0 +BuildRequires: Qt5UiTools-devel >= 5.6.0 +BuildRequires: Qt5WebKit-devel >= 5.6.0 +BuildRequires: Qt5Xml-devel >= 5.6.0 +BuildRequires: clang-devel >= 3.9.0 BuildRequires: gdb BuildRequires: libstdc++-devel -BuildRequires: llvm-devel >= 3.8.0 -BuildRequires: qt5-build >= 5.4.0 +BuildRequires: llvm-devel >= 3.9.0 +BuildRequires: qt5-build >= 5.6.0 BuildRequires: qt5-linguist -BuildRequires: qt5-qmake >= 5.4.0 +BuildRequires: qt5-qmake >= 5.6.0 BuildRequires: rpmbuild(macros) >= 1.602 Requires(post,postun): desktop-file-utils %requires_eq Qt5Core Requires: Qt5Gui-platform-xcb Requires: Qt5Quick-controls Requires: Qt5Sql-sqldriver-sqlite3 +Requires: qt5-qtdeclarative Requires: hicolor-icon-theme # for xdg-open Suggests: xdg-utils @@ -82,7 +81,7 @@ export QTDIR=%{_libdir}/qt5 install -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d echo "%{_libdir}/qtcreator" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/qtcreator.conf -cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop +rm -f $RPM_BUILD_ROOT%{_libdir}/qtcreator/*.prl %clean rm -rf $RPM_BUILD_ROOT @@ -102,6 +101,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/qbs %attr(755,root,root) %{_bindir}/qbs-config %attr(755,root,root) %{_bindir}/qbs-config-ui +%attr(755,root,root) %{_bindir}/qbs-create-project %attr(755,root,root) %{_bindir}/qbs-qmltypes %attr(755,root,root) %{_bindir}/qbs-setup-android %attr(755,root,root) %{_bindir}/qbs-setup-qt @@ -111,7 +111,10 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/qtcreator %attr(755,root,root) %{_libdir}/qtcreator/buildoutputparser %attr(755,root,root) %{_libdir}/qtcreator/clangbackend +%attr(755,root,root) %{_libdir}/qtcreator/clangpchmanagerbackend +%attr(755,root,root) %{_libdir}/qtcreator/clangrefactoringbackend %attr(755,root,root) %{_libdir}/qtcreator/cpaster +%attr(755,root,root) %{_libdir}/qtcreator/qbs_processlauncher %attr(755,root,root) %{_libdir}/qtcreator/qml2puppet %attr(755,root,root) %{_libdir}/qtcreator/qtcreator_process_stub %attr(755,root,root) %{_libdir}/qtcreator/qtpromaker @@ -130,5 +133,6 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/qtcreator/plugins/qmldesigner/libcomponentsplugin.so %attr(755,root,root) %{_libdir}/qtcreator/plugins/qmldesigner/libqtquickplugin.so %{_datadir}/qtcreator -%{_desktopdir}/qt-creator.desktop +%{_datadir}/metainfo/org.qt-project.qtcreator.appdata.xml +%{_desktopdir}/org.qt-project.qtcreator.desktop %{_iconsdir}/hicolor/*/*/*.png