Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at 2013-02-14 21:02:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepimlibs4 (Old) and /work/SRC/openSUSE:Factory/.kdepimlibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepimlibs4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepimlibs4/kdepimlibs4.changes 2013-02-04 20:32:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdepimlibs4.new/kdepimlibs4.changes 2013-02-14 21:02:51.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 14 10:15:44 UTC 2013 - [email protected] + +- Add fix_akonadi_firstrun.diff: + * fix Akonadi Firstrun (bnc#803200, kde#315115) + +------------------------------------------------------------------- New: ---- fix_akonadi_firstrun.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.AuBJPs/_old 2013-02-14 21:02:53.000000000 +0100 +++ /var/tmp/diff_new_pack.AuBJPs/_new 2013-02-14 21:02:53.000000000 +0100 @@ -25,6 +25,8 @@ Url: http://www.kde.org Source0: kdepimlibs-%{version}.tar.xz Patch1: disable-pth-build.diff +# PATCH-FIX-UPSTREAM fix_akonadi_firstrun.diff fix Akonadi Firstrun [bnc#803200, kde#315115] +Patch2: fix_akonadi_firstrun.diff BuildRequires: boost-devel BuildRequires: cyrus-sasl-devel BuildRequires: fdupes @@ -58,6 +60,7 @@ %prep %setup -q -n kdepimlibs-%{version} %patch1 +%patch2 -p1 %build %cmake_kde4 -d build -- -DKDE4_ENABLE_FINAL=1 ++++++ fix_akonadi_firstrun.diff ++++++ commit 2239fb22ea1bb59fced36f2807ec257cd29c7fa9 Author: Montel Laurent <[email protected]> Date: Thu Feb 14 11:05:47 2013 +0100 Fix Bug 315115 - Akonadi Firstrun doesn't work Apply patch from Wolfgang Bauer Thanks a lot. BUG: 315115 FIXED-IN: 4.10.1 CCMAIL: [email protected] diff --git a/akonadi/firstrun.cpp b/akonadi/firstrun.cpp index 9d93f0d..2757fec 100644 --- a/akonadi/firstrun.cpp +++ b/akonadi/firstrun.cpp @@ -52,7 +52,7 @@ Firstrun::Firstrun( QObject *parent ) { //The code in firstrun is not safe in multi-instance mode Q_ASSERT( !ServerManager::hasInstanceIdentifier() ); - if ( !ServerManager::hasInstanceIdentifier() ) { + if ( ServerManager::hasInstanceIdentifier() ) { deleteLater(); return; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
