Hello community, here is the log from the commit of package qt-creator for openSUSE:Factory checked in at 2013-12-13 12:00:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-09-11 13:08:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qt-creator.new/qt-creator.changes 2013-12-13 12:00:36.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Dec 12 14:59:17 UTC 2013 - [email protected] + +- Update to 3.0.0 + See http://qt.gitorious.org/qt-creator/qt-creator/blobs/3.0/dist/changes-3.0.0 + for the complete changelog + +------------------------------------------------------------------- Old: ---- qt-creator-2.8.1-src.tar.gz New: ---- qt-creator-opensource-src-3.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt-creator.spec ++++++ --- /var/tmp/diff_new_pack.anjOCL/_old 2013-12-13 12:00:37.000000000 +0100 +++ /var/tmp/diff_new_pack.anjOCL/_new 2013-12-13 12:00:37.000000000 +0100 @@ -17,14 +17,14 @@ Name: qt-creator -Version: 2.8.1 +Version: 3.0.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 2.8.1 -Source: http://download.qt-project.org/official_releases/qtcreator/2.8/%{rversion}/%{name}-%{rversion}-src.tar.gz +%define rversion 3.0.0 +Source: http://download.qt-project.org/official_releases/qtcreator/3.0/%{rversion}/%{name}-opensource-src-%{rversion}.tar.gz Source1: qtcreator.desktop Patch1: system-botan-lib.diff Patch2: hardcoded-runpath.diff @@ -61,11 +61,11 @@ framework even faster and easier. %prep -%setup -q -n %{name}-%rversion-src +%setup -q -n %{name}-opensource-src-%{rversion} %if 0%{?suse_version} %patch1 -p1 %endif -%patch2 +%patch2 -p1 %patch3 -p1 %build ++++++ hardcoded-runpath.diff ++++++ --- /var/tmp/diff_new_pack.anjOCL/_old 2013-12-13 12:00:37.000000000 +0100 +++ /var/tmp/diff_new_pack.anjOCL/_new 2013-12-13 12:00:37.000000000 +0100 @@ -1,6 +1,8 @@ ---- src/qtcreatorplugin.pri.old 2012-10-23 12:37:09.532924177 +0200 -+++ src/qtcreatorplugin.pri 2012-10-23 12:37:19.843798022 +0200 -@@ -91,13 +91,7 @@ +diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri +index c243fa1..f210a93 100644 +--- a/src/qtcreatorplugin.pri ++++ b/src/qtcreatorplugin.pri +@@ -119,13 +119,7 @@ macx { QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../../,-rpath,@executable_path/../ } } else:linux-* { @@ -14,4 +16,4 @@ + QMAKE_RPATHDIR += /usr/$$IDE_LIBRARY_BASENAME/qtcreator } - # put .pro file directory in INCLUDEPATH + contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols ++++++ system-botan-lib.diff ++++++ --- /var/tmp/diff_new_pack.anjOCL/_old 2013-12-13 12:00:37.000000000 +0100 +++ /var/tmp/diff_new_pack.anjOCL/_new 2013-12-13 12:00:37.000000000 +0100 @@ -1,5 +1,7 @@ ---- a/src/libs/3rdparty/botan/botan.pri 2013/03/21 13:05:09 1.1 -+++ b/src/libs/3rdparty/botan/botan.pri 2013/03/21 13:05:26 +diff --git a/src/libs/3rdparty/botan/botan.pri b/src/libs/3rdparty/botan/botan.pri +index 7998aa9..6716043 100644 +--- a/src/libs/3rdparty/botan/botan.pri ++++ b/src/libs/3rdparty/botan/botan.pri @@ -1,56 +1,2 @@ -INCLUDEPATH *= $$PWD/.. -HEADERS += $$PWD/botan.h @@ -39,7 +41,7 @@ - - win32-msvc* { - QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250 -- DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S +- DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S _SCL_SECURE_NO_WARNINGS - } else { - QMAKE_CFLAGS += -fpermissive -finline-functions -Wno-long-long - QMAKE_CXXFLAGS += -fpermissive -finline-functions -Wno-long-long @@ -54,13 +56,14 @@ -} - -linux*|freebsd* { -- LIBS += -lrt +- LIBS += -lrt $$QMAKE_LIBS_DYNLOAD -} -} +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 1d6913e..323e7d9 100644 +index 24fd747..2085f5c 100644 --- a/src/libs/ssh/sshcryptofacility.cpp +++ b/src/libs/ssh/sshcryptofacility.cpp @@ -37,6 +37,11 @@ @@ -76,7 +79,7 @@ #include <QDebug> #include <QList> diff --git a/src/libs/ssh/sshcryptofacility_p.h b/src/libs/ssh/sshcryptofacility_p.h -index 5995294..a8963ea 100644 +index 21056f7..a5ebb38 100644 --- a/src/libs/ssh/sshcryptofacility_p.h +++ b/src/libs/ssh/sshcryptofacility_p.h @@ -31,9 +31,11 @@ @@ -92,7 +95,7 @@ namespace QSsh { namespace Internal { diff --git a/src/libs/ssh/sshkeyexchange.cpp b/src/libs/ssh/sshkeyexchange.cpp -index 6627ff9..a44c79c 100644 +index b21f1ab..46135cb 100644 --- a/src/libs/ssh/sshkeyexchange.cpp +++ b/src/libs/ssh/sshkeyexchange.cpp @@ -36,6 +36,12 @@ @@ -109,10 +112,10 @@ #ifdef CREATOR_SSH_DEBUG #include <iostream> diff --git a/src/libs/ssh/sshkeygenerator.cpp b/src/libs/ssh/sshkeygenerator.cpp -index e6aa967..598a9b7 100644 +index 395057a..b1cad7d 100644 --- a/src/libs/ssh/sshkeygenerator.cpp +++ b/src/libs/ssh/sshkeygenerator.cpp -@@ -34,6 +34,11 @@ +@@ -35,6 +35,11 @@ #include "sshpacket_p.h" #include <botan/botan.h> @@ -125,7 +128,7 @@ #include <QDateTime> #include <QInputDialog> diff --git a/src/libs/ssh/sshkeypasswordretriever_p.h b/src/libs/ssh/sshkeypasswordretriever_p.h -index cfb86e1..3971c4e 100644 +index 9ffdc90..6cdd7d6 100644 --- a/src/libs/ssh/sshkeypasswordretriever_p.h +++ b/src/libs/ssh/sshkeypasswordretriever_p.h @@ -30,6 +30,7 @@ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
