[arch-commits] Commit in kdebase/trunk (PKGBUILD konsole-layout.patch)

[Pierre Schmitz]

    Date: Friday, March 27, 2009 @ 10:21:06
  Author: pierre
Revision: 31501

KDE 4.2.2 (try #1)

Modified:
  kdebase/trunk/PKGBUILD
Deleted:
  kdebase/trunk/konsole-layout.patch

----------------------+
 PKGBUILD             |   16 +++++++---------
 konsole-layout.patch |   20 --------------------
 2 files changed, 7 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-27 14:21:02 UTC (rev 31500)
+++ PKGBUILD	2009-03-27 14:21:06 UTC (rev 31501)
@@ -2,8 +2,8 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdebase
-pkgver=4.2.1
-pkgrel=2
+pkgver=4.2.2
+pkgrel=1
 pkgdesc="KDE Base Applications"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -14,19 +14,17 @@
 optdepends=('kdebase-workspace')
 options=('docs')
 install='kdebase.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'konsole-layout.patch')
-md5sums=('a8f391db7b98feaa6ae81b8f1e99ed5a'
-         '9e87d93baef801397cf7e90a82ae8894')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('7f6b0d5051f251d0f34ee797a8e2b54a')
 
 build() {
-	cd $srcdir/${pkgname}-${pkgver}
-	# fix konsole layout; see https://bugs.kde.org/show_bug.cgi?id=171544
-	patch -p1 -i $srcdir/konsole-layout.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: konsole-layout.patch
===================================================================
--- konsole-layout.patch	2009-03-27 14:21:02 UTC (rev 31500)
+++ konsole-layout.patch	2009-03-27 14:21:06 UTC (rev 31501)
@@ -1,20 +0,0 @@
-Index: kdebase/apps/konsole/src/ViewContainer.cpp
-===================================================================
---- kdebase/apps/konsole/src/ViewContainer.cpp	(Revision 937338)
-+++ kdebase/apps/konsole/src/ViewContainer.cpp	(Revision 937339)
-@@ -784,6 +784,7 @@
-     searchBar()->setParent(_containerWidget);
-     layout->addWidget(searchBar());
-     layout->addWidget(_stackWidget);
-+    layout->setMargin(0);
- }
- StackedViewContainer::~StackedViewContainer()
- {
-@@ -829,6 +830,7 @@
-     searchBar()->setParent(contentArea);
-     layout->addWidget(_stackWidget);
-     layout->addWidget(searchBar());
-+    layout->setMargin(0);
- 
-     // elide left is used because the most informative part of the session name is often
-     // the rightmost part