[arch-commits] Commit in kdepim/kde-unstable (3 files)

[Andrea Scarpino]

    Date: Friday, June 1, 2012 @ 18:11:57
  Author: andrea
Revision: 160444

Fix build

Added:
  kdepim/kde-unstable/fix-build.patch
  kdepim/kde-unstable/kdepim-knode.install
Modified:
  kdepim/kde-unstable/PKGBUILD

----------------------+
 PKGBUILD             |   15 ++++++++++-----
 fix-build.patch      |   32 ++++++++++++++++++++++++++++++++
 kdepim-knode.install |   12 ++++++++++++
 3 files changed, 54 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-01 21:47:29 UTC (rev 160443)
+++ PKGBUILD	2012-06-01 22:11:57 UTC (rev 160444)
@@ -27,10 +27,15 @@
 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=('af86571d86dbb3c9e7af0ef86c6d90fbaf9304bd')
+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 @@
 	           '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 @@
 	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 @@
 		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

Added: fix-build.patch
===================================================================
--- fix-build.patch	                        (rev 0)
+++ fix-build.patch	2012-06-01 22:11:57 UTC (rev 160444)
@@ -0,0 +1,32 @@
+From: Allen Winter <winter at kde.org>
+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 at 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)
+ 
+

Added: kdepim-knode.install
===================================================================
--- kdepim-knode.install	                        (rev 0)
+++ kdepim-knode.install	2012-06-01 22:11:57 UTC (rev 160444)
@@ -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
+}