Hello community, here is the log from the commit of package qt-creator for openSUSE:Factory checked in at 2013-03-23 07:41:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt-creator (Old) and /work/SRC/openSUSE:Factory/.qt-creator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt-creator", Maintainer is "DMueller@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/qt-creator/qt-creator.changes 2013-02-01 16:02:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qt-creator.new/qt-creator.changes 2013-03-23 07:41:17.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Mar 21 20:00:00 UTC 2013 - stephan.binner@basyskom.com + +- Update to 2.7 + * better support for C++11 + * Qt Quick Designer works with Qt Quick 2 (if built against Qt 5) + * Improved BlackBerry support + * Experimental support for QBS build tool + See http://qt.gitorious.org/qt-creator/qt-creator/blobs/2.7/dist/changes-2.7.0 + for the complete changelog +- Remove unneeded revert-6f7ce3f4.diff + +------------------------------------------------------------------- Old: ---- qt-creator-2.6.2-src.tar.gz revert-6f7ce3f4.diff New: ---- qt-creator-2.7.0-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt-creator.spec ++++++ --- /var/tmp/diff_new_pack.vbocPw/_old 2013-03-23 07:41:20.000000000 +0100 +++ /var/tmp/diff_new_pack.vbocPw/_new 2013-03-23 07:41:20.000000000 +0100 @@ -17,18 +17,17 @@ Name: qt-creator -Version: 2.6.2 +Version: 2.7.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.6.2 +%define rversion 2.7.0 Source: http://releases.qt-project.org/qtcreator/%{rversion}/%{name}-%{rversion}-src.tar.gz Source1: qtcreator.desktop Patch1: system-botan-lib.diff Patch2: hardcoded-runpath.diff -Patch3: revert-6f7ce3f4.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # depends on private headers and therefore needs the exact Qt version %requires_eq libqt4-x11 @@ -67,7 +66,6 @@ %patch1 -p1 %endif %patch2 -%patch3 -p1 -R %build %if "%{_lib}"=="lib64" ++++++ qt-creator-2.6.2-src.tar.gz -> qt-creator-2.7.0-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/qt-creator/qt-creator-2.6.2-src.tar.gz /work/SRC/openSUSE:Factory/.qt-creator.new/qt-creator-2.7.0-src.tar.gz differ: char 5, line 1 ++++++ system-botan-lib.diff ++++++ --- /var/tmp/diff_new_pack.vbocPw/_old 2013-03-23 07:41:20.000000000 +0100 +++ /var/tmp/diff_new_pack.vbocPw/_new 2013-03-23 07:41:20.000000000 +0100 @@ -1,10 +1,15 @@ -diff --git a/src/libs/3rdparty/botan/botan.pri b/src/libs/3rdparty/botan/botan.pri -index 1088c99..4b715c0 100644 ---- a/src/libs/3rdparty/botan/botan.pri -+++ b/src/libs/3rdparty/botan/botan.pri -@@ -1,46 +1,2 @@ +--- 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 +@@ -1,56 +1,2 @@ -INCLUDEPATH *= $$PWD/.. -HEADERS += $$PWD/botan.h +- +-equals(USE_SYSTEM_BOTAN, 1) { +- DEFINES += USE_SYSTEM_BOTAN +- CONFIG += link_pkgconfig +- PKGCONFIG += botan-1.10 +-} else { +- -SOURCES += $$PWD/botan.cpp - -CONFIG += exceptions @@ -23,6 +28,8 @@ -*clang*:DEFINES += BOTAN_BUILD_COMPILER_IS_CLANG -*icc*:DEFINES += BOTAN_BUILD_COMPILER_IS_INTEL - +-CONFIG(x86_64):DEFINES += BOTAN_TARGET_ARCH_IS_X86_64 +- -win32 { - DEFINES += BOTAN_TARGET_OS_IS_WINDOWS \ - BOTAN_TARGET_OS_HAS_LOADLIBRARY BOTAN_TARGET_OS_HAS_WIN32_GET_SYSTEMTIME \ @@ -49,6 +56,7 @@ -linux*|freebsd* { - LIBS += -lrt -} +-} +INCLUDEPATH *= /usr/include/botan-1.10 +LIBS *= -lbotan-1.10 diff --git a/src/libs/ssh/sshcryptofacility.cpp b/src/libs/ssh/sshcryptofacility.cpp -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org