[arch-commits] Commit in kdepim-runtime/kde-unstable (PKGBUILD qjson080.patch)

[Andrea Scarpino]

    Date: Sunday, November 25, 2012 @ 10:17:47
  Author: andrea
Revision: 171970

upgpkg: kdepim-runtime 4.9.80-2

qjson rebuild

Added:
  kdepim-runtime/kde-unstable/qjson080.patch
Modified:
  kdepim-runtime/kde-unstable/PKGBUILD

----------------+
 PKGBUILD       |   15 ++++++++++-----
 qjson080.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-25 15:04:14 UTC (rev 171969)
+++ PKGBUILD	2012-11-25 15:17:47 UTC (rev 171970)
@@ -4,7 +4,7 @@
 
 pkgname=kdepim-runtime
 pkgver=4.9.80
-pkgrel=1
+pkgrel=2
 pkgdesc='Extends the functionality of kdepim'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdepim-runtime'
@@ -12,11 +12,16 @@
 depends=('kdebase-runtime' 'kdepimlibs' 'libkgapi')
 makedepends=('cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('d5d47f830786c627e6fb3a336b5506ba525e7e17')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
+        'qjson080.patch')
+sha1sums=('d5d47f830786c627e6fb3a336b5506ba525e7e17'
+          '9160ac49b0b79e2c58d03c434a6d8c080a7d75e2')
 
 build() {
-    cd "${srcdir}"
+    cd ${pkgname}-${pkgver}
+    patch -p1 -i "${srcdir}"/qjson080.patch
+    cd ../
+
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \
@@ -26,6 +31,6 @@
 }
 
 package() {
-	cd "${srcdir}"/build
+	cd build
 	make DESTDIR="${pkgdir}" install
 }

Added: qjson080.patch
===================================================================
--- qjson080.patch	                        (rev 0)
+++ qjson080.patch	2012-11-25 15:17:47 UTC (rev 171970)
@@ -0,0 +1,37 @@
+From: Christophe Giboudeaux <cgiboudeaux at gmx.com>
+Date: Sat, 24 Nov 2012 20:53:56 +0000
+Subject: Fix build with QJson >= 0.8.0
+X-Git-Url: http://quickgit.kde.org/?p=kdepim-runtime.git&a=commitdiff&h=ca06d09b6b78381bb152deb02c31ecb9d6a43210
+---
+Fix build with QJson >= 0.8.0
+---
+
+
+--- a/resources/google/calendar/CMakeLists.txt
++++ b/resources/google/calendar/CMakeLists.txt
+@@ -1,4 +1,9 @@
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
++
++# QJson 0.8.0 is BIC
++if(QJSON_VERSION VERSION_GREATER 0.7.1)
++  add_definitions(-DUSE_QJSON_0_8)
++endif()
+ 
+ set(calendarresource_SRCS
+   calendareditor.cpp
+
+--- a/resources/google/calendar/defaultreminderattribute.cpp
++++ b/resources/google/calendar/defaultreminderattribute.cpp
+@@ -79,7 +79,11 @@
+   }
+ 
+   QJson::Serializer serializer;
++  #if !defined( USE_QJSON_0_8 )
+   return serializer.serialize( list );
++  #else
++  return serializer.serialize( list, 0 );
++  #endif
+ }
+ 
+ Alarm::List DefaultReminderAttribute::alarms( Incidence *incidence ) const
+