diff --git a/.gitignore b/.gitignore index 4c7f786..5d281b4 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /qt-creator-opensource-src-4.0.0.tar.gz /qt-creator-opensource-src-4.0.1.tar.gz /qt-creator-opensource-src-4.0.2.tar.gz +/qt-creator-opensource-src-4.1.0-beta1.tar.gz diff --git a/qt-creator.spec b/qt-creator.spec index 55e5634..b69c388 100644 --- a/qt-creator.spec +++ b/qt-creator.spec @@ -1,27 +1,22 @@ -#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.0.2 -Release: 2%{?prerelease:.%prerelease}%{?dist} +Version: 4.1.0 +Release: 0.1%{?prerelease:.%prerelease}%{?dist} Summary: Cross-platform IDE for Qt Group: Development/Tools License: GPLv3 with exceptions URL: http://qt-project.org/wiki/Category:Tools::QtCreator Provides: qtcreator = %{version}-%{release} Source0: http://download.qt.io/%{?prerelease:development}%{?!prerelease:official}_releases/qtcreator/4.0/%{version}%{?prerelease:-%prerelease}/qt-creator-opensource-src-%{version}%{?prerelease:-%prerelease}.tar.gz -# Use absolute paths for the specified rpaths, not $ORIGIN-relative paths -# (to fix some /usr/bin/ having rpath $ORIGIN/..) -Patch0: qt-creator_rpath.patch # In Fedora, the ninja command is called ninja-build -Patch1: qt-creator_ninja-build.patch +Patch0: qt-creator_ninja-build.patch # Don't add LLVM_INCLUDEPATH to INCLUDES, since it translates to adding -isystem /usr/include to the compiler flags which breaks compilation -Patch2: qt-creator_llvmincdir.patch -# Fix build failure due to missing include -Patch3: qt-creator_build.patch +Patch1: qt-creator_llvmincdir.patch Source1: qtcreator.desktop Source2: qt-creator-Fedora-privlibs @@ -42,14 +37,14 @@ Requires: gcc-c++ Requires: %{name}-data = %{version}-%{release} -BuildRequires: qt5-qtbase-devel >= 5.5.0 +BuildRequires: qt5-qtbase-devel >= 5.6.0 BuildRequires: qt5-qdoc -BuildRequires: pkgconfig(Qt5Designer) >= 5.5.0 -BuildRequires: pkgconfig(Qt5Script) >= 5.5.0 -BuildRequires: pkgconfig(Qt5XmlPatterns) >= 5.5.0 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.5.0 -BuildRequires: pkgconfig(Qt5WebKit) >= 5.5.0 -BuildRequires: pkgconfig(Qt5Help) >= 5.5.0 +BuildRequires: pkgconfig(Qt5Designer) >= 5.6.0 +BuildRequires: pkgconfig(Qt5Script) >= 5.6.0 +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: desktop-file-utils BuildRequires: botan-devel BuildRequires: diffutils @@ -101,15 +96,13 @@ User documentation for %{name}. %setup -q -n qt-creator-opensource-src-%{version}%{?prerelease:-%prerelease} %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build export QTDIR="%{_qt5_prefix}" export PATH="%{_qt5_bindir}:$PATH" -%qmake_qt5 -r IDE_LIBRARY_BASENAME=%{_lib} USE_SYSTEM_BOTAN=1 LLVM_INSTALL_DIR=%{_prefix} CONFIG+=disable_rpath +%qmake_qt5 -r IDE_LIBRARY_BASENAME=%{_lib} USE_SYSTEM_BOTAN=1 LLVM_INSTALL_DIR=%{_prefix} CONFIG+=disable_external_rpath make %{?_smp_mflags} make qch_docs %{?_smp_mflags} @@ -143,6 +136,9 @@ done diff -u %{SOURCE2} $outfile || : cat $outfile +# Invalid rpath +#chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/qtcreator/clangbackend + %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -184,6 +180,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Jul 06 2016 Helio Chissini de Castro - 4.1.0-0.1 +- Beta1 release of 4.1.0 +- Removed both rpath and build patches not needed anymore + * Thu Jun 30 2016 Rex Dieter - 4.0.2-2 - rebuild (qt5-qtbase) diff --git a/qt-creator_build.patch b/qt-creator_build.patch deleted file mode 100644 index e16f3b9..0000000 --- a/qt-creator_build.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rupN qt-creator-opensource-src-4.0.0-beta1/src/libs/clangbackendipc/clangbackendipc_global.h qt-creator-opensource-src-4.0.0-beta1-new/src/libs/clangbackendipc/clangbackendipc_global.h ---- qt-creator-opensource-src-4.0.0-beta1/src/libs/clangbackendipc/clangbackendipc_global.h 2016-03-22 15:59:58.000000000 +0100 -+++ qt-creator-opensource-src-4.0.0-beta1-new/src/libs/clangbackendipc/clangbackendipc_global.h 2016-03-24 14:03:58.396209501 +0100 -@@ -27,6 +27,7 @@ - #define CLANGBACKENDIPC_GLOBAL_H - - #include -+#include - - #if defined(CLANGBACKENDIPC_BUILD_LIB) - # define CMBIPC_EXPORT Q_DECL_EXPORT diff --git a/qt-creator_rpath.patch b/qt-creator_rpath.patch deleted file mode 100644 index efab96b..0000000 --- a/qt-creator_rpath.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -rupN qt-creator-opensource-src-3.3.1/src/rpath.pri qt-creator-opensource-src-3.3.1-new/src/rpath.pri ---- qt-creator-opensource-src-3.3.1/src/rpath.pri 2015-02-19 11:16:46.000000000 +0100 -+++ qt-creator-opensource-src-3.3.1-new/src/rpath.pri 2015-02-24 19:06:30.603703530 +0100 -@@ -3,9 +3,8 @@ macx { - } else:linux-* { - #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var -- QMAKE_RPATHDIR += \$\$ORIGIN -- QMAKE_RPATHDIR += \$\$ORIGIN/.. -- QMAKE_RPATHDIR += \$\$ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator -+ QMAKE_RPATHDIR += $${QTC_PREFIX}/$${IDE_LIBRARY_BASENAME}/qtcreator -+ QMAKE_RPATHDIR += $${QTC_PREFIX}/$${IDE_LIBRARY_BASENAME}/qtcreator/plugins - IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") - - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' diff --git a/sources b/sources index 7c9f22e..d5cc979 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -80eea55be0d1ad45d7b6837a5027493c qt-creator-opensource-src-4.0.2.tar.gz +bf5c6fc3772273c901ef39807fe76acf qt-creator-opensource-src-4.1.0-beta1.tar.gz