[arch-commits] CVS update of extra/devel/kdevelop (PKGBUILD post-3.5.9.patch)

[Tobias Powalowski]

    Date: Monday, March 3, 2008 @ 14:04:20
  Author: tpowa
    Path: /home/cvs-extra/extra/devel/kdevelop

   Added: post-3.5.9.patch (1.1)
Modified: PKGBUILD (1.49 -> 1.50)

upgppkg: update to new version


------------------+
 PKGBUILD         |   21 +++++++++------------
 post-3.5.9.patch |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 12 deletions(-)


Index: extra/devel/kdevelop/PKGBUILD
diff -u extra/devel/kdevelop/PKGBUILD:1.49 extra/devel/kdevelop/PKGBUILD:1.50
--- extra/devel/kdevelop/PKGBUILD:1.49	Wed Oct 24 06:03:24 2007
+++ extra/devel/kdevelop/PKGBUILD	Mon Mar  3 14:04:20 2008
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD,v 1.49 2007/10/24 10:03:24 tpowa Exp $
+# $Id: PKGBUILD,v 1.50 2008/03/03 19:04:20 tpowa Exp $
 # Maintainer: damir <damir at archlinux.org>
 # Maintainer: Travis Willard <travis at archlinux.org> 
 # Committer: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=kdevelop
-pkgver=3.5.0
-pkgrel=2
+pkgver=3.5.1
+pkgrel=1
 pkgdesc="A C/C++ development environment for KDE - stable snapshot build"
 arch=('i686' 'x86_64')
 url="http://www.kdevelop.org/"
 license=('GPL')
-depends=('kdelibs>=3.5.8' 'kdebase>=3.5.8' 'kdesdk>=3.5.8' 'flex>=2.5.4' 'gcc' 'perl' 'make' 
+depends=('kdelibs>=3.5.9' 'kdebase>=3.5.9' 'kdesdk>=3.5.9' 'flex>=2.5.4' 'gcc' 'perl' 'make' 
          'automake>=1.6' 'autoconf>=2.52' 'gettext' 'db>=4.6' 'cvs' 'subversion')
 replaces=('kdevelop3-cvs') # compatibility reasons
 conflicts=('kdevelop-devel')
@@ -20,22 +20,19 @@
 # mirror="ftp.kde.org/pub/kde/"             # main server
 # mirror="ibiblio.org/pub/mirrors/kde/"     # ibiblio mirror
 
-source=(ftp://$mirror/stable/$pkgname-latest/src/$pkgname-$pkgver.tar.bz2 post-3.5.8.patch)
+source=(ftp://$mirror/stable/$pkgname-latest/src/$pkgname-$pkgver.tar.bz2 post-3.5.9.patch)
 
 build() {
    # Source the QT and KDE profile
-   [ "$QTDIR" = "" ] && source /etc/profile.d/qt.sh 
+   [ "$QTDIR" = "" ] && source /etc/profile.d/qt3.sh 
    [ "$KDEDIR" = "" ] && source /etc/profile.d/kde.sh
    # start building
    cd ${startdir}/src/${pkgname}-${pkgver}
-   # fix #8372
-   patch -Np4 -i ../post-3.5.8.patch || return 1
-   #patch -Np1 -i ../kdev_fix_hang_3.4.1.patch || return 1
+   patch -Np0 -i ../post-3.5.9.patch || return 1
    ./configure --prefix=/opt/kde --enable-gcc-hidden-visibility || return 1
    make || return 1
    make DESTDIR=$startdir/pkg install || return 1
    rm -f ${startdir}/pkg/opt/kde/bin/extractrc
 }
-
-md5sums=('1101077b3a0164da463f60cad4f13e25'
-         'de0519ef8bac3e39d3c2f6730e1bb087')
+md5sums=('80d2216a0089fe142735d34ae8de6a0c'
+         '9a5e518c257638d38e273dd345148ff2')
Index: extra/devel/kdevelop/post-3.5.9.patch
diff -u /dev/null extra/devel/kdevelop/post-3.5.9.patch:1.1
--- /dev/null	Mon Mar  3 14:04:20 2008
+++ extra/devel/kdevelop/post-3.5.9.patch	Mon Mar  3 14:04:20 2008
@@ -0,0 +1,49 @@
+Index: parts/outputviews/makewidget.cpp
+===================================================================
+--- parts/outputviews/makewidget.cpp	(Revision 780035)
++++ parts/outputviews/makewidget.cpp	(Revision 780036)
+@@ -532,28 +532,31 @@
+ {
+     QString sline;
+     bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
++    
+     if( forceCLocale )
+         sline = QString::fromAscii( stdoutbuf+line );
+     else
+         sline = QString::fromLocal8Bit( stdoutbuf+line );
+-    stdoutbuf.truncate(0);
+ 
+     if ( !appendToLastLine( sline ) )
+         m_directoryStatusFilter.processLine( sline );
++    stdoutbuf.truncate(0);
+ }
+ 
+ void MakeWidget::insertStderrLine( const QCString& line )
+ {
+     QString sline;
+     bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
++    
+     if( forceCLocale ) {
+         sline = QString( stderrbuf+line );
+     }
+     else
+         sline = QString::fromLocal8Bit( stderrbuf+line );
++    
++    if ( !appendToLastLine( sline ) )
++        m_errorFilter.processLine( sline );
+     stderrbuf.truncate(0);
+-    if ( !appendToLastLine( line ) )
+-        m_errorFilter.processLine( line );
+ }
+ 
+ void MakeWidget::slotProcessExited(KProcess *)
+@@ -832,7 +835,7 @@
+ 
+ void MakeWidget::storePartialStdoutLine(const QCString & line)
+ {
+-    stderrbuf += line;
++    stdoutbuf += line;
+ }
+ 
+ #include "makewidget.moc"
+