From d5bdf9be6c3979f2e35aaf5cdce7126efea445f6 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Aug 02 2017 12:27:02 +0000 Subject: Update to 4.4.0-beta1 --- diff --git a/.gitignore b/.gitignore index 36355d3..587b744 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ /qt-creator-opensource-src-4.3.0-rc1.tar.xz /qt-creator-opensource-src-4.3.0.tar.xz /qt-creator-opensource-src-4.3.1.tar.xz +/qt-creator-opensource-src-4.4.0-beta1.tar.xz diff --git a/qt-creator-Fedora-privlibs b/qt-creator-Fedora-privlibs index 3b8dc4d..aff65a3 100644 --- a/qt-creator-Fedora-privlibs +++ b/qt-creator-Fedora-privlibs @@ -10,7 +10,6 @@ %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 @@ -25,6 +24,7 @@ %global privlibs %{privlibs}|libEmacsKeys %global privlibs %{privlibs}|libExtensionSystem %global privlibs %{privlibs}|libFakeVim +%global privlibs %{privlibs}|libFlameGraph %global privlibs %{privlibs}|libGLSL %global privlibs %{privlibs}|libGLSLEditor %global privlibs %{privlibs}|libGenericProjectManager @@ -38,6 +38,7 @@ %global privlibs %{privlibs}|libMercurial %global privlibs %{privlibs}|libModelEditor %global privlibs %{privlibs}|libModeling +%global privlibs %{privlibs}|libNim %global privlibs %{privlibs}|libPerforce %global privlibs %{privlibs}|libProjectExplorer %global privlibs %{privlibs}|libPythonEditor @@ -45,19 +46,19 @@ %global privlibs %{privlibs}|libQmakeAndroidSupport %global privlibs %{privlibs}|libQmakeProjectManager %global privlibs %{privlibs}|libQmlDebug -%global privlibs %{privlibs}|libQmlDesigner %global privlibs %{privlibs}|libQmlEditorWidgets %global privlibs %{privlibs}|libQmlJS %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}|libQtSupport %global privlibs %{privlibs}|libQtcSsh %global privlibs %{privlibs}|libRemoteLinux %global privlibs %{privlibs}|libResourceEditor +%global privlibs %{privlibs}|libScxmlEditor +%global privlibs %{privlibs}|libSilverSearcher %global privlibs %{privlibs}|libSqlite %global privlibs %{privlibs}|libSubversion %global privlibs %{privlibs}|libTaskList @@ -70,9 +71,3 @@ %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 diff --git a/qt-creator.spec b/qt-creator.spec index 8db88a1..acee268 100644 --- a/qt-creator.spec +++ b/qt-creator.spec @@ -1,17 +1,19 @@ -#define prerelease rc1 +%define prerelease beta1 # We need avoid oython byte compiler to not crash over template .py file which # is not a valid python file, only for the IDE %global _python_bytecompile_errors_terminate_build 0 Name: qt-creator -Version: 4.3.1 -Release: 3%{?prerelease:.%prerelease}%{?dist} +Version: 4.4.0 +Release: 0.1%{?prerelease:.%prerelease}%{?dist} Summary: Cross-platform IDE for Qt License: GPLv3 with exceptions URL: https://www.qt.io/ide/ -Source0: http://download.qt.io/%{?prerelease:development}%{?!prerelease:official}_releases/qtcreator/4.3/%{version}%{?prerelease:-%prerelease}/qt-creator-opensource-src-%{version}%{?prerelease:-%prerelease}.tar.xz +Source0: https://download.qt.io/%{?prerelease:development}%{?!prerelease:official}_releases/qtcreator/4.4/%{version}%{?prerelease:-%prerelease}/qt-creator-opensource-src-%{version}%{?prerelease:-%prerelease}.tar.xz + +Source1: qt-creator-Fedora-privlibs # In Fedora, the ninja command is called ninja-build Patch0: qt-creator_ninja-build.patch @@ -33,6 +35,7 @@ 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: qbs-devel BuildRequires: desktop-file-utils BuildRequires: botan-devel BuildRequires: diffutils @@ -47,13 +50,15 @@ Requires: qt5-qtquickcontrols%{?_isa} # we need qt-devel and gcc-c++ to compile programs using qt-creator Requires: qt5-qtbase-devel Requires: gcc-c++ -Requires: qbs%{?_isa} = %{version}-%{release} Requires: %{name}-data = %{version}-%{release} Provides: qtcreator = %{version}-%{release} -# Exclude private library from provides -%global __provides_exclude_from ^%{_libdir}/qtcreator/.*$ +# long list of private shared lib names to filter out +%include %{SOURCE1} +%global __provides_exclude ^(%{privlibs})\.so +%global __requires_exclude ^(%{privlibs})\.so + %description @@ -61,15 +66,6 @@ Qt Creator is a cross-platform IDE (integrated development environment) tailored to the needs of Qt developers. -%package -n qbs -Summary: Cross-platform build tool - -%description -n qbs -Qbs is an all-in-one tool that generates a build graph from a high-level -project description (like qmake or CMake) and additionally undertakes the task -of executing the commands in the low-level build graph (like make). - - %package data Summary: Application data for %{name} Requires: %{name} = %{version}-%{release} @@ -107,7 +103,7 @@ User documentation for %{name}. export QTDIR="%{_qt5_prefix}" export PATH="%{_qt5_bindir}:$PATH" -%qmake_qt5 -r IDE_LIBRARY_BASENAME=%{_lib} USE_SYSTEM_BOTAN=1 %{?llvm:LLVM_INSTALL_DIR=%{_prefix}} CONFIG+=disable_external_rpath +%qmake_qt5 -r IDE_LIBRARY_BASENAME=%{_lib} USE_SYSTEM_BOTAN=1 %{?llvm:LLVM_INSTALL_DIR=%{_prefix}} QBS_INSTALL_DIR=%{_prefix} CONFIG+=disable_external_rpath %make_build %make_build qch_docs @@ -122,7 +118,24 @@ for i in 16 24 32 48 64 128 256; do done desktop-file-validate %{buildroot}/%{_datadir}/applications/org.qt-project.qtcreator.desktop -%{_bindir}/appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/org.qt-project.qtcreator.appdata.xml +%{_bindir}/appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.qt-project.qtcreator.appdata.xml + + +# Output an up-to-date list of Provides/Requires exclude statements. +outfile=__Fedora-privlibs +i=0 +sofiles=$(find %{buildroot}%{_libdir}/qtcreator -name \*.so\*|sed 's!^.*/\(.*\).so.*!\1!g'|sort|uniq) +for so in ${sofiles} ; do + if [ $i == 0 ]; then + echo "%%global privlibs $so" > $outfile + i=1 + else + echo "%%global privlibs %%{privlibs}|$so" >> $outfile + fi +done +cat $outfile +# If there are differences, abort the build +diff -u %{SOURCE1} $outfile %post @@ -148,22 +161,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %exclude %{_libdir}/qtcreator/plugins/qbs %{_libexecdir}/qtcreator/ %{_datadir}/applications/org.qt-project.qtcreator.desktop -%{_datadir}/appdata/org.qt-project.qtcreator.appdata.xml +%{_datadir}/metainfo/org.qt-project.qtcreator.appdata.xml %{_datadir}/icons/hicolor/*/apps/QtProject-qtcreator.png -%files -n qbs -%{_bindir}/qbs -%{_bindir}/qbs-config -%{_bindir}/qbs-config-ui -%{_bindir}/qbs-create-project -%{_bindir}/qbs-qmltypes -%{_bindir}/qbs-setup-* -%dir %{_libdir}/qtcreator -%{_libdir}/qtcreator/libqbscore.so* -%{_libdir}/qtcreator/libqbsqtprofilesetup.so* -%dir %{_libdir}/qtcreator/plugins -%{_libdir}/qtcreator/plugins/qbs - %files data %{_datadir}/qtcreator/ %exclude %{_datadir}/qtcreator/translations @@ -172,12 +172,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/qtcreator/translations/ %files doc +# Please don't change this, it is where qt-creator expects the documentation to be! %dir %{_defaultdocdir}/qtcreator/ %doc %{_defaultdocdir}/qtcreator/qtcreator.qch %doc %{_defaultdocdir}/qtcreator/qtcreator-dev.qch %changelog +* Mon Jul 31 2017 Sandro Mani - 4.4.0-0.1.beta1 +- Update to 4.4.0-beta1 +- Drop qbs subpackage, it now lives in a separate package + * Thu Jul 27 2017 Fedora Release Engineering - 4.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/qt-creator_appdata.patch b/qt-creator_appdata.patch index 7059b2e..b22671b 100644 --- a/qt-creator_appdata.patch +++ b/qt-creator_appdata.patch @@ -16,15 +16,3 @@ diff -rupN qt-creator-opensource-src-4.3.1/dist/org.qt-project.qtcreator.appdata https://qt.io/ide/ - Qt -diff -rupN qt-creator-opensource-src-4.3.1/qtcreator.pro qt-creator-opensource-src-4.3.1-new/qtcreator.pro ---- qt-creator-opensource-src-4.3.1/qtcreator.pro 2017-06-28 17:39:49.000000000 +0200 -+++ qt-creator-opensource-src-4.3.1-new/qtcreator.pro 2017-07-14 12:22:19.711306599 +0200 -@@ -107,7 +107,7 @@ else:INSTALLER_NAME = "$${BASENAME}" - - linux { - appstream.files = dist/org.qt-project.qtcreator.appdata.xml -- appstream.path = $$QTC_PREFIX/share/metainfo/ -+ appstream.path = $$QTC_PREFIX/share/appdata/ - - desktop.files = dist/org.qt-project.qtcreator.desktop - desktop.path = $$QTC_PREFIX/share/applications/ diff --git a/sources b/sources index e13a821..fe1661c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qt-creator-opensource-src-4.3.1.tar.xz) = 9fd89cee4a3b17662ac83bd63065f66f6b446774eb28ab4e56b85b82dc8c6b9b7be512014e5096dd343d913688700c3297b49bf4abe920429ca72cc665c95226 +SHA512 (qt-creator-opensource-src-4.4.0-beta1.tar.xz) = 5567da5a6bf099d644ee691ee117f9373011f9c81a1254ce31e978f219075c6292805074894a006a5045125854b853f4807e0cab8fb6971530da4d47c72d4e6d