Date: Sunday, December 2, 2012 @ 02:47:23 Author: andrea Revision: 172279
KDE 4.9.4 Modified: kdepim/trunk/PKGBUILD Deleted: kdepim/trunk/fix-build.patch -----------------+ PKGBUILD | 12 +++--------- fix-build.patch | 28 ---------------------------- 2 files changed, 3 insertions(+), 37 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-12-02 07:47:19 UTC (rev 172278) +++ PKGBUILD 2012-12-02 07:47:23 UTC (rev 172279) @@ -20,7 +20,7 @@ 'kdepim-ktimetracker' 'kdepim-ktnef' 'kdepim-libkdepim') -pkgver=4.9.3 +pkgver=4.9.4 pkgrel=1 arch=('i686' 'x86_64') url='http://pim.kde.org' @@ -28,16 +28,10 @@ groups=('kde' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'fix-build.patch') -sha1sums=('5f0786a85db599a7b566a5d02d19c55222a64bcc' - '76b687062bfe10f3da6e1f7b7c7572f16862a6f4') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") +sha1sums=('f383306430705ff2af14518b9be90448bf857398') build() { - cd ${pkgbase}-${pkgver} - patch -p1 -i "${srcdir}"/fix-build.patch - cd .. - mkdir build cd build cmake ../${pkgbase}-${pkgver} \ Deleted: fix-build.patch =================================================================== --- fix-build.patch 2012-12-02 07:47:19 UTC (rev 172278) +++ fix-build.patch 2012-12-02 07:47:23 UTC (rev 172279) @@ -1,28 +0,0 @@ -From: Sergio Martins <iamser...@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 - - #include <algorithm> - #include <vector> -