Hello community, here is the log from the commit of package kdepim4 for openSUSE:Factory checked in at 2013-04-29 09:54:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim4 (Old) and /work/SRC/openSUSE:Factory/.kdepim4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim4/kdepim4.changes 2013-04-18 10:22:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim4.new/kdepim4.changes 2013-04-29 09:54:08.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Apr 20 15:52:18 UTC 2013 - [email protected] + +- Added 0004-Fix-Bug-316256.patch, fixes build with newer boost + (kde#316256) + +------------------------------------------------------------------- New: ---- 0004-Fix-Bug-316256.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ --- /var/tmp/diff_new_pack.nsUkhk/_old 2013-04-29 09:54:11.000000000 +0200 +++ /var/tmp/diff_new_pack.nsUkhk/_new 2013-04-29 09:54:11.000000000 +0200 @@ -34,6 +34,8 @@ Patch5: 0002-Use-the-index-we-just-calculated-a-bit-faster.patch # PATCH-FIX-UPSTREAM 0003-Fix-kmail-autocompletion-from-akonadi.patch Patch6: 0003-Fix-kmail-autocompletion-from-akonadi.patch +# PATCH-FIX-UPSTREAM 0004-Fix-Bug-316256.patch -- Fixes build with newer boost (kde#316256) +Patch7: 0004-Fix-Bug-316256.patch BuildRequires: fdupes BuildRequires: gpgme-devel BuildRequires: grantlee-devel @@ -74,6 +76,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build %ifarch ppc64 ++++++ 0004-Fix-Bug-316256.patch ++++++ >From 2573a6678d3415d7de8024a417d8f2e92b8c7611 Mon Sep 17 00:00:00 2001 From: Montel Laurent <[email protected]> Date: Wed, 3 Apr 2013 08:01:08 +0200 Subject: [PATCH 1/1] Fix Bug 316256 - Kleopatra in KDEPIM 4.10.1 fails to build BUG: 316256 FIXED-IN: 4.10.3 Apply patch from Sven-Hendrik Haase It compiles here, and for him. So I hope that it will fix this bug. --- kleopatra/models/keylistmodel.cpp | 2 +- kleopatra/uiserver/assuanserverconnection.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/kleopatra/models/keylistmodel.cpp b/kleopatra/models/keylistmodel.cpp index 26c65c7..4ade983 100644 --- a/kleopatra/models/keylistmodel.cpp +++ b/kleopatra/models/keylistmodel.cpp @@ -55,13 +55,13 @@ #include <gpgme++/key.h> -#include <boost/bind.hpp> #ifdef _WIN32_WCE #define BOOST_ALL_NO_LIB #endif #ifndef Q_MOC_RUN // QTBUG-22829 +#include <boost/bind.hpp> #include <boost/graph/topological_sort.hpp> #include <boost/graph/adjacency_list.hpp> #endif diff --git a/kleopatra/uiserver/assuanserverconnection.cpp b/kleopatra/uiserver/assuanserverconnection.cpp index d0580db..de43e21 100644 --- a/kleopatra/uiserver/assuanserverconnection.cpp +++ b/kleopatra/uiserver/assuanserverconnection.cpp @@ -78,6 +78,7 @@ #include <kleo-assuan.h> +#ifndef Q_MOC_RUN // QTBUG-22829 #include <boost/type_traits/remove_pointer.hpp> #ifndef _WIN32_WCE #include <boost/lexical_cast.hpp> @@ -85,6 +86,7 @@ #include <boost/bind.hpp> #include <boost/mem_fn.hpp> #include <boost/mpl/if.hpp> +#endif #include <vector> #include <map> -- 1.8.2.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
