[arch-commits] Commit in kdepim/trunk (PKGBUILD fix-build.patch)

[Andrea Scarpino]

    Date: Sunday, November 25, 2012 @ 11:14:23
  Author: andrea
Revision: 171976

Use the upstream patch to fix the build with boost

Modified:
  kdepim/trunk/PKGBUILD
  kdepim/trunk/fix-build.patch

-----------------+
 PKGBUILD        |    2 +-
 fix-build.patch |   37 +++++++++++++++++++++++++++----------
 2 files changed, 28 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-25 15:39:21 UTC (rev 171975)
+++ PKGBUILD	2012-11-25 16:14:23 UTC (rev 171976)
@@ -31,7 +31,7 @@
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'fix-build.patch')
 sha1sums=('5f0786a85db599a7b566a5d02d19c55222a64bcc'
-          '974056ad2c3a00b33a8ac9403b369ab636000832')
+          '76b687062bfe10f3da6e1f7b7c7572f16862a6f4')
 
 build() {
     cd ${pkgbase}-${pkgver}

Modified: fix-build.patch
===================================================================
--- fix-build.patch	2012-11-25 15:39:21 UTC (rev 171975)
+++ fix-build.patch	2012-11-25 16:14:23 UTC (rev 171976)
@@ -1,11 +1,28 @@
---- kdepim-4.9.0/kleopatra/CMakeLists.txt~	2012-07-30 08:06:15.031181647 +0000
-+++ kdepim-4.9.0/kleopatra/CMakeLists.txt	2012-07-30 08:07:13.594082584 +0000
-@@ -365,7 +365,7 @@
- endif(KDEPIM_MOBILE_UI)
+From: Sergio Martins <iamsergio at gmail.com>
+Date: Sun, 25 Nov 2012 15:45:22 +0000
+Subject: Fix build with boost >= 1.48
+X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=e463ffacbaa4d722fe3b62039f2ad3560659f99a
+---
+Fix build with boost >= 1.48
+
+For Qt 4.8.4 we might have a fix upstream.
+
+QTBUG-22829
+BUG: 304111
+---
+
+
+--- a/kleopatra/models/keylistmodel.cpp
++++ b/kleopatra/models/keylistmodel.cpp
+@@ -61,7 +61,10 @@
+ #define BOOST_ALL_NO_LIB
+ #endif
+ #include <boost/graph/adjacency_list.hpp>
++
++#ifndef Q_MOC_RUN // QTBUG-22829
+ #include <boost/graph/topological_sort.hpp>
++#endif
  
- add_definitions ( -DKDE_DEFAULT_DEBUG_AREA=5151 )
--
-+add_definitions ( -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED )
- 
- kde4_add_app_icon(_kleopatra_mainwindow_SRCS "hi*-app-kleopatra.png")
- kde4_add_executable(kleopatra_bin ${_kleopatra_SRCS} ${_kleopatra_mainwindow_SRCS} ${_kleopatra_uiserver_SRCS} ${_kleopatra_libkdepim_SRCS} )
+ #include <algorithm>
+ #include <vector>
+