Hello community, here is the log from the commit of package kdevelop3 checked in at Tue May 22 17:08:08 CEST 2007. -------- --- KDE/kdevelop3/kdevelop3.changes 2007-04-12 13:18:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdevelop3/kdevelop3.changes 2007-05-22 16:13:57.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 15 10:06:24 CEST 2007 - stbinner@suse.de + +- update to 3.4.1: several bugfixes +- add patch from upstream to fix hangup when closing project + +------------------------------------------------------------------- Old: ---- fix-qmake-parser.patch kdevelop-3.4.0.tar.bz2 New: ---- kdevelop-3.4.1.tar.bz2 kdev_fix_hang.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevelop3.spec ++++++ --- /var/tmp/diff_new_pack.l22000/_old 2007-05-22 17:08:01.000000000 +0200 +++ /var/tmp/diff_new_pack.l22000/_new 2007-05-22 17:08:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdevelop3 (Version 3.4.0) +# spec file for package kdevelop3 (Version 3.4.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,8 +20,8 @@ %if %suse_version < 1000 BuildRequires: libjpeg-devel %endif -Version: 3.4.0 -Release: 17 +Version: 3.4.1 +Release: 1 Summary: Integrated Development Environment for the X Window System, Qt, KDE, and GNOME License: GNU General Public License (GPL) Group: Development/Tools/IDE @@ -41,7 +41,7 @@ Source: kdevelop-%{version}.tar.bz2 #Patch0: 3_5_BRANCH.diff Patch1: FIXME.diff -Patch2: fix-qmake-parser.patch +Patch2: kdev_fix_hang.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -69,7 +69,7 @@ %setup -q -n kdevelop-%{version} #%patch0 %patch1 -%patch2 +%patch2 -p1 . /etc/opt/kde3/common_options update_admin --no-unsermake --no-final @@ -127,6 +127,9 @@ /opt/kde3/share/servicetypes/* %changelog +* Tue May 15 2007 - stbinner@suse.de +- update to 3.4.1: several bugfixes +- add patch from upstream to fix hangup when closing project * Thu Apr 12 2007 - stbinner@suse.de - add requirement against kdelibs3 version it built against * Fri Mar 30 2007 - dmueller@suse.de ++++++ kdevelop-3.4.0.tar.bz2 -> kdevelop-3.4.1.tar.bz2 ++++++ KDE/kdevelop3/kdevelop-3.4.0.tar.bz2 /mounts/work_src_done/STABLE/kdevelop3/kdevelop-3.4.1.tar.bz2 differ: byte 11, line 1 ++++++ kdev_fix_hang.diff ++++++ 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: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org