[arch-commits] Commit in kdevelop/repos (4 files)

[Eric Belanger]

    Date: Sunday, June 22, 2008 @ 21:38:40
  Author: eric
Revision: 3489

Merged revisions 2-3488 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/kdevelop/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r3427 | travis | 2008-06-22 14:28:51 -0400 (Sun, 22 Jun 2008) | 2 lines
  
  upgpkg: kdevelop 3.5.2-1
      Upstream update
........
  r3463 | travis | 2008-06-22 15:48:42 -0400 (Sun, 22 Jun 2008) | 2 lines
  
  upgpkg: kdevelop 3.5.2-1
      Upstream update
........

Modified:
  kdevelop/repos/extra-x86_64/	(properties)
  kdevelop/repos/extra-x86_64/PKGBUILD
Deleted:
  kdevelop/repos/extra-x86_64/kdev_fix_hang_3.4.1.patch
  kdevelop/repos/extra-x86_64/post-3.5.9.patch

---------------------------+
 PKGBUILD                  |   10 +++-----
 kdev_fix_hang_3.4.1.patch |   54 --------------------------------------------
 post-3.5.9.patch          |   49 ---------------------------------------
 3 files changed, 4 insertions(+), 109 deletions(-)


Property changes on: kdevelop/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /kdevelop/trunk:1
   + /kdevelop/trunk:1-3488

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-06-23 01:33:21 UTC (rev 3488)
+++ extra-x86_64/PKGBUILD	2008-06-23 01:38:40 UTC (rev 3489)
@@ -4,7 +4,7 @@
 # Committer: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=kdevelop
-pkgver=3.5.1
+pkgver=3.5.2
 pkgrel=1.1
 pkgdesc="A C/C++ development environment for KDE - stable snapshot build"
 arch=('i686' 'x86_64')
@@ -16,11 +16,12 @@
 conflicts=('kdevelop-devel')
 
 # 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.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://$mirror/stable/$pkgname-latest/src/$pkgname-$pkgver.tar.bz2 post-3.5.9.patch)
+source=(ftp://$mirror/stable/apps/KDE3.x/ide/$pkgname-$pkgver.tar.bz2)
+md5sums=('21c5085a4af3577d1d15fd169eb672a2')
 
 build() {
    # Source the QT and KDE profile
@@ -28,11 +29,8 @@
    [ "$KDEDIR" = "" ] && source /etc/profile.d/kde.sh
    # start building
    cd ${startdir}/src/${pkgname}-${pkgver}
-   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=('80d2216a0089fe142735d34ae8de6a0c'
-         '9a5e518c257638d38e273dd345148ff2')

Deleted: extra-x86_64/kdev_fix_hang_3.4.1.patch
===================================================================
--- extra-x86_64/kdev_fix_hang_3.4.1.patch	2008-06-23 01:33:21 UTC (rev 3488)
+++ extra-x86_64/kdev_fix_hang_3.4.1.patch	2008-06-23 01:38:40 UTC (rev 3489)
@@ -1,54 +0,0 @@
-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:

Deleted: extra-x86_64/post-3.5.9.patch
===================================================================
--- extra-x86_64/post-3.5.9.patch	2008-06-23 01:33:21 UTC (rev 3488)
+++ extra-x86_64/post-3.5.9.patch	2008-06-23 01:38:40 UTC (rev 3489)
@@ -1,49 +0,0 @@
-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"
-