[arch-commits] Commit in kdepim/trunk (PKGBUILD korganizer.patch)

[Pierre Schmitz]

    Date: Friday, March 27, 2009 @ 10:21:26
  Author: pierre
Revision: 31506

KDE 4.2.2 (try #1)

Modified:
  kdepim/trunk/PKGBUILD
Deleted:
  kdepim/trunk/korganizer.patch

------------------+
 PKGBUILD         |   16 +++++++---------
 korganizer.patch |   18 ------------------
 2 files changed, 7 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-27 14:21:22 UTC (rev 31505)
+++ PKGBUILD	2009-03-27 14:21:26 UTC (rev 31506)
@@ -2,8 +2,8 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdepim
-pkgver=4.2.1
-pkgrel=2
+pkgver=4.2.2
+pkgrel=1
 pkgdesc="KDE Personal Information Management suite"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -13,19 +13,17 @@
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 options=('docs')
 install='kdepim.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'korganizer.patch')
-md5sums=('2ebc3730aaee53f494e8e6abd26029bd'
-         'cab0c7dfac884ac4f9efe92a34fc1af8')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('964208d570845c75e0c482bb3d33892f')
 
 build() {
-	cd $srcdir/${pkgname}-${pkgver}
-	# fix KOrganizer; see https://bugs.kde.org/show_bug.cgi?id=186653
-	patch -p1 -i $srcdir/korganizer.patch || return 1
-	cd ../
+	cd $srcdir
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	make
 	make DESTDIR=$pkgdir install

Deleted: korganizer.patch
===================================================================
--- korganizer.patch	2009-03-27 14:21:22 UTC (rev 31505)
+++ korganizer.patch	2009-03-27 14:21:26 UTC (rev 31506)
@@ -1,18 +0,0 @@
-Index: kdepim/korganizer/views/agendaview/koagendaview.cpp
-===================================================================
---- kdepim/korganizer/views/agendaview/koagendaview.cpp	(Revision 933656)
-+++ kdepim/korganizer/views/agendaview/koagendaview.cpp	(Revision 933657)
-@@ -1544,8 +1544,12 @@
-   KConfigGroup group = config->group( "Views" );
- 
-   QList<int> sizes = group.readEntry( "Separator AgendaView", QList<int>() );
--  mSplitterAgenda->setSizes( sizes );
- 
-+  // the size depends on the number of plugins used
-+  if ( sizes.count() >= 2 ) {
-+    mSplitterAgenda->setSizes( sizes );
-+  }
-+
-   updateConfig();
- }
-