[packages/qt-creator] Update to 3.6.0

megabajt megabajt at pld-linux.org
Sun Feb 14 17:12:40 CET 2016 

commit 381d350117cb72eef9d53429668772115cee98cc
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date:   Sun Feb 14 17:07:26 2016 +0100

    Update to 3.6.0
    
    - added -libexec.patch to fix binaries location
    - removed obsolete -pluginpath64.patch and -pluginpathx32.patch

 qt-creator-libexec.patch       | 20 ++++++++++++
 qt-creator-pluginpath64.patch  | 12 -------
 qt-creator-pluginpathx32.patch | 12 -------
 qt-creator.spec                | 72 +++++++++++++++++++-----------------------
 4 files changed, 53 insertions(+), 63 deletions(-)
---
diff --git a/qt-creator.spec b/qt-creator.spec
index 448d128..002a5f5 100644
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@ -1,37 +1,41 @@
 Summary:	An IDE tailored to the needs of Qt developers
 Summary(pl.UTF-8):	IDE dostosowane do potrzeb developerow Qt
 Name:		qt-creator
-Version:	3.4.1
-Release:	2
+Version:	3.6.0
+Release:	1
 Epoch:		1
 License:	LGPL v2.1
 Group:		X11/Development/Tools
-Source0:	http://download.qt-project.org/official_releases/qtcreator/3.4/%{version}/%{name}-opensource-src-%{version}.tar.gz
-# Source0-md5:	bcbae4a567c93158babe3b7f42d01219
+Source0:	http://download.qt.io/official_releases/qtcreator/3.6/%{version}/%{name}-opensource-src-%{version}.tar.gz
+# Source0-md5:	6b0052a6d671318fca540a190cacd97d
 Source1:	%{name}.desktop
-Patch0:		%{name}-pluginpath64.patch
-Patch1:		%{name}-pluginpathx32.patch
+Patch0:		%{name}-libexec.patch
 URL:		http://qt.digia.com/Product/Developer-Tools
-BuildRequires:	Qt5Concurrent-devel >= 5.3.1
-BuildRequires:	Qt5Declarative-devel >= 5.3.1
-BuildRequires:	Qt5Designer-devel >= 5.3.1
-BuildRequires:	Qt5Gui-devel >= 5.3.1
-BuildRequires:	Qt5Help-devel >= 5.3.1
-BuildRequires:	Qt5Network-devel >= 5.3.1
-BuildRequires:	Qt5Script-devel >= 5.3.1
-BuildRequires:	Qt5Svg-devel >= 5.3.1
-BuildRequires:	Qt5WebKit-devel >= 5.3.1
-BuildRequires:	Qt5Xml-devel >= 5.3.1
+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
 BuildRequires:	gdb
 BuildRequires:	libstdc++-devel
-BuildRequires:	qt5-build >= 5.3.1
+BuildRequires:	llvm-devel
+BuildRequires:	qt5-build >= 5.4.0
 BuildRequires:	qt5-linguist
-BuildRequires:	qt5-qmake >= 5.3.1
+BuildRequires:	qt5-qmake >= 5.4.0
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.602
 Requires(post,postun):	desktop-file-utils
 %requires_eq	Qt5Core
-Requires:	Qt5Sql
+Requires:	Qt5Gui-platform-xcb
+Requires:	Qt5Quick-controls
+Requires:	Qt5Sql-sqldriver-sqlite3
 Requires:	hicolor-icon-theme
 # for xdg-open
 Suggests:	xdg-utils
@@ -47,13 +51,7 @@ Qt.
 
 %prep
 %setup -q -n %{name}-opensource-src-%{version}
-
-%if "%{_lib}" == "lib64"
 %patch0 -p1
-%endif
-%if "%{_lib}" == "libx32"
-%patch1 -p1
-%endif
 
 # fix unresolved symbols in libQtcSsh
 echo >> src/libs/ssh/ssh_dependencies.pri
@@ -65,9 +63,11 @@ export QTDIR=%{_libdir}/qt5
 #export QMAKESPEC=%{_datadir}/qt4/mkspecs/linux-g++/
 
 qmake-qt5 qtcreator.pro \
+	IDE_LIBRARY_BASENAME="%{_lib}" \
+	LLVM_INSTALL_DIR="%{_prefix}" \
 	QMAKE_CXX="%{__cxx}" \
 	QMAKE_LINK="%{__cxx}" \
-	QMAKE_CXXFLAGS_RELEASE="%{rpmcflags}" \
+	QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
 	QMAKE_RPATH=
 
 %{__make}
@@ -80,18 +80,11 @@ export QTDIR=%{_libdir}/qt5
 %{__make} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix}
 
-%if "%{_lib}" != "lib"
-mv -f $RPM_BUILD_ROOT{%{_prefix}/lib,%{_libdir}}
-%endif
-
 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
 
-# not supported by hicolor-icon-theme
-rm -rf $RPM_BUILD_ROOT%{_iconsdir}/hicolor/512x512
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -107,7 +100,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/buildoutputparser
 %attr(755,root,root) %{_bindir}/qbs
 %attr(755,root,root) %{_bindir}/qbs-config
 %attr(755,root,root) %{_bindir}/qbs-config-ui
@@ -115,14 +107,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/qbs-setup-android
 %attr(755,root,root) %{_bindir}/qbs-setup-qt
 %attr(755,root,root) %{_bindir}/qbs-setup-toolchains
-%attr(755,root,root) %{_bindir}/qml2puppet
-%attr(755,root,root) %{_bindir}/qmlpuppet
 %attr(755,root,root) %{_bindir}/qtcreator
-%attr(755,root,root) %{_bindir}/qtcreator_process_stub
-%attr(755,root,root) %{_bindir}/qtpromaker
-%attr(755,root,root) %{_bindir}/sdktool
 %{_sysconfdir}/ld.so.conf.d/qtcreator.conf
 %dir %{_libdir}/qtcreator
+%attr(755,root,root) %{_libdir}/qtcreator/buildoutputparser
+%attr(755,root,root) %{_libdir}/qtcreator/clangbackend
+%attr(755,root,root) %{_libdir}/qtcreator/cpaster
+%attr(755,root,root) %{_libdir}/qtcreator/qml2puppet
+%attr(755,root,root) %{_libdir}/qtcreator/qtcreator_process_stub
+%attr(755,root,root) %{_libdir}/qtcreator/qtpromaker
+%attr(755,root,root) %{_libdir}/qtcreator/sdktool
 %attr(755,root,root) %{_libdir}/qtcreator/lib*.so.*.*
 %attr(755,root,root) %{_libdir}/qtcreator/lib*.so
 %attr(755,root,root) %ghost %{_libdir}/qtcreator/lib*.so.1
diff --git a/qt-creator-libexec.patch b/qt-creator-libexec.patch
new file mode 100644
index 0000000..25ded8e
--- /dev/null
+++ b/qt-creator-libexec.patch
@@ -0,0 +1,20 @@
+--- qt-creator-opensource-src-3.6.0/qtcreator.pri.libexec	2016-02-14 13:10:37.151868039 +0100
++++ qt-creator-opensource-src-3.6.0/qtcreator.pri	2016-02-14 13:12:02.182955481 +0100
+@@ -108,7 +108,7 @@ osx {
+     win32: \
+         IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/bin
+     else: \
+-        IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/libexec/qtcreator
++        IDE_LIBEXEC_PATH = $$IDE_LIBRARY_PATH
+     !isEqual(IDE_SOURCE_TREE, $$IDE_OUTPUT_PATH):copydata = 1
+ 
+     LINK_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
+@@ -119,7 +119,7 @@ osx {
+     win32: \
+         INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/bin
+     else: \
+-        INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/libexec/qtcreator
++        INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator
+     INSTALL_DATA_PATH    = $$QTC_PREFIX/share/qtcreator
+     INSTALL_DOC_PATH     = $$QTC_PREFIX/share/doc/qtcreator
+     INSTALL_BIN_PATH     = $$QTC_PREFIX/bin
diff --git a/qt-creator-pluginpath64.patch b/qt-creator-pluginpath64.patch
deleted file mode 100644
index 315ac17..0000000
--- a/qt-creator-pluginpath64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- qt-creator-1.0.0-src/src/app/main.cpp.orig	2009-03-05 14:48:59.398196319 +0100
-+++ qt-creator-1.0.0-src/src/app/main.cpp	2009-03-05 14:53:50.581940902 +0100
-@@ -172,6 +172,9 @@
- static inline QStringList getPluginPaths()
- {
-     QStringList rc;
-+    rc.push_back(QLatin1String("/usr/lib64/qtcreator/plugins"));
-+    return rc;
-+
-     // Figure out root:  Up one from 'bin'
-     QDir rootDir = QApplication::applicationDirPath();
-     rootDir.cdUp();
diff --git a/qt-creator-pluginpathx32.patch b/qt-creator-pluginpathx32.patch
deleted file mode 100644
index c842234..0000000
--- a/qt-creator-pluginpathx32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- qt-creator-1.0.0-src/src/app/main.cpp.orig	2009-03-05 14:48:59.398196319 +0100
-+++ qt-creator-1.0.0-src/src/app/main.cpp	2009-03-05 14:53:50.581940902 +0100
-@@ -172,6 +172,9 @@
- static inline QStringList getPluginPaths()
- {
-     QStringList rc;
-+    rc.push_back(QLatin1String("/usr/libx32/qtcreator/plugins"));
-+    return rc;
-+
-     // Figure out root:  Up one from 'bin'
-     QDir rootDir = QApplication::applicationDirPath();
-     rootDir.cdUp();
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt-creator.git/commitdiff/381d350117cb72eef9d53429668772115cee98cc

More information about the pld-cvs-commit mailing list