Hello community, here is the log from the commit of package libqt5-creator for openSUSE:Factory checked in at 2017-05-27 13:19:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-creator (Old) and /work/SRC/openSUSE:Factory/.libqt5-creator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-creator" Sat May 27 13:19:18 2017 rev:44 rq:498337 version:4.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-creator/libqt5-creator.changes 2017-04-25 08:58:44.634375209 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-creator.new/libqt5-creator.changes 2017-05-27 13:20:24.738139219 +0200 @@ -1,0 +2,24 @@ +Wed May 24 19:21:34 UTC 2017 - [email protected] + +- Update to 4.3.0 + * For more details see: + https://blog.qt.io/blog/2017/05/24/qt-creator-4-3-0-released/ + +------------------------------------------------------------------- +Wed May 10 14:18:46 UTC 2017 - [email protected] + +- Update to 4.3.0 RC1 + * For more details see: + http://blog.qt.io/blog/2017/05/09/qt-creator-4-3-rc1-released/ +- Remove qtcreator.desktop, file now upstream +- Add patch to fix build failure: + * disable_failing_cxxflags.diff + +------------------------------------------------------------------- +Mon May 1 18:56:13 UTC 2017 - [email protected] + +- Update to 4.2.2 + * For more details see: + https://blog.qt.io/blog/2017/04/21/qt-creator-4-2-2-released/ + +------------------------------------------------------------------- Old: ---- qt-creator-opensource-src-4.2.1.tar.gz qtcreator.desktop New: ---- disable_failing_cxxflags.diff qt-creator-opensource-src-4.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-creator.spec ++++++ --- /var/tmp/diff_new_pack.nPD461/_old 2017-05-27 13:20:32.781002182 +0200 +++ /var/tmp/diff_new_pack.nPD461/_new 2017-05-27 13:20:32.785001616 +0200 @@ -16,30 +16,20 @@ # -# Enable the clangcodemodel plugin on openSUSE TW only for now (Needs Clang 3.9) -%ifarch %arm %ix86 x86_64 -%if 0%{?is_opensuse} && 0%{suse_version} >= 1330 -%global enable_clang 1 -%else -%global enable_clang 0 -%endif -%else -%global enable_clang 0 -%endif - Name: libqt5-creator -Version: 4.2.1 +Version: 4.3.0 Release: 0 Summary: Lightweight IDE License: SUSE-LGPL-2.1-with-digia-exception-1.1 Group: Development/Tools/IDE -Url: http://qt.digia.com/Product/Developer-Tools/ -%define major_ver 4.2 +Url: https://www.qt.io/ide/ +%define major_ver 4.3 %define rname qt-creator -%define qt5_version 5.6.1 -Source: http://download.qt.io/official_releases/qtcreator/%{major_ver}/%{version}/%{rname}-opensource-src-%{version}.tar.gz +%define qt5_version 5.6.0 +Source: http://download.qt.io/official_releases/qtcreator/4.3/4.3.0/qt-creator-opensource-src-4.3.0.tar.xz Source1: %{name}-rpmlintrc -Source2: qtcreator.desktop +# PATCH-FIX-OPENSUSE disable_failing_cxxflags.diff -- disable failing cxxflags when using llvm +Patch0: disable_failing_cxxflags.diff # PATCH-FIX-UPSTREAM lldb.diff -- exclude lldb-mi* from autodetection Patch1: lldb.diff BuildRequires: gdb @@ -51,9 +41,16 @@ BuildRequires: libqt5-qtscript-devel >= %{qt5_version} BuildRequires: libqt5-qttools-private-headers-devel >= %{qt5_version} BuildRequires: libqt5-qtx11extras-devel >= %{qt5_version} -%if %{enable_clang} +%if 0%{?suse_version} < 1330 +# It does not build with the default compiler (GCC 4.8) on Leap 42.x +BuildRequires: gcc6-c++ +%endif +# Enable the clangcodemodel plugin on openSUSE TW, which has LLVM >= 3.9. +%ifarch %arm %ix86 x86_64 +%if 0%{?suse_version} > 1320 BuildRequires: llvm-clang-devel >= 3.9 %endif +%endif BuildRequires: update-desktop-files BuildRequires: xz Provides: qt-creator = %{version} @@ -88,7 +85,8 @@ (aka QTC_SOURCE) necessary to compile plugins. %prep -%setup -q -n %{rname}-opensource-src-%{version} +%setup -q -n %{rname}-opensource-src-4.3.0 +%patch0 -p1 %patch1 -p1 %build @@ -97,16 +95,24 @@ # https://bugzilla.opensuse.org/962650 sed -i s,libexec/qtcreator,%{_lib}/qtcreator/libexec,g src/plugins/coreplugin/icore.cpp -%if %{enable_clang} +# Enable the clangcodemodel plugin on openSUSE TW, which has LLVM >= 3.9. +%ifarch %arm %ix86 x86_64 +%if 0%{?suse_version} > 1320 opts="LLVM_INSTALL_DIR=%{_prefix}" %endif - +%endif opts="$opts IDE_LIBRARY_BASENAME=%{_lib} USE_SYSTEM_BOTAN=1" +makeopts="" +%if 0%{?suse_version} < 1330 +# It does not build with the default compiler (GCC 4.8) on Leap 42.x +makeopts="$makeopts CC=gcc-6 CXX=g++-6" +%endif + %qmake5 $opts -make %{?_smp_mflags} +make %{?_smp_mflags} $makeopts make qch_docs -make html_docs_online +make html_docs %install export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}%{_libdir}" @@ -117,7 +123,9 @@ cp share/doc/qtcreator/qtcreator.qch %{buildroot}%{_datadir}/doc/packages/qt5/ mkdir -p %{buildroot}%{_datadir}/doc/packages/qt5/qtcreator -cp -a doc/html/* %{buildroot}%{_datadir}/doc/packages/qt5/qtcreator/ +cp -a doc/qtcreator/* %{buildroot}%{_datadir}/doc/packages/qt5/qtcreator/ + +%suse_update_desktop_file -i org.qt-project.qtcreator Development Qt IDE # plugin development files mkdir %{buildroot}%{_datadir}/qtcreator-devel @@ -146,12 +154,12 @@ %{_libdir}/qtcreator/ %{_datadir}/qtcreator/ %{_datadir}/icons/hicolor -%{_datadir}/applications/org.qt-project.qtcreator.desktop -%dir %{_datadir}/metainfo -%{_datadir}/metainfo/org.qt-project.qtcreator.appdata.xml %dir %{_datadir}/doc/packages/qt5 %{_datadir}/doc/packages/qt5/qtcreator/ %{_datadir}/doc/packages/qt5/qtcreator.qch +%{_datadir}/applications/org.qt-project.qtcreator.desktop +%dir %{_datadir}/metainfo +%{_datadir}/metainfo/org.qt-project.qtcreator.appdata.xml %files plugin-devel %defattr(-,root,root) ++++++ disable_failing_cxxflags.diff ++++++ diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index 7ef42f2911..1a53780c29 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -126,6 +126,7 @@ LLVM_CXXFLAGS ~= s,-Werror=date-time, LLVM_CXXFLAGS ~= s,-Wcovered-switch-default, LLVM_CXXFLAGS ~= s,-fPIC, LLVM_CXXFLAGS ~= s,-pedantic, +LLVM_CXXFLAGS ~= s,-Wstring-conversion, # split-dwarf needs objcopy which does not work via icecc out-of-the-box LLVM_CXXFLAGS ~= s,-gsplit-dwarf,
