commit qt-creator for openSUSE:Factory

28 Aug 2014

Hello community,

here is the log from the commit of package qt-creator for openSUSE:Factory checked in at 2014-08-28 21:05:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt-creator (Old)
 and      /work/SRC/openSUSE:Factory/.qt-creator.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "qt-creator"

Changes:
--------

--- /work/SRC/openSUSE:Factory/qt-creator/qt-creator.changes	2013-12-13 12:00:36.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.qt-creator.new/qt-creator.changes	2014-08-28 21:05:50.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Aug 26 11:11:57 UTC 2014 - cgiboudeaux@gmx.com
+
+- Update to 3.2.0
+  See http://qt.gitorious.org/qt-creator/qt-creator/blobs/3.2/dist/changes-3.2.0
+  for the complete changelog
+
+-------------------------------------------------------------------

Old:
----
  qt-creator-opensource-src-3.0.0.tar.gz

New:
----
  qt-creator-opensource-src-3.2.0.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ qt-creator.spec ++++++
--- /var/tmp/diff_new_pack.As4WaU/_old	2014-08-28 21:05:51.000000000 +0200
+++ /var/tmp/diff_new_pack.As4WaU/_new	2014-08-28 21:05:51.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package qt-creator
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,14 @@
 
 
 Name:           qt-creator
-Version:        3.0.0
+Version:        3.2.0
 Release:        0
 Summary:        Lightweight IDE
 License:        SUSE-LGPL-2.1-with-digia-exception-1.1
 Group:          Development/Tools/IDE
 Url:            http://www.qtsoftware.com/developer/qt-creator/
-%define rversion 3.0.0
-Source:         http://download.qt-project.org/official_releases/qtcreator/3.0/%{rversion}/%{name}-opensource-src-%{rversion}.tar.gz
+%define rversion 3.2.0
+Source:         http://download.qt-project.org/official_releases/qtcreator/3.2/%{rversion}/%{name}-opensource-src-%{rversion}.tar.gz
 Source1:        qtcreator.desktop
 Patch1:         system-botan-lib.diff
 Patch2:         hardcoded-runpath.diff
@@ -117,6 +117,7 @@
 %dir %{_datadir}/icons/hicolor/*/apps
 %dir %{_docdir}/libqt4/qch
 %doc %{_docdir}/libqt4/qch/qtcreator.qch
+%{_bindir}/buildoutputparser
 %{_bindir}/qmlpuppet
 %{_bindir}/qtcreator
 %{_bindir}/qtcreator_process_stub

++++++ hardcoded-runpath.diff ++++++
--- /var/tmp/diff_new_pack.As4WaU/_old	2014-08-28 21:05:51.000000000 +0200
+++ /var/tmp/diff_new_pack.As4WaU/_new	2014-08-28 21:05:51.000000000 +0200
@@ -1,15 +1,14 @@
 diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri
-index c243fa1..f210a93 100644
+index 0fe283d..f7e04d0 100644
 --- a/src/qtcreatorplugin.pri
 +++ b/src/qtcreatorplugin.pri
-@@ -119,13 +119,7 @@ macx {
-         QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../../,-rpath,@executable_path/../
-     }
+@@ -127,12 +127,7 @@ macx {
+     QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/
+     QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../,-rpath,@executable_path/../
  } else:linux-* {
 -    #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
 -    QMAKE_RPATHDIR += \$\$ORIGIN
 -    QMAKE_RPATHDIR += \$\$ORIGIN/..
--    QMAKE_RPATHDIR += \$\$ORIGIN/../..
 -    IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
 -    QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
 -    QMAKE_RPATHDIR =

++++++ qbs-path.diff ++++++
--- /var/tmp/diff_new_pack.As4WaU/_old	2014-08-28 21:05:51.000000000 +0200
+++ /var/tmp/diff_new_pack.As4WaU/_new	2014-08-28 21:05:51.000000000 +0200
@@ -1,9 +1,11 @@
---- a/src/shared/qbs/src/plugins/plugins.pri	2013-07-05 11:52:12.000000000 -0300
-+++ b/src/shared/qbs/src/plugins/plugins.pri	2013-07-16 12:40:32.000000000 -0300
-@@ -17,5 +17,5 @@
-     installPrefix = $${QBS_RESOURCES_INSTALL_DIR}
+diff --git a/src/shared/qbs/src/plugins/plugins.pri b/src/shared/qbs/src/plugins/plugins.pri
+index a348d52..ac91f19 100644
+--- a/src/shared/qbs/src/plugins/plugins.pri
++++ b/src/shared/qbs/src/plugins/plugins.pri
+@@ -19,5 +19,5 @@ include(../library_dirname.pri)
+     installPrefix = $${QBS_PLUGINS_INSTALL_DIR}
  else: \
-     installPrefix = $${QBS_INSTALL_PREFIX}
--target.path = $${installPrefix}/lib/qbs/plugins
+     installPrefix = $${QBS_INSTALL_PREFIX}/$${QBS_LIBRARY_DIRNAME}
+-target.path = $${installPrefix}/qbs/plugins
 +target.path = $$QTC_PREFIX/$${IDE_LIBRARY_BASENAME}/qtcreator/plugins/qbs/
  INSTALLS += target

++++++ qt-creator-opensource-src-3.0.0.tar.gz -> qt-creator-opensource-src-3.2.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/qt-creator/qt-creator-opensource-src-3.0.0.tar.gz /work/SRC/openSUSE:Factory/.qt-creator.new/qt-creator-opensource-src-3.2.0.tar.gz differ: char 5, line 1

++++++ system-botan-lib.diff ++++++
--- /var/tmp/diff_new_pack.As4WaU/_old	2014-08-28 21:05:51.000000000 +0200
+++ /var/tmp/diff_new_pack.As4WaU/_new	2014-08-28 21:05:51.000000000 +0200
@@ -1,8 +1,8 @@
 diff --git a/src/libs/3rdparty/botan/botan.pri b/src/libs/3rdparty/botan/botan.pri
-index 7998aa9..6716043 100644
+index 6055e91..4b715c0 100644
 --- a/src/libs/3rdparty/botan/botan.pri
 +++ b/src/libs/3rdparty/botan/botan.pri
-@@ -1,56 +1,2 @@
+@@ -1,57 +1,2 @@
 -INCLUDEPATH *= $$PWD/..
 -HEADERS += $$PWD/botan.h
 -
@@ -40,6 +40,7 @@
 -        BOTAN_HAS_MUTEX_WIN32
 -
 -    win32-msvc* {
+-        QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHs
 -        QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250
 -        DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S _SCL_SECURE_NO_WARNINGS
 -    } else {
@@ -50,8 +51,8 @@
 -}
 -
 -unix:*-g++* {
--    QMAKE_CFLAGS += -fPIC -ansi -fpermissive -finline-functions -Wno-long-long
--    QMAKE_CXXFLAGS += -fPIC -ansi -fpermissive -finline-functions -Wno-long-long
+-    QMAKE_CFLAGS += -fPIC -fpermissive -finline-functions -Wno-long-long
+-    QMAKE_CXXFLAGS += -fPIC -fpermissive -finline-functions -Wno-long-long
 -    QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden # for ubuntu 7.04
 -}
 -
@@ -61,9 +62,8 @@
 -}
 +INCLUDEPATH *= /usr/include/botan-1.10
 +LIBS *= -lbotan-1.10
-\ No newline at end of file
 diff --git a/src/libs/ssh/sshcryptofacility.cpp b/src/libs/ssh/sshcryptofacility.cpp
-index 24fd747..2085f5c 100644
+index 19a6282..3a888ee 100644
 --- a/src/libs/ssh/sshcryptofacility.cpp
 +++ b/src/libs/ssh/sshcryptofacility.cpp
 @@ -37,6 +37,11 @@
@@ -79,7 +79,7 @@
  #include <QDebug>
  #include <QList>
 diff --git a/src/libs/ssh/sshcryptofacility_p.h b/src/libs/ssh/sshcryptofacility_p.h
-index 21056f7..a5ebb38 100644
+index fbf7a22..fcb62ee 100644
 --- a/src/libs/ssh/sshcryptofacility_p.h
 +++ b/src/libs/ssh/sshcryptofacility_p.h
 @@ -31,9 +31,11 @@
@@ -95,7 +95,7 @@
  namespace QSsh {
  namespace Internal {
 diff --git a/src/libs/ssh/sshkeyexchange.cpp b/src/libs/ssh/sshkeyexchange.cpp
-index b21f1ab..46135cb 100644
+index 700b268..7e34f9f 100644
 --- a/src/libs/ssh/sshkeyexchange.cpp
 +++ b/src/libs/ssh/sshkeyexchange.cpp
 @@ -36,6 +36,12 @@
@@ -112,7 +112,7 @@
  #ifdef CREATOR_SSH_DEBUG
  #include <iostream>
 diff --git a/src/libs/ssh/sshkeygenerator.cpp b/src/libs/ssh/sshkeygenerator.cpp
-index 395057a..b1cad7d 100644
+index 3a943bc..f5aea35 100644
 --- a/src/libs/ssh/sshkeygenerator.cpp
 +++ b/src/libs/ssh/sshkeygenerator.cpp
 @@ -35,6 +35,11 @@
@@ -128,7 +128,7 @@
  #include <QDateTime>
  #include <QInputDialog>
 diff --git a/src/libs/ssh/sshkeypasswordretriever_p.h b/src/libs/ssh/sshkeypasswordretriever_p.h
-index 9ffdc90..6cdd7d6 100644
+index 2f6953f..7570acc 100644
 --- a/src/libs/ssh/sshkeypasswordretriever_p.h
 +++ b/src/libs/ssh/sshkeypasswordretriever_p.h
 @@ -30,6 +30,7 @@

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)