Hello community, here is the log from the commit of package soprano for openSUSE:Factory checked in at 2013-06-14 15:48:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/soprano (Old) and /work/SRC/openSUSE:Factory/.soprano.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "soprano" Changes: -------- --- /work/SRC/openSUSE:Factory/soprano/soprano-backend-sesame.changes 2013-05-16 18:15:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.soprano.new/soprano-backend-sesame.changes 2013-06-14 15:48:35.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Jun 13 01:15:33 UTC 2013 - hrvoje.sen...@gmail.com + +- Update to 2.9.2 + * Fix a crash in ServerCore on shutdown + * Do no require X11 - not needed for compilation + * Generate tag file for API docs +- Drop add-a-stop-method-which-closes-all-servers.patch, fix is + included in this release + +------------------------------------------------------------------- soprano-backend-virtuoso.changes: same change soprano.changes: same change Old: ---- add-a-stop-method-which-closes-all-servers.patch soprano-2.9.1.tar.bz2 New: ---- soprano-2.9.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ soprano-backend-sesame.spec ++++++ --- /var/tmp/diff_new_pack.xVOXkX/_old 2013-06-14 15:48:35.000000000 +0200 +++ /var/tmp/diff_new_pack.xVOXkX/_new 2013-06-14 15:48:35.000000000 +0200 @@ -22,14 +22,11 @@ Group: System/Libraries # COMMON1-BEGIN # COMMON1-BEGIN -Version: 2.9.1 +Version: 2.9.2 Release: 0 Url: http://soprano.sourceforge.net/ Source0: http://downloads.sourceforge.net/soprano/soprano-%{version}.tar.bz2 Source100: baselibs.conf -# PATCH-FIX-UPSTREAM add-a-stop-method-which-closes-all-servers.patch -- We are reverting this patch, this makes soprano -# incompatible with KDE 4.10.x, for details see http://mail.kde.org/pipermail/nepomuk/2013-May/004335.html -Patch0: add-a-stop-method-which-closes-all-servers.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: kde4-filesystem @@ -57,7 +54,6 @@ # COMMON2-BEGIN # COMMON2-BEGIN %setup -q -n soprano-%{version} -%patch0 -Rp1 # COMMON2-END # COMMON2-END soprano-backend-virtuoso.spec: same change ++++++ soprano.spec ++++++ --- /var/tmp/diff_new_pack.xVOXkX/_old 2013-06-14 15:48:35.000000000 +0200 +++ /var/tmp/diff_new_pack.xVOXkX/_new 2013-06-14 15:48:35.000000000 +0200 @@ -21,14 +21,11 @@ License: LGPL-2.1+ and GPL-2.0+ Group: System/Libraries # COMMON1-BEGIN -Version: 2.9.1 +Version: 2.9.2 Release: 0 Url: http://soprano.sourceforge.net/ Source0: http://downloads.sourceforge.net/soprano/soprano-%{version}.tar.bz2 Source100: baselibs.conf -# PATCH-FIX-UPSTREAM add-a-stop-method-which-closes-all-servers.patch -- We are reverting this patch, this makes soprano -# incompatible with KDE 4.10.x, for details see http://mail.kde.org/pipermail/nepomuk/2013-May/004335.html -Patch0: add-a-stop-method-which-closes-all-servers.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: kde4-filesystem @@ -56,7 +53,6 @@ %prep # COMMON2-BEGIN %setup -q -n soprano-%{version} -%patch0 -Rp1 # COMMON2-END %package backend-redland ++++++ soprano-2.9.1.tar.bz2 -> soprano-2.9.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.9.1/CMakeLists.txt new/soprano-2.9.2/CMakeLists.txt --- old/soprano-2.9.1/CMakeLists.txt 2013-05-02 11:32:15.000000000 +0200 +++ new/soprano-2.9.2/CMakeLists.txt 2013-05-10 18:42:16.000000000 +0200 @@ -14,7 +14,7 @@ ################## Soprano version ################################ set(CMAKE_SOPRANO_VERSION_MAJOR 2) set(CMAKE_SOPRANO_VERSION_MINOR 9) -set(CMAKE_SOPRANO_VERSION_RELEASE 1) +set(CMAKE_SOPRANO_VERSION_RELEASE 2) set(CMAKE_SOPRANO_VERSION_STRING "${CMAKE_SOPRANO_VERSION_MAJOR}.${CMAKE_SOPRANO_VERSION_MINOR}.${CMAKE_SOPRANO_VERSION_RELEASE}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.9.1/ChangeLog new/soprano-2.9.2/ChangeLog --- old/soprano-2.9.1/ChangeLog 2013-05-02 11:32:15.000000000 +0200 +++ new/soprano-2.9.2/ChangeLog 2013-05-10 18:42:16.000000000 +0200 @@ -1,3 +1,8 @@ +2.9.2 + * Fix a crash in ServerCore on shutdown + * Do no require X11 - not needed for compilation + * Generate tag file for API docs + 2.9.1 * Faster streaming for datetime literals * Add a stop method in the LocalServer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.9.1/Doxyfile.cmake new/soprano-2.9.2/Doxyfile.cmake --- old/soprano-2.9.1/Doxyfile.cmake 2013-05-02 11:32:15.000000000 +0200 +++ new/soprano-2.9.2/Doxyfile.cmake 2013-05-10 18:42:16.000000000 +0200 @@ -239,7 +239,7 @@ # Configuration::additions related to external references #--------------------------------------------------------------------------- TAGFILES = ${soprano_SOURCE_DIR}/qt4.tag=${QTDOCS} -GENERATE_TAGFILE = +GENERATE_TAGFILE = docs/soprano.tag ALLEXTERNALS = NO EXTERNAL_GROUPS = YES PERL_PATH = /usr/bin/perl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.9.1/cmake/modules/FindQt4.cmake new/soprano-2.9.2/cmake/modules/FindQt4.cmake --- old/soprano-2.9.1/cmake/modules/FindQt4.cmake 2013-05-02 11:32:15.000000000 +0200 +++ new/soprano-2.9.2/cmake/modules/FindQt4.cmake 2013-05-10 18:42:16.000000000 +0200 @@ -1211,7 +1211,7 @@ IF(UNIX) # on OS X X11 may not be required IF (Q_WS_X11) - FIND_PACKAGE(X11 REQUIRED) + FIND_PACKAGE(X11) ENDIF (Q_WS_X11) FIND_PACKAGE(Threads) SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.9.1/server/servercore.cpp new/soprano-2.9.2/server/servercore.cpp --- old/soprano-2.9.1/server/servercore.cpp 2013-05-02 11:32:15.000000000 +0200 +++ new/soprano-2.9.2/server/servercore.cpp 2013-05-10 18:42:16.000000000 +0200 @@ -73,7 +73,10 @@ #ifdef BUILD_DBUS_SUPPORT delete d->dbusController; #endif - qDeleteAll( d->connections ); + // We avoid using qDeleteAll because d->connections is modified by each delete operation + foreach(const Soprano::Server::ServerConnection* con, d->connections) { + delete con; + } qDeleteAll( d->models ); delete d->modelPool; delete d; @@ -181,7 +184,11 @@ void Soprano::Server::ServerCore::stop() { - qDeleteAll( d->connections ); + qDebug() << "Stopping and deleting"; + // We avoid using qDeleteAll because d->connections is modified by each delete operation + foreach(const Soprano::Server::ServerConnection* con, d->connections) { + delete con; + } qDeleteAll( d->models ); delete d->tcpServer; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org