[arch-commits] Commit in kdepim-runtime (11 files)
Andrea Scarpino
andrea at archlinux.org
Sun Nov 25 15:18:25 UTC 2012
Date: Sunday, November 25, 2012 @ 10:18:24
Author: andrea
Revision: 171971
archrelease: copy kde-unstable to kde-unstable-i686, kde-unstable-x86_64
Added:
kdepim-runtime/repos/kde-unstable-i686/PKGBUILD
(from rev 171970, kdepim-runtime/kde-unstable/PKGBUILD)
kdepim-runtime/repos/kde-unstable-i686/kdepim-runtime.install
(from rev 171970, kdepim-runtime/kde-unstable/kdepim-runtime.install)
kdepim-runtime/repos/kde-unstable-i686/qjson080.patch
(from rev 171970, kdepim-runtime/kde-unstable/qjson080.patch)
kdepim-runtime/repos/kde-unstable-x86_64/PKGBUILD
(from rev 171970, kdepim-runtime/kde-unstable/PKGBUILD)
kdepim-runtime/repos/kde-unstable-x86_64/kdepim-runtime.install
(from rev 171970, kdepim-runtime/kde-unstable/kdepim-runtime.install)
kdepim-runtime/repos/kde-unstable-x86_64/qjson080.patch
(from rev 171970, kdepim-runtime/kde-unstable/qjson080.patch)
Modified:
kdepim-runtime/trunk/PKGBUILD
Deleted:
kdepim-runtime/repos/kde-unstable-i686/PKGBUILD
kdepim-runtime/repos/kde-unstable-i686/kdepim-runtime.install
kdepim-runtime/repos/kde-unstable-x86_64/PKGBUILD
kdepim-runtime/repos/kde-unstable-x86_64/kdepim-runtime.install
--------------------------------------------------+
repos/kde-unstable-i686/PKGBUILD | 67 +++++++++++----------
repos/kde-unstable-i686/kdepim-runtime.install | 26 ++++----
repos/kde-unstable-i686/qjson080.patch | 37 +++++++++++
repos/kde-unstable-x86_64/PKGBUILD | 67 +++++++++++----------
repos/kde-unstable-x86_64/kdepim-runtime.install | 26 ++++----
repos/kde-unstable-x86_64/qjson080.patch | 37 +++++++++++
trunk/PKGBUILD | 2
7 files changed, 173 insertions(+), 89 deletions(-)
Deleted: repos/kde-unstable-i686/PKGBUILD
===================================================================
--- repos/kde-unstable-i686/PKGBUILD 2012-11-25 15:17:47 UTC (rev 171970)
+++ repos/kde-unstable-i686/PKGBUILD 2012-11-25 15:18:24 UTC (rev 171971)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdepim-runtime
-pkgver=4.9.80
-pkgrel=1
-pkgdesc='Extends the functionality of kdepim'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kdepim-runtime'
-license=('GPL' 'LGPL' 'FDL')
-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')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
Copied: kdepim-runtime/repos/kde-unstable-i686/PKGBUILD (from rev 171970, kdepim-runtime/kde-unstable/PKGBUILD)
===================================================================
--- repos/kde-unstable-i686/PKGBUILD (rev 0)
+++ repos/kde-unstable-i686/PKGBUILD 2012-11-25 15:18:24 UTC (rev 171971)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdepim-runtime
+pkgver=4.9.80
+pkgrel=2
+pkgdesc='Extends the functionality of kdepim'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/kdepim-runtime'
+license=('GPL' 'LGPL' 'FDL')
+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')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/qjson080.patch
+ cd ../
+
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: repos/kde-unstable-i686/kdepim-runtime.install
===================================================================
--- repos/kde-unstable-i686/kdepim-runtime.install 2012-11-25 15:17:47 UTC (rev 171970)
+++ repos/kde-unstable-i686/kdepim-runtime.install 2012-11-25 15:18:24 UTC (rev 171971)
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdepim-runtime/repos/kde-unstable-i686/kdepim-runtime.install (from rev 171970, kdepim-runtime/kde-unstable/kdepim-runtime.install)
===================================================================
--- repos/kde-unstable-i686/kdepim-runtime.install (rev 0)
+++ repos/kde-unstable-i686/kdepim-runtime.install 2012-11-25 15:18:24 UTC (rev 171971)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kdepim-runtime/repos/kde-unstable-i686/qjson080.patch (from rev 171970, kdepim-runtime/kde-unstable/qjson080.patch)
===================================================================
--- repos/kde-unstable-i686/qjson080.patch (rev 0)
+++ repos/kde-unstable-i686/qjson080.patch 2012-11-25 15:18:24 UTC (rev 171971)
@@ -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
+
Deleted: repos/kde-unstable-x86_64/PKGBUILD
===================================================================
--- repos/kde-unstable-x86_64/PKGBUILD 2012-11-25 15:17:47 UTC (rev 171970)
+++ repos/kde-unstable-x86_64/PKGBUILD 2012-11-25 15:18:24 UTC (rev 171971)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdepim-runtime
-pkgver=4.9.80
-pkgrel=1
-pkgdesc='Extends the functionality of kdepim'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kdepim-runtime'
-license=('GPL' 'LGPL' 'FDL')
-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')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
Copied: kdepim-runtime/repos/kde-unstable-x86_64/PKGBUILD (from rev 171970, kdepim-runtime/kde-unstable/PKGBUILD)
===================================================================
--- repos/kde-unstable-x86_64/PKGBUILD (rev 0)
+++ repos/kde-unstable-x86_64/PKGBUILD 2012-11-25 15:18:24 UTC (rev 171971)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdepim-runtime
+pkgver=4.9.80
+pkgrel=2
+pkgdesc='Extends the functionality of kdepim'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/kdepim-runtime'
+license=('GPL' 'LGPL' 'FDL')
+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')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/qjson080.patch
+ cd ../
+
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: repos/kde-unstable-x86_64/kdepim-runtime.install
===================================================================
--- repos/kde-unstable-x86_64/kdepim-runtime.install 2012-11-25 15:17:47 UTC (rev 171970)
+++ repos/kde-unstable-x86_64/kdepim-runtime.install 2012-11-25 15:18:24 UTC (rev 171971)
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdepim-runtime/repos/kde-unstable-x86_64/kdepim-runtime.install (from rev 171970, kdepim-runtime/kde-unstable/kdepim-runtime.install)
===================================================================
--- repos/kde-unstable-x86_64/kdepim-runtime.install (rev 0)
+++ repos/kde-unstable-x86_64/kdepim-runtime.install 2012-11-25 15:18:24 UTC (rev 171971)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kdepim-runtime/repos/kde-unstable-x86_64/qjson080.patch (from rev 171970, kdepim-runtime/kde-unstable/qjson080.patch)
===================================================================
--- repos/kde-unstable-x86_64/qjson080.patch (rev 0)
+++ repos/kde-unstable-x86_64/qjson080.patch 2012-11-25 15:18:24 UTC (rev 171971)
@@ -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
+
Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD 2012-11-25 15:17:47 UTC (rev 171970)
+++ trunk/PKGBUILD 2012-11-25 15:18:24 UTC (rev 171971)
@@ -4,7 +4,7 @@
pkgname=kdepim-runtime
pkgver=4.9.3
-pkgrel=1
+pkgrel=2
pkgdesc='Extends the functionality of kdepim'
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kdepim-runtime'
More information about the arch-commits
mailing list