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

[Pierre Schmitz]

    Date: Tuesday, March 10, 2009 @ 08:15:40
  Author: pierre
Revision: 29611

upgpkg: kdebase 4.2.1-2

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

----------------------+
 PKGBUILD             |   12 ++++++++----
 konsole-layout.patch |   20 ++++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-10 12:12:35 UTC (rev 29610)
+++ PKGBUILD	2009-03-10 12:15:40 UTC (rev 29611)
@@ -3,7 +3,7 @@
 
 pkgname=kdebase
 pkgver=4.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Base Applications"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -14,11 +14,15 @@
 optdepends=('kdebase-workspace')
 options=('docs')
 install='kdebase.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('a8f391db7b98feaa6ae81b8f1e99ed5a')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'konsole-layout.patch')
+md5sums=('a8f391db7b98feaa6ae81b8f1e99ed5a'
+         '9e87d93baef801397cf7e90a82ae8894')
 
 build() {
-	cd $srcdir
+	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 ../
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \

Added: konsole-layout.patch
===================================================================
--- konsole-layout.patch	                        (rev 0)
+++ konsole-layout.patch	2009-03-10 12:15:40 UTC (rev 29611)
@@ -0,0 +1,20 @@
+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