From 1e6588d64f084decf287a58b7ff93ff0ce4d0446 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 4 Jun 2012 00:01:23 +0000 Subject: Mon Jun 4 00:01:23 UTC 2012 --- kde-unstable/kdepim/PKGBUILD | 19 ++++++++++++------- kde-unstable/kdepim/fix-build.patch | 32 ++++++++++++++++++++++++++++++++ kde-unstable/kdepim/kdepim-knode.install | 12 ++++++++++++ 3 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 kde-unstable/kdepim/fix-build.patch create mode 100644 kde-unstable/kdepim/kdepim-knode.install (limited to 'kde-unstable') diff --git a/kde-unstable/kdepim/PKGBUILD b/kde-unstable/kdepim/PKGBUILD index bb01a34be..da93aa268 100644 --- a/kde-unstable/kdepim/PKGBUILD +++ b/kde-unstable/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160158 2012-05-29 23:05:07Z andrea $ +# $Id: PKGBUILD 160453 2012-06-02 06:43:21Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -20,17 +20,22 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-libkdepim') pkgver=4.8.80 -pkgrel=1 +pkgrel=2 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') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('c563279f8ae207ee3a4aa01534f38bfadee92cff') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" + 'fix-build.patch') +sha1sums=('af86571d86dbb3c9e7af0ef86c6d90fbaf9304bd' + '526d0460658f649159eed8e58fa384fd3f72fbbe') build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/fix-build.patch + cd "${srcdir}" mkdir build cd build @@ -143,7 +148,7 @@ package_kdepim-kmail() { 'kdepim-mimelib' 'kdepim-plugins') replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' 'kdepim-mimelib' 'kdepim-plugins') - for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \ + for i in kmail doc/kmail kmailcvt ksendemail libksieve \ mailfilteragent ontologies kontact/plugins/kmail; do cd "${srcdir}"/build/${i} make DESTDIR="${pkgdir}" install @@ -154,7 +159,7 @@ package_kdepim-knode() { pkgdesc='News Reader' depends=('kdepim-libkdepim') url="http://kde.org/applications/internet/knode/" - install='kdepim.install' + install='kdepim-knode.install' cd "${srcdir}"/build/knode make DESTDIR="${pkgdir}" install cd "${srcdir}"/build/doc/knode @@ -237,7 +242,7 @@ package_kdepim-libkdepim() { kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ messagecomposer messagecore messagelist messageviewer icons \ strigi-analyzer templateparser plugins/messageviewer \ - plugins/ktexteditor; do + plugins/ktexteditor mailcommon; do cd "${srcdir}"/build/${i} make DESTDIR="${pkgdir}" install done diff --git a/kde-unstable/kdepim/fix-build.patch b/kde-unstable/kdepim/fix-build.patch new file mode 100644 index 000000000..b42046677 --- /dev/null +++ b/kde-unstable/kdepim/fix-build.patch @@ -0,0 +1,32 @@ +From: Allen Winter +Date: Thu, 31 May 2012 16:58:07 +0000 +Subject: Revert last: Remove X11 requirement +X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=26f9d62b9a9b4bfa736b342903d16dc0d8739d98 +--- +Revert last: Remove X11 requirement + +CCMAIL: djarvie@kde.org +David, without explicit linking to X11 libs, I get an unresolved +symbol for XSetWMHints +--- + + +--- a/kalarm/CMakeLists.txt ++++ b/kalarm/CMakeLists.txt +@@ -202,6 +202,7 @@ if(KALARM_USE_AKONADI) + kdepim + ${KDE4_KCMUTILS_LIBS} + ${KDE4_PHONON_LIBS} ++ ${X11_X11_LIB} + ) + else(KALARM_USE_AKONADI) + target_link_libraries(kalarm_bin +@@ -220,6 +221,7 @@ else(KALARM_USE_AKONADI) + kdepim + ${KDE4_KCMUTILS_LIBS} + ${KDE4_PHONON_LIBS} ++ ${X11_X11_LIB} + ) + endif(KALARM_USE_AKONADI) + + diff --git a/kde-unstable/kdepim/kdepim-knode.install b/kde-unstable/kdepim/kdepim-knode.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/kde-unstable/kdepim/kdepim-knode.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} -- cgit v1.2.3-54-g00ecf