[qt-creator] Update to 3.4.0 beta1

Sandro Mani smani at fedoraproject.org
Thu Mar 5 19:52:00 UTC 2015


commit 148d89941033721fa455b017ab79c5f772b483ea
Author: Sandro Mani <manisandro at gmail.com>
Date:   Thu Mar 5 20:51:53 2015 +0100

    Update to 3.4.0 beta1

 .gitignore                                     |  1 +
 380acb5baa375806af0a081b56d6d1dccd87264f.patch | 63 --------------------------
 qt-creator.spec                                | 17 ++++---
 qt-creator_docdir.patch                        | 34 +++++++-------
 sources                                        |  2 +-
 5 files changed, 27 insertions(+), 90 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 935de30..f10b477 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /qt-creator-opensource-src-3.3.0.tar.gz
 /qt-creator-opensource-src-3.3.1.tar.gz
 /qt-creator-opensource-src-3.3.2.tar.gz
+/qt-creator-opensource-src-3.4.0-beta1.tar.gz
diff --git a/qt-creator.spec b/qt-creator.spec
index 5773956..c1d57b7 100644
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@ -1,22 +1,19 @@
-#global pre rc1
+%global pre beta1
 
 Name:           qt-creator
-Version:        3.3.2
-Release:        1%{?pre:.%pre}%{?dist}
+Version:        3.4.0
+Release:        0.1%{?pre:.%pre}%{?dist}
 Summary:        Cross-platform IDE for Qt
 
 Group:          Development/Tools
 License:        LGPLv2 or LGPLv3, with exceptions
 URL:            http://qt-project.org/wiki/Category:Tools::QtCreator
-Source0:        http://download.qt-project.org/%{?pre:development}%{!?pre:official}_releases/qtcreator/3.3/%{version}%{?pre:-%pre}/qt-creator-opensource-src-%{version}%{?pre:-%pre}.tar.gz
+Source0:        http://download.qt-project.org/%{?pre:development}%{!?pre:official}_releases/qtcreator/3.4/%{version}%{?pre:-%pre}/qt-creator-opensource-src-%{version}%{?pre:-%pre}.tar.gz
 # Fix doc dir (Fedora package is called qt-creator, not qtcreator)
 Patch0:         qt-creator_docdir.patch
-# Backport of upstream commit 380acb5baa375806af0a081b56d6d1dccd87264f
-# QTCREATORBUG-13861 / RHBZ#1184174
-Patch1:         380acb5baa375806af0a081b56d6d1dccd87264f.patch
 # Use absolute paths for the specified rpaths, not $ORIGIN-relative paths
 # (to fix some /usr/bin/<binary> having rpath $ORIGIN/..)
-Patch2:         qt-creator_rpath.patch
+Patch1:         qt-creator_rpath.patch
 
 # See #1074700
 ExcludeArch:    %{arm}
@@ -81,7 +78,6 @@ tailored to the needs of Qt developers.
 %setup -q -n qt-creator-opensource-src-%{version}%{?pre:-%pre}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 export QTDIR="%{_qt5_prefix}"
@@ -160,6 +156,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Mar 05 2015 Sandro Mani <manisandro at gmail.com> - 3.4.0-0.1.beta1
+- 3.4.0 beta1 release
+
 * Thu Mar 05 2015 Sandro Mani <manisandro at gmail.com> - 3.3.2-1
 - 3.3.2 release
 
diff --git a/qt-creator_docdir.patch b/qt-creator_docdir.patch
index 05d973d..efa7e51 100644
--- a/qt-creator_docdir.patch
+++ b/qt-creator_docdir.patch
@@ -1,6 +1,6 @@
-diff -rupN qt-creator-opensource-src-3.3.1/doc/api/qtcreator-documentation.qdoc qt-creator-opensource-src-3.3.1-new/doc/api/qtcreator-documentation.qdoc
---- qt-creator-opensource-src-3.3.1/doc/api/qtcreator-documentation.qdoc	2015-02-19 11:16:46.000000000 +0100
-+++ qt-creator-opensource-src-3.3.1-new/doc/api/qtcreator-documentation.qdoc	2015-02-24 14:30:36.319452909 +0100
+diff -rupN qt-creator-opensource-src-3.4.0-beta1/doc/api/qtcreator-documentation.qdoc qt-creator-opensource-src-3.4.0-beta1-new/doc/api/qtcreator-documentation.qdoc
+--- qt-creator-opensource-src-3.4.0-beta1/doc/api/qtcreator-documentation.qdoc	2015-03-03 17:47:18.000000000 +0100
++++ qt-creator-opensource-src-3.4.0-beta1-new/doc/api/qtcreator-documentation.qdoc	2015-03-05 20:47:58.308259478 +0100
 @@ -294,7 +294,7 @@
      The \QC Manual HTML files are generated in the \c {doc/html} directory.
      The Extending \QC Manual files are generated in the
@@ -10,9 +10,9 @@ diff -rupN qt-creator-opensource-src-3.3.1/doc/api/qtcreator-documentation.qdoc
      Linux, and in the \c {bin/Qt Creator.app/Contents/Resources/app} directory
      on OS X. You can view the HTML files in a browser and the help files in
      the \QC \uicontrol Help mode. For more information about adding the help files to
-diff -rupN qt-creator-opensource-src-3.3.1/doc/doc.pri qt-creator-opensource-src-3.3.1-new/doc/doc.pri
---- qt-creator-opensource-src-3.3.1/doc/doc.pri	2015-02-19 11:16:46.000000000 +0100
-+++ qt-creator-opensource-src-3.3.1-new/doc/doc.pri	2015-02-24 14:30:36.319452909 +0100
+diff -rupN qt-creator-opensource-src-3.4.0-beta1/doc/doc.pri qt-creator-opensource-src-3.4.0-beta1-new/doc/doc.pri
+--- qt-creator-opensource-src-3.4.0-beta1/doc/doc.pri	2015-03-03 17:47:18.000000000 +0100
++++ qt-creator-opensource-src-3.4.0-beta1-new/doc/doc.pri	2015-03-05 20:47:58.309259500 +0100
 @@ -68,12 +68,12 @@ dev_qch_docs.depends += dev_html_docs
  
  !macx {
@@ -28,9 +28,9 @@ diff -rupN qt-creator-opensource-src-3.3.1/doc/doc.pri qt-creator-opensource-src
      inst_dev_qch_docs.CONFIG += no_check_exist no_default_install
      INSTALLS += inst_dev_qch_docs
  
-diff -rupN qt-creator-opensource-src-3.3.1/qtcreator.pri qt-creator-opensource-src-3.3.1-new/qtcreator.pri
---- qt-creator-opensource-src-3.3.1/qtcreator.pri	2015-02-19 11:16:46.000000000 +0100
-+++ qt-creator-opensource-src-3.3.1-new/qtcreator.pri	2015-02-24 14:30:36.320452927 +0100
+diff -rupN qt-creator-opensource-src-3.4.0-beta1/qtcreator.pri qt-creator-opensource-src-3.4.0-beta1-new/qtcreator.pri
+--- qt-creator-opensource-src-3.4.0-beta1/qtcreator.pri	2015-03-03 17:47:18.000000000 +0100
++++ qt-creator-opensource-src-3.4.0-beta1-new/qtcreator.pri	2015-03-05 20:47:58.309259500 +0100
 @@ -90,7 +90,7 @@ macx {
      IDE_PLUGIN_PATH  = $$IDE_LIBRARY_PATH/plugins
      IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME
@@ -40,10 +40,10 @@ diff -rupN qt-creator-opensource-src-3.3.1/qtcreator.pri qt-creator-opensource-s
      IDE_BIN_PATH     = $$IDE_APP_PATH
      !isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1
  }
-diff -rupN qt-creator-opensource-src-3.3.1/qtcreator.qbs qt-creator-opensource-src-3.3.1-new/qtcreator.qbs
---- qt-creator-opensource-src-3.3.1/qtcreator.qbs	2015-02-19 11:16:46.000000000 +0100
-+++ qt-creator-opensource-src-3.3.1-new/qtcreator.qbs	2015-02-24 14:30:36.320452927 +0100
-@@ -42,7 +42,7 @@ Project {
+diff -rupN qt-creator-opensource-src-3.4.0-beta1/qtcreator.qbs qt-creator-opensource-src-3.4.0-beta1-new/qtcreator.qbs
+--- qt-creator-opensource-src-3.4.0-beta1/qtcreator.qbs	2015-03-03 17:47:18.000000000 +0100
++++ qt-creator-opensource-src-3.4.0-beta1-new/qtcreator.qbs	2015-03-05 20:47:58.310259521 +0100
+@@ -44,7 +44,7 @@ Project {
              : ide_app_path
      property string ide_doc_path: qbs.targetOS.contains("osx")
              ? ide_data_path + "/doc"
@@ -52,10 +52,10 @@ diff -rupN qt-creator-opensource-src-3.3.1/qtcreator.qbs qt-creator-opensource-s
      property string ide_bin_path: qbs.targetOS.contains("osx")
              ? ide_app_target + ".app/Contents/MacOS"
              : ide_app_path
-diff -rupN qt-creator-opensource-src-3.3.1/src/plugins/coreplugin/icore.cpp qt-creator-opensource-src-3.3.1-new/src/plugins/coreplugin/icore.cpp
---- qt-creator-opensource-src-3.3.1/src/plugins/coreplugin/icore.cpp	2015-02-19 11:16:46.000000000 +0100
-+++ qt-creator-opensource-src-3.3.1-new/src/plugins/coreplugin/icore.cpp	2015-02-24 14:30:36.321452946 +0100
-@@ -422,7 +422,7 @@ QString ICore::userResourcePath()
+diff -rupN qt-creator-opensource-src-3.4.0-beta1/src/plugins/coreplugin/icore.cpp qt-creator-opensource-src-3.4.0-beta1-new/src/plugins/coreplugin/icore.cpp
+--- qt-creator-opensource-src-3.4.0-beta1/src/plugins/coreplugin/icore.cpp	2015-03-03 17:47:18.000000000 +0100
++++ qt-creator-opensource-src-3.4.0-beta1-new/src/plugins/coreplugin/icore.cpp	2015-03-05 20:47:58.311259542 +0100
+@@ -411,7 +411,7 @@ QString ICore::userResourcePath()
  QString ICore::documentationPath()
  {
      const QString docPath = QLatin1String(Utils::HostOsInfo::isMacHost()
diff --git a/sources b/sources
index 86b2de3..46a01cb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-476ff3142c5e8d09fa5f495070f350df  qt-creator-opensource-src-3.3.2.tar.gz
+5be712124abeef4193f24b04f8f8ba77  qt-creator-opensource-src-3.4.0-beta1.tar.gz


More information about the scm-commits mailing list