Hello community,
here is the log from the commit of package kdesvn
checked in at Fri Jul 18 00:27:21 CEST 2008.
--------
--- KDE/kdesvn/kdesvn.changes 2008-05-28 09:28:23.000000000 +0200
+++ kdesvn/kdesvn.changes 2008-07-16 11:00:31.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Jul 16 10:59:55 CEST 2008 - stbinner@suse.de
+
+- update to 0.14.6: fixes problems with accessing KWallet
+
+-------------------------------------------------------------------
Old:
----
kdesvn-0.14.4.tar.bz2
kdesvn-svn15.patch
svn-changes.diff
New:
----
kdesvn-0.14.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdesvn.spec ++++++
--- /var/tmp/diff_new_pack.p10554/_old 2008-07-18 00:26:07.000000000 +0200
+++ /var/tmp/diff_new_pack.p10554/_new 2008-07-18 00:26:07.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdesvn (Version 0.14.4)
+# spec file for package kdesvn (Version 0.14.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,13 +17,11 @@
License: GPL v2 or later
Group: Development/Tools/Version Control
Summary: KDE Subversion Client
-Version: 0.14.4
-Release: 3
+Version: 0.14.6
+Release: 1
Source: %name-%version.tar.bz2
Patch: FIXME.diff
Patch1: remove-duplicated-group.diff
-Patch2: svn-changes.diff
-Patch3: kdesvn-svn15.patch
Url: http://www.alwins-world.de/programs/kdesvn/index.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -69,10 +67,6 @@
%setup -q
%patch
%patch1
-%if %suse_version > 1030
-%patch2
-%endif
-%patch3 -p1
cd doc/en
for i in *png; do
cp $i $i.tmp
@@ -148,6 +142,8 @@
/opt/kde3/%_lib/libsvnqt.so.*
%changelog
+* Wed Jul 16 2008 stbinner@suse.de
+- update to 0.14.6: fixes problems with accessing KWallet
* Wed May 28 2008 olh@suse.de
- update for subversion 1.5 API
* Fri May 23 2008 stbinner@suse.de
++++++ kdesvn-0.14.4.tar.bz2 -> kdesvn-0.14.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-0.14.4/ChangeLog new/kdesvn-0.14.6/ChangeLog
--- old/kdesvn-0.14.4/ChangeLog 2008-05-19 10:12:58.000000000 +0200
+++ new/kdesvn-0.14.6/ChangeLog 2008-07-14 18:07:51.000000000 +0200
@@ -1,3 +1,9 @@
+version 0.14.6
+ * fixed a error in fix for kwallet problem
+
+version 0.14.5
+ * fix a problem with accessing kwallet
+
version 0.14.4
* fix a binary compatible issue, see #329
* fix a wrong handling of memory which may result in utf8-encoding errors.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-0.14.4/CMakeLists.txt new/kdesvn-0.14.6/CMakeLists.txt
--- old/kdesvn-0.14.4/CMakeLists.txt 2008-05-19 10:12:58.000000000 +0200
+++ new/kdesvn-0.14.6/CMakeLists.txt 2008-07-14 18:08:10.000000000 +0200
@@ -60,7 +60,7 @@
SET(_BASE_LDADD "-L${CMAKE_BINARY_DIR}/lib")
# current version
-SET(VERSION 0.14.4)
+SET(VERSION 0.14.6)
SET(KDESVN_VERSION \"${VERSION}\")
CONFIGURE_FILE(kdesvn-config.h.in kdesvn-config.h @ONLY)
Files old/kdesvn-0.14.4/doc/en_index.cache.bz2 and new/kdesvn-0.14.6/doc/en_index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-0.14.4/kdesvn.spec new/kdesvn-0.14.6/kdesvn.spec
--- old/kdesvn-0.14.4/kdesvn.spec 2008-05-19 10:47:50.000000000 +0200
+++ new/kdesvn-0.14.6/kdesvn.spec 2008-07-14 18:10:28.000000000 +0200
@@ -1,6 +1,6 @@
Summary: A subversion client for the KDE with KIO integration.
Name: kdesvn
-Version: 0.14.4
+Version: 0.14.6
Release: 1%{?dist}
License: LGPL
Vendor: Rajko Albrecht
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-0.14.4/src/eventnumbers.h new/kdesvn-0.14.6/src/eventnumbers.h
--- old/kdesvn-0.14.4/src/eventnumbers.h 2005-11-09 16:09:14.000000000 +0100
+++ new/kdesvn-0.14.6/src/eventnumbers.h 2008-07-14 12:25:50.000000000 +0200
@@ -29,5 +29,8 @@
#define EVENT_THREAD_CERT_PW_PROMPT QEvent::User+4
#define EVENT_THREAD_CERT_SELECT_PROMPT QEvent::User+5
#define EVENT_THREAD_NOTIFY QEvent::User+6
+#define EVENT_LOGCACHE_FINISHED QEvent::User+7
+#define EVENT_LOGCACHE_STATUS QEvent::User+8
+#define EVENT_THREAD_LOGIN_SAVED QEvent::User+9
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-0.14.4/src/svnfrontend/tcontextlistener.cpp new/kdesvn-0.14.6/src/svnfrontend/tcontextlistener.cpp
--- old/kdesvn-0.14.4/src/svnfrontend/tcontextlistener.cpp 2007-04-14 10:32:55.000000000 +0200
+++ new/kdesvn-0.14.6/src/svnfrontend/tcontextlistener.cpp 2008-07-14 18:07:51.000000000 +0200
@@ -43,6 +43,7 @@
bool ThreadContextListener::contextGetLogin(const QString& realm, QString& username, QString& password, bool& maySave)
{
+ kdDebug()<<"Getting threaded login"<m_CallbackMutex));
ThreadContextListenerData::slogin_data _data;
_data.realm=realm;
@@ -54,7 +55,7 @@
QCustomEvent*ev = new QCustomEvent(EVENT_THREAD_LOGIN_PROMPT);
void*t = (void*)&_data;
ev->setData(t);
- kdDebug()<<"Post event "<postEvent(this,ev);
m_Data->m_trustpromptWait.wait();
username = _data.user;
@@ -63,6 +64,29 @@
return _data.ok;
}
+bool ThreadContextListener::contextGetSavedLogin(const QString & realm,QString & username,QString & password)
+{
+
+ kdDebug()<<"Getting threaded saved login"<m_CallbackMutex));
+ ThreadContextListenerData::slogin_data _data;
+ _data.realm=realm;
+ _data.user=username;
+ _data.password=password;
+ _data.maysave=false;
+ _data.ok=false;
+
+ QCustomEvent*ev = new QCustomEvent(EVENT_THREAD_LOGIN_SAVED);
+ void*t = (void*)&_data;
+ ev->setData(t);
+ kdDebug()<<"Post event "<postEvent(this,ev);
+ m_Data->m_trustpromptWait.wait();
+ username = _data.user;
+ password = _data.password;
+ return _data.ok;
+}
+
bool ThreadContextListener::contextGetLogMessage(QString& msg,const svn::CommitItemList&_items)
{
QMutexLocker lock(&(m_Data->m_CallbackMutex));
@@ -143,7 +167,7 @@
*/
void ThreadContextListener::contextProgress(long long int current, long long int max)
{
- if (current==0) {
+ if (m_Data->noProgress||current==0) {
return;
}
QMutexLocker lock(&(m_Data->m_CallbackMutex));
@@ -184,6 +208,18 @@
ThreadContextListenerData::slogin_data*_data = (ThreadContextListenerData::slogin_data*)data;
_data->ok = CContextListener::contextGetLogin(_data->realm, _data->user, _data->password, _data->maysave);
+ //_data->ok = CContextListener::contextGetSavedLogin(_data->realm, _data->user, _data->password);
+ m_Data->m_trustpromptWait.wakeAll();
+}
+
+void ThreadContextListener::event_contextGetSavedLogin(void*data)
+{
+ if (!data) {
+ m_Data->m_trustpromptWait.wakeAll();
+ return;
+ }
+ ThreadContextListenerData::slogin_data*_data = (ThreadContextListenerData::slogin_data*)data;
+ _data->ok = CContextListener::contextGetSavedLogin(_data->realm, _data->user, _data->password);
m_Data->m_trustpromptWait.wakeAll();
}
@@ -260,6 +296,8 @@
event_contextSslClientCertPrompt(ev->data());
}else if (ev->type()==EVENT_THREAD_NOTIFY) {
event_contextNotify(ev->data());
+ } else if (ev->type() == EVENT_THREAD_LOGIN_SAVED) {
+ event_contextGetSavedLogin(ev->data());
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-0.14.4/src/svnfrontend/tcontextlistener.h new/kdesvn-0.14.6/src/svnfrontend/tcontextlistener.h
--- old/kdesvn-0.14.4/src/svnfrontend/tcontextlistener.h 2007-04-14 10:32:55.000000000 +0200
+++ new/kdesvn-0.14.6/src/svnfrontend/tcontextlistener.h 2008-07-14 12:25:50.000000000 +0200
@@ -42,6 +42,8 @@
~ThreadContextListener();
virtual bool contextGetLogin(const QString& realm, QString& username, QString& password, bool& maySave);
+ virtual bool contextGetSavedLogin(const QString & realm,QString & username,QString & password);
+
virtual bool contextGetLogMessage(QString& msg,const svn::CommitItemList&);
virtual bool contextSslClientCertPrompt(QString& certFile);
virtual bool contextSslClientCertPwPrompt(QString& password, const QString& realm, bool& maySave);
@@ -52,6 +54,7 @@
protected:
virtual void event_contextGetLogin(void*_data);
+ virtual void event_contextGetSavedLogin(void*_data);
virtual void event_contextGetLogMessage(void*data);
virtual void event_contextSslClientCertPrompt(void*data);
virtual void event_contextSslClientCertPwPrompt(void*data);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-0.14.4/src/svnfrontend/threadcontextlistenerdata.cpp new/kdesvn-0.14.6/src/svnfrontend/threadcontextlistenerdata.cpp
--- old/kdesvn-0.14.4/src/svnfrontend/threadcontextlistenerdata.cpp 2007-04-14 10:32:55.000000000 +0200
+++ new/kdesvn-0.14.6/src/svnfrontend/threadcontextlistenerdata.cpp 2008-07-14 12:25:50.000000000 +0200
@@ -20,6 +20,7 @@
#include "threadcontextlistenerdata.h"
ThreadContextListenerData::ThreadContextListenerData()
+ :noProgress(true)
{
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-0.14.4/src/svnfrontend/threadcontextlistenerdata.h new/kdesvn-0.14.6/src/svnfrontend/threadcontextlistenerdata.h
--- old/kdesvn-0.14.4/src/svnfrontend/threadcontextlistenerdata.h 2007-04-14 10:32:55.000000000 +0200
+++ new/kdesvn-0.14.6/src/svnfrontend/threadcontextlistenerdata.h 2008-07-14 12:25:50.000000000 +0200
@@ -34,6 +34,9 @@
virtual ~ThreadContextListenerData();
+ /* sometimes suppress progress messages */
+ bool noProgress;
+
/* only one callback at time */
QMutex m_CallbackMutex;
QWaitCondition m_trustpromptWait;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-0.14.4/src/svnqt/client_modify.cpp new/kdesvn-0.14.6/src/svnqt/client_modify.cpp
--- old/kdesvn-0.14.4/src/svnqt/client_modify.cpp 2008-05-23 11:58:51.000000000 +0200
+++ new/kdesvn-0.14.6/src/svnqt/client_modify.cpp 2008-05-19 10:24:41.000000000 +0200
@@ -188,9 +188,7 @@
#endif
svn_error_t * error =
-#if (SVN_VER_MAJOR >= 1) && (SVN_VER_MINOR >= 5)
- svn_client_commit4
-#elif (SVN_VER_MAJOR >= 1) && (SVN_VER_MINOR >= 3)
+#if (SVN_VER_MAJOR >= 1) && (SVN_VER_MINOR >= 3)
svn_client_commit3
#else
svn_client_commit2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org