Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2015-03-11 09:54:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/okular (Old) and /work/SRC/openSUSE:Factory/.okular.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "okular" Changes: -------- --- /work/SRC/openSUSE:Factory/okular/okular.changes 2015-02-11 16:41:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2015-03-11 09:54:42.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 3 10:46:31 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 14.12.3 + * KDE Applications 14.12.3 + * See https://www.kde.org/announcements/announce-applications-14.12.3.php + +------------------------------------------------------------------- Old: ---- okular-14.12.2.tar.xz New: ---- okular-14.12.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.cROOrq/_old 2015-03-11 09:54:43.000000000 +0100 +++ /var/tmp/diff_new_pack.cROOrq/_new 2015-03-11 09:54:43.000000000 +0100 @@ -17,7 +17,7 @@ Name: okular -Version: 14.12.2 +Version: 14.12.3 Release: 0 Summary: Document Viewer License: GPL-2.0+ ++++++ okular-14.12.2.tar.xz -> okular-14.12.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-14.12.2/VERSION new/okular-14.12.3/VERSION --- old/okular-14.12.2/VERSION 2015-01-29 19:52:52.000000000 +0100 +++ new/okular-14.12.3/VERSION 2015-02-27 01:22:09.000000000 +0100 @@ -1 +1 @@ -okular v0.21.2 +okular v0.21.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-14.12.2/core/document.cpp new/okular-14.12.3/core/document.cpp --- old/okular-14.12.2/core/document.cpp 2015-01-29 19:52:52.000000000 +0100 +++ new/okular-14.12.3/core/document.cpp 2015-02-27 01:22:09.000000000 +0100 @@ -909,6 +909,7 @@ QString propName = offer->name(); QHash< QString, GeneratorInfo >::const_iterator genIt = m_loadedGenerators.constFind( propName ); QString catalogName; + m_walletGenerator = 0; if ( genIt != m_loadedGenerators.constEnd() ) { m_generator = genIt.value().generator; @@ -978,6 +979,8 @@ m_generator->d_func()->m_document = 0; QObject::disconnect( m_generator, 0, m_parent, 0 ); + // TODO this is a hack just for 14.12 not to break API + m_walletGenerator = m_generator; m_generator = 0; qDeleteAll( m_pagesVector ); @@ -2560,6 +2563,7 @@ } d->m_generator = 0; d->m_generatorName = QString(); + d->m_walletGenerator = 0; d->m_url = KUrl(); d->m_docFileName = QString(); d->m_xmlFileName = QString(); @@ -4550,6 +4554,8 @@ { if (d->m_generator) { d->m_generator->walletDataForFile( fileName, walletName, walletFolder, walletKey ); + } else if (d->m_walletGenerator) { + d->m_walletGenerator->walletDataForFile( fileName, walletName, walletFolder, walletKey ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-14.12.2/core/document_p.h new/okular-14.12.3/core/document_p.h --- old/okular-14.12.2/core/document_p.h 2015-01-29 19:52:52.000000000 +0100 +++ new/okular-14.12.3/core/document_p.h 2015-02-27 01:22:09.000000000 +0100 @@ -92,6 +92,7 @@ m_memCheckTimer( 0 ), m_saveBookmarksTimer( 0 ), m_generator( 0 ), + m_walletGenerator( 0 ), m_generatorsLoaded( false ), m_pageController( 0 ), m_closingLoop( 0 ), @@ -246,6 +247,7 @@ QHash<QString, GeneratorInfo> m_loadedGenerators; Generator * m_generator; QString m_generatorName; + Generator * m_walletGenerator; bool m_generatorsLoaded; QVector< Page * > m_pagesVector; QVector< VisiblePageRect * > m_pageRects; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-14.12.2/core/version.h new/okular-14.12.3/core/version.h --- old/okular-14.12.2/core/version.h 2015-01-29 19:52:52.000000000 +0100 +++ new/okular-14.12.3/core/version.h 2015-02-27 01:22:09.000000000 +0100 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.21.2" +#define OKULAR_VERSION_STRING "0.21.3" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 21 -#define OKULAR_VERSION_RELEASE 2 +#define OKULAR_VERSION_RELEASE 3 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define OKULAR_VERSION \ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
