Date: Thursday, January 31, 2013 @ 15:46:26
Author: andrea
Revision: 176633
Merge kde-unstable into trunk
Added:
kdepim/trunk/
kdepim/trunk/PKGBUILD
(from rev 176489, kdepim/kde-unstable/PKGBUILD)
kdepim/trunk/boost152.patch
(from rev 176489, kdepim/kde-unstable/boost152.patch)
Deleted:
kdepim/trunk/
kdepim/trunk/PKGBUILD
----------------------+
PKGBUILD | 262 -----------------------------------------------
trunk/PKGBUILD | 268 +++++++++++++++++++++++++++++++++++++++++++++++++
trunk/boost152.patch | 13 ++
3 files changed, 281 insertions(+), 262 deletions(-)
Deleted: trunk/PKGBUILD
===================================================================
--- kde-unstable/PKGBUILD 2013-01-31 06:54:38 UTC (rev 176364)
+++ trunk/PKGBUILD 2013-01-31 14:46:26 UTC (rev 176633)
@@ -1,262 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <[email protected]>
-# Contributor: Pierre Schmitz <[email protected]>
-
-pkgbase=kdepim
-pkgname=('kdepim-akonadiconsole'
- 'kdepim-akregator'
- 'kdepim-blogilo'
- 'kdepim-console'
- 'kdepim-kaddressbook'
- 'kdepim-kalarm'
- 'kdepim-kjots'
- 'kdepim-kleopatra'
- 'kdepim-kmail'
- 'kdepim-knode'
- 'kdepim-knotes'
- 'kdepim-kontact'
- 'kdepim-korganizer'
- 'kdepim-kresources'
- 'kdepim-ktimetracker'
- 'kdepim-ktnef'
- 'kdepim-libkdepim')
-pkgver=4.9.98
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://pim.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdepim')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
- 'kde-agent' 'nepomuk-widgets')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz";)
-sha1sums=('06fecc555fee40ccc22fff54400d0b40e248e328')
-
-build() {
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDEPIM_BUILD_MOBILE=OFF
- make
-}
-
-package_kdepim-akonadiconsole() {
- pkgdesc='Akonadi Management and Debugging Console'
- depends=('kdepim-libkdepim' 'nepomuk-widgets')
- url='http://pim.kde.org'
- install='kdepim.install'
- cd "${srcdir}"/build/akonadiconsole
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-akregator() {
- pkgdesc='A Feed Reader for KDE'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/internet/akregator/";
- install='kdepim-akregator.install'
- cd "${srcdir}"/build/akregator
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/akregator
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/akregator
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-blogilo() {
- pkgdesc='A KDE Blogging Client'
- depends=('kdepim-runtime')
- url="http://kde.org/applications/internet/blogilo/";
- replaces=('blogilo')
- conflicts=('blogilo')
- install='kdepim.install'
- cd "${srcdir}"/build/blogilo
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/blogilo
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-console() {
- pkgdesc='Command line tool for accessing calendar files'
- depends=('kdepim-runtime')
- url='http://pim.kde.org'
- install='kdepim.install'
- cd "${srcdir}"/build/console
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kabcclient
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/konsolekalendar
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kaddressbook() {
- pkgdesc='Contact Manager'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/office/kaddressbook/";
- install='kdepim.install'
- cd "${srcdir}"/build/kaddressbook
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/kaddressbook
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/plugins/kaddressbook
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kalarm() {
- pkgdesc='Personal Alarm Scheduler'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/utilities/kalarm/";
- install='kdepim.install'
- cd "${srcdir}"/build/kalarm
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kalarm
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kjots() {
- pkgdesc='Note Taker'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/utilities/kjots/";
- install='kdepim.install'
- cd "${srcdir}"/build/kjots
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kjots
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/kjots
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kleopatra() {
- pkgdesc='Certificate Manager and Unified Crypto GUI'
- depends=('kdepim-libkdepim')
- install=kdepim-kleopatra.install
- url="http://kde.org/applications/utilities/kleopatra/";
- cd "${srcdir}"/build/kleopatra
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kleopatra
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kwatchgnupg
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kmail() {
- pkgdesc='Mail Client'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/internet/kmail/";
- install='kdepim-kmail.install'
- conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
- 'kdepim-mimelib' 'kdepim-plugins')
- replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
- 'kdepim-mimelib' 'kdepim-plugins')
- for i in kmail doc/kmail kmailcvt archivemailagent \
- importwizard ksendemail libksieve messagelist mailfilteragent \
- ontologies kontact/plugins/kmail; do
- cd "${srcdir}"/build/${i}
- make DESTDIR="${pkgdir}" install
- done
-}
-
-package_kdepim-knode() {
- pkgdesc='News Reader'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/internet/knode/";
- install='kdepim-knode.install'
- cd "${srcdir}"/build/knode
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/knode
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kioslave/news
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/knode
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-knotes() {
- pkgdesc='Popup Notes'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/utilities/knotes/";
- install='kdepim.install'
- cd "${srcdir}"/build/knotes
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/knotes
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/knotes
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kontact() {
- pkgdesc='Personal Information Manager'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/office/kontact/";
- install='kdepim.install'
- conflcits=('kdepim-kontactinterfaces')
- replaces=('kdepim-kontactinterfaces')
- for i in kontact/src doc/kontact kontact/plugins/summary \
- kontact/plugins/specialdates doc/kontact-admin; do
- cd "${srcdir}"/build/${i}
- make DESTDIR="${pkgdir}" install
- done
-}
-
-package_kdepim-korganizer() {
- pkgdesc='Calendar and Scheduling Program'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/office/korganizer";
- install='kdepim-korganizer.install'
- for i in korganizer doc/korganizer kontact/plugins/korganizer \
- calendarviews; do
- cd "${srcdir}"/build/${i}
- make DESTDIR="${pkgdir}" install
- done
-}
-
-package_kdepim-kresources() {
- pkgdesc='KDE PIM resources'
- depends=('kdepim-libkdepim')
- url='http://pim.kde.org'
- cd "${srcdir}"/build/kresources
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-ktimetracker() {
- pkgdesc='Personal Time Tracker'
- depends=('kdepim-kresources')
- url="http://kde.org/applications/utilities/ktimetracker/";
- install='kdepim.install'
- cd "${srcdir}"/build/ktimetracker
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/ktimetracker
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-ktnef() {
- pkgdesc='A viewer/extractor for TNEF files'
- depends=('kdebase-runtime' 'kdepimlibs')
- url="https://projects.kde.org/projects/kde/kdepim/ktnef";
- install=kdepim-ktnef.install
- cd "${srcdir}"/build/ktnef
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/ktnef
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-libkdepim() {
- pkgdesc='Library for KDE PIM'
- groups=()
- depends=('kde-agent' 'kdepim-runtime')
- url='http://pim.kde.org'
- conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
- 'kdepim-strigi-analyzer' 'kdepim-akonadi')
- replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
- 'kdepim-strigi-analyzer' 'kdepim-akonadi')
- for i in akonadi_next calendarsupport incidenceeditor-ng \
- kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
- mailcommon mailimporter messagecomposer messagecore messageviewer \
- icons strigi-analyzer templateparser plugins/messageviewer \
- plugins/ktexteditor pimcommon pimsettingexporter; do
- cd "${srcdir}"/build/${i}
- make DESTDIR="${pkgdir}" install
- done
-}
Copied: kdepim/trunk/PKGBUILD (from rev 176489, kdepim/kde-unstable/PKGBUILD)
===================================================================
--- trunk/PKGBUILD (rev 0)
+++ trunk/PKGBUILD 2013-01-31 14:46:26 UTC (rev 176633)
@@ -0,0 +1,268 @@
+# $Id$
+# Maintainer: Andrea Scarpino <[email protected]>
+# Contributor: Pierre Schmitz <[email protected]>
+
+pkgbase=kdepim
+pkgname=('kdepim-akonadiconsole'
+ 'kdepim-akregator'
+ 'kdepim-blogilo'
+ 'kdepim-console'
+ 'kdepim-kaddressbook'
+ 'kdepim-kalarm'
+ 'kdepim-kjots'
+ 'kdepim-kleopatra'
+ 'kdepim-kmail'
+ 'kdepim-knode'
+ 'kdepim-knotes'
+ 'kdepim-kontact'
+ 'kdepim-korganizer'
+ 'kdepim-kresources'
+ 'kdepim-ktimetracker'
+ 'kdepim-ktnef'
+ 'kdepim-libkdepim')
+pkgver=4.10.0
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://pim.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdepim')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
+ 'kde-agent' 'nepomuk-widgets')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz";
+ 'boost152.patch')
+sha1sums=('6074fcea53b10c3660c5cc9a00b65e777840fdc4'
+ '652de82dcc1c45de3123898ba46e1962bb0ed6d4')
+
+build() {
+ cd ${pkgbase}-${pkgver}
+ patch -p1 -i "${srcdir}"/boost152.patch
+ cd ../
+
+ mkdir build
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDEPIM_BUILD_MOBILE=OFF
+ make
+}
+
+package_kdepim-akonadiconsole() {
+ pkgdesc='Akonadi Management and Debugging Console'
+ depends=('kdepim-libkdepim' 'nepomuk-widgets')
+ url='http://pim.kde.org'
+ install='kdepim.install'
+ cd "${srcdir}"/build/akonadiconsole
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-akregator() {
+ pkgdesc='A Feed Reader for KDE'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/internet/akregator/";
+ install='kdepim-akregator.install'
+ cd "${srcdir}"/build/akregator
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/akregator
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/kontact/plugins/akregator
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-blogilo() {
+ pkgdesc='A KDE Blogging Client'
+ depends=('kdepim-runtime')
+ url="http://kde.org/applications/internet/blogilo/";
+ replaces=('blogilo')
+ conflicts=('blogilo')
+ install='kdepim.install'
+ cd "${srcdir}"/build/blogilo
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/blogilo
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-console() {
+ pkgdesc='Command line tool for accessing calendar files'
+ depends=('kdepim-runtime')
+ url='http://pim.kde.org'
+ install='kdepim.install'
+ cd "${srcdir}"/build/console
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/kabcclient
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/konsolekalendar
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kaddressbook() {
+ pkgdesc='Contact Manager'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/office/kaddressbook/";
+ install='kdepim.install'
+ cd "${srcdir}"/build/kaddressbook
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/kontact/plugins/kaddressbook
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/plugins/kaddressbook
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kalarm() {
+ pkgdesc='Personal Alarm Scheduler'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/utilities/kalarm/";
+ install='kdepim.install'
+ cd "${srcdir}"/build/kalarm
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/kalarm
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kjots() {
+ pkgdesc='Note Taker'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/utilities/kjots/";
+ install='kdepim.install'
+ cd "${srcdir}"/build/kjots
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/kjots
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/kontact/plugins/kjots
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kleopatra() {
+ pkgdesc='Certificate Manager and Unified Crypto GUI'
+ depends=('kdepim-libkdepim')
+ install=kdepim-kleopatra.install
+ url="http://kde.org/applications/utilities/kleopatra/";
+ cd "${srcdir}"/build/kleopatra
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/kleopatra
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/kwatchgnupg
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kmail() {
+ pkgdesc='Mail Client'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/internet/kmail/";
+ install='kdepim-kmail.install'
+ conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
+ 'kdepim-mimelib' 'kdepim-plugins')
+ replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
+ 'kdepim-mimelib' 'kdepim-plugins')
+ for i in kmail doc/kmail kmailcvt archivemailagent \
+ importwizard ksendemail libksieve messagelist mailfilteragent \
+ ontologies kontact/plugins/kmail; do
+ cd "${srcdir}"/build/${i}
+ make DESTDIR="${pkgdir}" install
+ done
+}
+
+package_kdepim-knode() {
+ pkgdesc='News Reader'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/internet/knode/";
+ install='kdepim-knode.install'
+ cd "${srcdir}"/build/knode
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/knode
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/kioslave/news
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/kontact/plugins/knode
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-knotes() {
+ pkgdesc='Popup Notes'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/utilities/knotes/";
+ install='kdepim.install'
+ cd "${srcdir}"/build/knotes
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/knotes
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/kontact/plugins/knotes
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kontact() {
+ pkgdesc='Personal Information Manager'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/office/kontact/";
+ install='kdepim.install'
+ conflcits=('kdepim-kontactinterfaces')
+ replaces=('kdepim-kontactinterfaces')
+ for i in kontact/src doc/kontact kontact/plugins/summary \
+ kontact/plugins/specialdates doc/kontact-admin; do
+ cd "${srcdir}"/build/${i}
+ make DESTDIR="${pkgdir}" install
+ done
+}
+
+package_kdepim-korganizer() {
+ pkgdesc='Calendar and Scheduling Program'
+ depends=('kdepim-libkdepim')
+ url="http://kde.org/applications/office/korganizer";
+ install='kdepim-korganizer.install'
+ for i in korganizer doc/korganizer kontact/plugins/korganizer \
+ calendarviews; do
+ cd "${srcdir}"/build/${i}
+ make DESTDIR="${pkgdir}" install
+ done
+}
+
+package_kdepim-kresources() {
+ pkgdesc='KDE PIM resources'
+ depends=('kdepim-libkdepim')
+ url='http://pim.kde.org'
+ cd "${srcdir}"/build/kresources
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-ktimetracker() {
+ pkgdesc='Personal Time Tracker'
+ depends=('kdepim-kresources')
+ url="http://kde.org/applications/utilities/ktimetracker/";
+ install='kdepim.install'
+ cd "${srcdir}"/build/ktimetracker
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/ktimetracker
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-ktnef() {
+ pkgdesc='A viewer/extractor for TNEF files'
+ depends=('kdebase-runtime' 'kdepimlibs')
+ url="https://projects.kde.org/projects/kde/kdepim/ktnef";
+ install=kdepim-ktnef.install
+ cd "${srcdir}"/build/ktnef
+ make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/build/doc/ktnef
+ make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-libkdepim() {
+ pkgdesc='Library for KDE PIM'
+ groups=()
+ depends=('kde-agent' 'kdepim-runtime')
+ url='http://pim.kde.org'
+ conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
+ 'kdepim-strigi-analyzer' 'kdepim-akonadi')
+ replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
+ 'kdepim-strigi-analyzer' 'kdepim-akonadi')
+ for i in akonadi_next calendarsupport incidenceeditor-ng \
+ kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
+ mailcommon mailimporter messagecomposer messagecore messageviewer \
+ icons strigi-analyzer templateparser plugins/messageviewer \
+ plugins/ktexteditor pimcommon pimsettingexporter; do
+ cd "${srcdir}"/build/${i}
+ make DESTDIR="${pkgdir}" install
+ done
+}
Copied: kdepim/trunk/boost152.patch (from rev 176489,
kdepim/kde-unstable/boost152.patch)
===================================================================
--- trunk/boost152.patch (rev 0)
+++ trunk/boost152.patch 2013-01-31 14:46:26 UTC (rev 176633)
@@ -0,0 +1,13 @@
+--- kdepim-4.10.0/kleopatra/models/keylistmodel.cpp~ 2013-01-31
09:40:34.270651208 +0000
++++ kdepim-4.10.0/kleopatra/models/keylistmodel.cpp 2013-01-31
09:41:26.570259714 +0000
+@@ -60,9 +60,9 @@
+ #ifdef _WIN32_WCE
+ #define BOOST_ALL_NO_LIB
+ #endif
+-#include <boost/graph/adjacency_list.hpp>
+
+ #ifndef Q_MOC_RUN // QTBUG-22829
++#include <boost/graph/adjacency_list.hpp>
+ #include <boost/graph/topological_sort.hpp>
+ #endif
+
