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

[Andrea Scarpino]

    Date: Sunday, December 2, 2012 @ 06:18:38
  Author: andrea
Revision: 172311

KDE 4.10 beta2

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-02 11:18:34 UTC (rev 172310)
+++ PKGBUILD	2012-12-02 11:18:38 UTC (rev 172311)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdepim-runtime
-pkgver=4.9.80
-pkgrel=2
+pkgver=4.9.90
+pkgrel=1
 pkgdesc='Extends the functionality of kdepim'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdepim-runtime'
@@ -12,16 +12,10 @@
 depends=('kdebase-runtime' 'kdepimlibs' 'libkgapi')
 makedepends=('cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
-        'qjson080.patch')
-sha1sums=('d5d47f830786c627e6fb3a336b5506ba525e7e17'
-          '9160ac49b0b79e2c58d03c434a6d8c080a7d75e2')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('267b889794dc07dd4374d51d043fd47572b71adc')
 
 build() {
-    cd ${pkgname}-${pkgver}
-    patch -p1 -i "${srcdir}"/qjson080.patch
-    cd ../
-
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \

Deleted: qjson080.patch
===================================================================
--- qjson080.patch	2012-12-02 11:18:34 UTC (rev 172310)
+++ qjson080.patch	2012-12-02 11:18:38 UTC (rev 172311)
@@ -1,37 +0,0 @@
-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
-