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

[Tobias Powalowski]

    Date: Monday, May 21, 2007 @ 13:40:21
  Author: tpowa
    Path: /home/cvs-extra/extra/devel/kdevelop

   Added: kdev_fix_hang_3.4.1.patch (1.1)
Modified: PKGBUILD (1.41 -> 1.42)

'upgpkg: update to new version'


---------------------------+
 PKGBUILD                  |   30 ++++++++++--------------
 kdev_fix_hang_3.4.1.patch |   54 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 17 deletions(-)


Index: extra/devel/kdevelop/PKGBUILD
diff -u extra/devel/kdevelop/PKGBUILD:1.41 extra/devel/kdevelop/PKGBUILD:1.42
--- extra/devel/kdevelop/PKGBUILD:1.41	Sun Apr 29 14:03:15 2007
+++ extra/devel/kdevelop/PKGBUILD	Mon May 21 13:40:20 2007
@@ -1,25 +1,22 @@
-# $Id: PKGBUILD,v 1.41 2007/04/29 18:03:15 travis Exp $
+# $Id: PKGBUILD,v 1.42 2007/05/21 17:40:20 tpowa Exp $
 # Maintainer: damir <damir at archlinux.org>
 # Committer: Judd Vinet <jvinet at zeroflux.org>
-
 pkgname=kdevelop
-pkgver=3.4.0
-pkgrel=2
+pkgver=3.4.1
+pkgrel=1
 pkgdesc="A C/C++ development environment for KDE"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
+depends=('kdelibs>=3.5.7' 'kdebase>=3.5.7' 'kdesdk>=3.5.7' 'graphviz' 'flex>=2.5.4' 'gcc' 'perl' 'make' 'automake>=1.6' 'autoconf>=2.52' 'gettext' 'db' 'cvs')
 url="http://www.kdevelop.org/"
-license=('GPL')
-depends=('kdelibs>=3.5.6' 'kdebase>=3.5.6' 'kdesdk>=3.5.6' 'graphviz' \
-         'flex>=2.5.4' 'gcc' 'perl' 'make' 'automake>=1.6' 'autoconf>=2.52' \
-         'gettext' 'db>=4.5' 'cvs')
-conflicts=('kdevelop-devel')
 replaces=('kdevelop3-cvs') # compatibility reasons
+conflicts=('kdevelop-devel')
 
-# for easier build, just possible mirrors youm may want to use --- remember: source is about 6MB!
-# mirror="ftp.solnet.ch/mirror/KDE"         # updated every 2 hours, very fast for Europe
+# for easier build, just uncomment the mirror you want to use --- remember: source is about 6MB!
+  mirror="ftp.solnet.ch/mirror/KDE"         # updated every 2 hours, very fast for Europe
 # mirror="ftp.kde.org/pub/kde/"             # main server
 # mirror="ibiblio.org/pub/mirrors/kde/"     # ibiblio mirror
-source=(ftp://ftp.kde.org/pub/kde/stable/$pkgname-latest/src/$pkgname-$pkgver.tar.bz2)
+
+source=(ftp://$mirror/stable/$pkgname-latest/src/$pkgname-$pkgver.tar.bz2 kdev_fix_hang_3.4.1.patch)
 
 build() {
    # Source the QT and KDE profile
@@ -27,12 +24,11 @@
    [ "$KDEDIR" = "" ] && source /etc/profile.d/kde.sh
    # start building
    cd ${startdir}/src/${pkgname}-${pkgver}
+   patch -Np1 -i ../kdev_fix_hang_3.4.1.patch || return 1
    ./configure --prefix=/opt/kde --enable-gcc-hidden-visibility
    make || return 1
    make DESTDIR=$startdir/pkg install
    rm -f ${startdir}/pkg/opt/kde/bin/extractrc
 }
-
-md5sums=('9cf367c89329acf23738e23c0b663ee9')
-sha1sums=('d72f01ae6a0d3200339345d3557ada5c5f99112d')
-
+md5sums=('abc6cc2831ad4c0f4da9fba9e38edce1'
+         'b687b6adad73c26def7c0d6686b37bac')
Index: extra/devel/kdevelop/kdev_fix_hang_3.4.1.patch
diff -u /dev/null extra/devel/kdevelop/kdev_fix_hang_3.4.1.patch:1.1
--- /dev/null	Mon May 21 13:40:21 2007
+++ extra/devel/kdevelop/kdev_fix_hang_3.4.1.patch	Mon May 21 13:40:21 2007
@@ -0,0 +1,54 @@
+diff -u -u kdevelop-3.4.1/languages/cpp/cppsupportpart.cpp kdevelop-svn/languages/cpp/cppsupportpart.cpp
+--- kdevelop-3.4.1/languages/cpp/cppsupportpart.cpp	2007-05-16 16:36:20.000000000 +0200
++++ kdevelop-svn/languages/cpp/cppsupportpart.cpp	2007-05-16 00:25:57.000000000 +0200
+@@ -3130,11 +3130,11 @@
+         return QString::null;
+ }
+ 
+-UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : QThread(), m_parent( parent ) {
++UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : QThread(), m_parent( parent ), m_stop(false) {
+ }
+       
+ void UIBlockTester::UIBlockTesterThread::run() {
+-  while(1) {
++  while(!m_stop) {
+ 	  msleep( m_parent.m_msecs / 10 );
+ 	  m_parent.m_timeMutex.lock();
+ 	  QDateTime t = QDateTime::currentDateTime();
+@@ -3146,7 +3146,11 @@
+ 	  m_parent.m_timeMutex.unlock();
+   }
+ }
+-      
++
++void UIBlockTester::UIBlockTesterThread::stop() {
++	m_stop = true;
++}
++
+ UIBlockTester::UIBlockTester( uint milliseconds ) : m_thread( *this ), m_msecs( milliseconds ) {
+ 	m_timer = new QTimer( this );
+ 	m_timer->start( milliseconds/10 );
+@@ -3155,7 +3159,7 @@
+ 	m_thread.start();
+ }
+ UIBlockTester::~UIBlockTester() {
+-  m_thread.terminate();
++  m_thread.stop();
+   m_thread.wait();
+ }
+ 	
+diff -u -u kdevelop-3.4.1/languages/cpp/cppsupportpart.h kdevelop-svn/languages/cpp/cppsupportpart.h
+--- kdevelop-3.4.1/languages/cpp/cppsupportpart.h	2007-05-16 16:36:20.000000000 +0200
++++ kdevelop-svn/languages/cpp/cppsupportpart.h	2007-05-16 00:25:57.000000000 +0200
+@@ -43,9 +43,10 @@
+     public:
+       UIBlockTesterThread( UIBlockTester& parent );
+       void run();
+-      
++      void stop();
+     private:
+       UIBlockTester& m_parent;
++      bool m_stop;
+     };
+   friend class UIBlockTesterThread;
+ public: