Hello community, here is the log from the commit of package lokalize for openSUSE:Factory checked in at 2014-06-19 13:18:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lokalize (Old) and /work/SRC/openSUSE:Factory/.lokalize.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lokalize" Changes: -------- --- /work/SRC/openSUSE:Factory/lokalize/lokalize.changes 2014-05-22 06:54:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lokalize.new/lokalize.changes 2014-06-19 13:18:58.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Jun 8 19:04:05 UTC 2014 - tittiatc...@gmail.com + +- Update to 4.13.2 + * KDE 4.13 release + * See http://www.kde.org/announcements/announce-4.13.2.php + +------------------------------------------------------------------- Old: ---- lokalize-4.13.1.tar.xz New: ---- lokalize-4.13.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lokalize.spec ++++++ --- /var/tmp/diff_new_pack.mLbzsG/_old 2014-06-19 13:18:58.000000000 +0200 +++ /var/tmp/diff_new_pack.mLbzsG/_new 2014-06-19 13:18:58.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org/ -Version: 4.13.1 +Version: 4.13.2 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ lokalize-4.13.1.tar.xz -> lokalize-4.13.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-4.13.1/src/catalog/catalog.cpp new/lokalize-4.13.2/src/catalog/catalog.cpp --- old/lokalize-4.13.1/src/catalog/catalog.cpp 2014-05-06 23:59:36.000000000 +0200 +++ new/lokalize-4.13.2/src/catalog/catalog.cpp 2014-05-17 04:39:28.000000000 +0200 @@ -505,7 +505,7 @@ return autoSave; } -int Catalog::loadFromUrl(const KUrl& url, const KUrl& saidUrl, int* fileSize) +int Catalog::loadFromUrl(const KUrl& url, const KUrl& saidUrl, int* fileSize, bool fast) { bool readOnly=false; if (url.isLocalFile()) @@ -578,22 +578,25 @@ d->_readOnly=readOnly; d->_url=saidUrl.isEmpty()?url:saidUrl; - KAutoSaveFile* autoSave=checkAutoSave(d->_url); - d->_autoSaveRecovered=autoSave; - if (autoSave) + if (!fast) { - d->_autoSave->deleteLater(); - d->_autoSave=autoSave; - - //restore 'modified' status for entries - MergeCatalog* mergeCatalog=new MergeCatalog(this,this); - int errorLine=mergeCatalog->loadFromUrl(KUrl::fromPath(autoSave->fileName())); - if (KDE_ISLIKELY(errorLine==0)) - mergeCatalog->copyToBaseCatalog(); - mergeCatalog->deleteLater(); + KAutoSaveFile* autoSave=checkAutoSave(d->_url); + d->_autoSaveRecovered=autoSave; + if (autoSave) + { + d->_autoSave->deleteLater(); + d->_autoSave=autoSave; + + //restore 'modified' status for entries + MergeCatalog* mergeCatalog=new MergeCatalog(this,this); + int errorLine=mergeCatalog->loadFromUrl(KUrl::fromPath(autoSave->fileName())); + if (KDE_ISLIKELY(errorLine==0)) + mergeCatalog->copyToBaseCatalog(); + mergeCatalog->deleteLater(); + } + else + d->_autoSave->setManagedFile(d->_url); } - else - d->_autoSave->setManagedFile(d->_url); if (fileSize) *fileSize=file->size(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-4.13.1/src/catalog/catalog.h new/lokalize-4.13.2/src/catalog/catalog.h --- old/lokalize-4.13.1/src/catalog/catalog.h 2014-05-06 23:59:36.000000000 +0200 +++ new/lokalize-4.13.2/src/catalog/catalog.h 2014-05-17 04:39:28.000000000 +0200 @@ -188,7 +188,7 @@ public slots: //DBus interface const KUrl& url() const {return d->_url;} ///@returns 0 if success, >0 erroneous line (parsing error) - int loadFromUrl(const KUrl& url, const KUrl& saidUrl=KUrl(), int* fileSize=0); + int loadFromUrl(const KUrl& url, const KUrl& saidUrl=KUrl(), int* fileSize=0, bool fast = false); bool saveToUrl(KUrl url); bool save(); QByteArray contents(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-4.13.1/src/project/project.cpp new/lokalize-4.13.2/src/project/project.cpp --- old/lokalize-4.13.1/src/project/project.cpp 2014-05-06 23:59:36.000000000 +0200 +++ new/lokalize-4.13.2/src/project/project.cpp 2014-05-17 04:39:28.000000000 +0200 @@ -123,6 +123,7 @@ { TM::CloseDBJob* closeDBJob=new TM::CloseDBJob(projectID(),this); connect(closeDBJob,SIGNAL(done(ThreadWeaver::Job*)),closeDBJob,SLOT(deleteLater())); + ThreadWeaver::Weaver::instance()->enqueue(closeDBJob); } ThreadWeaver::Weaver::instance()->finish();//more safety diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-4.13.1/src/tm/jobs.cpp new/lokalize-4.13.2/src/tm/jobs.cpp --- old/lokalize-4.13.1/src/tm/jobs.cpp 2014-05-06 23:59:36.000000000 +0200 +++ new/lokalize-4.13.2/src/tm/jobs.cpp 2014-05-17 04:39:28.000000000 +0200 @@ -1520,7 +1520,7 @@ QRegExp rxClean1(c.markup);rxClean1.setMinimal(true); Catalog catalog(thread()); - if (KDE_ISLIKELY(catalog.loadFromUrl(m_url, KUrl(), &m_size)==0)) + if (KDE_ISLIKELY(catalog.loadFromUrl(m_url, KUrl(), &m_size, true)==0)) { if (c.targetLangCode!=catalog.targetLangCode()) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
