Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2015-05-15 10:03:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-11 19:22:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2015-05-15 10:03:45.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 11 11:17:56 UTC 2015 - [email protected] + +- Update to KDE Applications 15.04.1 + * KDE Applications 15.04.1 + * https://www.kde.org/announcements/announce-applications-15.04.1.php + + +------------------------------------------------------------------- Old: ---- okular-15.04.0.tar.xz New: ---- okular-15.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.PyqYY6/_old 2015-05-15 10:03:45.000000000 +0200 +++ /var/tmp/diff_new_pack.PyqYY6/_new 2015-05-15 10:03:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: okular -Version: 15.04.0 +Version: 15.04.1 Release: 0 Summary: Document Viewer License: GPL-2.0+ ++++++ okular-15.04.0.tar.xz -> okular-15.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.04.0/VERSION new/okular-15.04.1/VERSION --- old/okular-15.04.0/VERSION 2015-04-07 22:37:49.000000000 +0200 +++ new/okular-15.04.1/VERSION 2015-05-02 14:49:49.000000000 +0200 @@ -1 +1 @@ -okular v0.22.0 +okular v0.22.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.04.0/cmake/modules/FindLibSpectre.cmake new/okular-15.04.1/cmake/modules/FindLibSpectre.cmake --- old/okular-15.04.0/cmake/modules/FindLibSpectre.cmake 2015-04-07 22:37:49.000000000 +0200 +++ new/okular-15.04.1/cmake/modules/FindLibSpectre.cmake 2015-05-02 14:49:49.000000000 +0200 @@ -20,42 +20,34 @@ else(LIBSPECTRE_INCLUDE_DIR AND LIBSPECTRE_LIBRARY) if(NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) - - PKGCONFIG(libspectre _SpectreIncDir _SpectreLinkDir _SpectreLinkFlags _SpectreCflags) - - if(_SpectreLinkFlags) - # find again pkg-config, to query it about libspectre version - FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/bin/ /usr/local/bin ) - - # query pkg-config asking for a libspectre >= LIBSPECTRE_MINIMUM_VERSION - EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${LIBSPECTRE_MINIMUM_VERSION} libspectre RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) - if(_return_VALUE STREQUAL "0") - set(LIBSPECTRE_INTERNAL_FOUND TRUE) - endif(_return_VALUE STREQUAL "0") - endif(_SpectreLinkFlags) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + include(FindPkgConfig) + + if(LIBSPECTRE_MINIMUM_VERSION}) + pkg_check_modules(_pc_LIBSPECTRE libspectre>=${LIBSPECTRE_MINIMUM_VERSION}) + else(LIBSPECTRE_MINIMUM_VERSION}) + pkg_check_modules(_pc_LIBSPECTRE libspectre) + endif(LIBSPECTRE_MINIMUM_VERSION}) else(NOT WIN32) - # do not use pkg-config on windows - find_library(_SpectreLinkFlags NAMES libspectre spectre PATHS ${CMAKE_LIBRARY_PATH}) - - find_path(LIBSPECTRE_INCLUDE_DIR spectre.h PATH_SUFFIXES libspectre ) - - set(LIBSPECTRE_INTERNAL_FOUND TRUE) + # do not use pkg-config on windows + set(_pc_LIBSPECTRE_FOUND TRUE) endif(NOT WIN32) -if (LIBSPECTRE_INTERNAL_FOUND) - set(LIBSPECTRE_LIBRARY ${_SpectreLinkFlags}) - # the cflags for libspectre can contain more than one include path - separate_arguments(_SpectreCflags) - foreach(_includedir ${_SpectreCflags}) - string(REGEX REPLACE "-I(.+)" "\\1" _includedir "${_includedir}") - set(LIBSPECTRE_INCLUDE_DIR ${LIBSPECTRE_INCLUDE_DIR} ${_includedir}) - endforeach(_includedir) +if(_pc_LIBSPECTRE_FOUND) + find_library(LIBSPECTRE_LIBRARY + NAMES libspectre spectre + HINTS ${_pc_LIBSPECTRE_LIBRARY_DIRS} ${CMAKE_LIBRARY_PATH} + ) + + find_path(LIBSPECTRE_INCLUDE_DIR spectre.h + HINTS ${_pc_LIBSPECTRE_INCLUDE_DIRS} + PATH_SUFFIXES libspectre + ) -endif (LIBSPECTRE_INTERNAL_FOUND) + set(LIBSPECTRE_INTERNAL_FOUND TRUE) +endif(_pc_LIBSPECTRE_FOUND) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LibSpectre DEFAULT_MSG LIBSPECTRE_LIBRARY LIBSPECTRE_INTERNAL_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.04.0/core/version.h new/okular-15.04.1/core/version.h --- old/okular-15.04.0/core/version.h 2015-04-07 22:37:49.000000000 +0200 +++ new/okular-15.04.1/core/version.h 2015-05-02 14:49:49.000000000 +0200 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.22.0" +#define OKULAR_VERSION_STRING "0.22.1" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 22 -#define OKULAR_VERSION_RELEASE 0 +#define OKULAR_VERSION_RELEASE 1 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define OKULAR_VERSION \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.04.0/interfaces/viewerinterface.h new/okular-15.04.1/interfaces/viewerinterface.h --- old/okular-15.04.0/interfaces/viewerinterface.h 2015-04-07 22:37:49.000000000 +0200 +++ new/okular-15.04.1/interfaces/viewerinterface.h 2015-05-02 14:49:49.000000000 +0200 @@ -23,7 +23,7 @@ * This interface can be used to control some more or less advanced features of a document * viewer. */ -class ViewerInterface +class OKULAR_EXPORT ViewerInterface { public: virtual ~ViewerInterface() {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.04.0/kdocumentviewer.h new/okular-15.04.1/kdocumentviewer.h --- old/okular-15.04.0/kdocumentviewer.h 2015-04-07 22:37:49.000000000 +0200 +++ new/okular-15.04.1/kdocumentviewer.h 2015-05-02 14:49:49.000000000 +0200 @@ -10,6 +10,8 @@ #ifndef _KDOCUMENTVIEWER_H_ #define _KDOCUMENTVIEWER_H_ +#include "okular_part_export.h" + #include <QtCore/QStringList> class KUrl; @@ -19,7 +21,7 @@ * * This interface describe briefly the basic functions of a document viewer. */ -class KDocumentViewer +class OKULAR_PART_EXPORT KDocumentViewer { public: virtual ~KDocumentViewer() {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.04.0/ui/magnifierview.cpp new/okular-15.04.1/ui/magnifierview.cpp --- old/okular-15.04.0/ui/magnifierview.cpp 2015-04-07 22:37:49.000000000 +0200 +++ new/okular-15.04.1/ui/magnifierview.cpp 2015-05-02 14:49:49.000000000 +0200 @@ -35,6 +35,12 @@ , m_document(document) , m_page(0) { + document->addObserver(this); +} + +MagnifierView::~MagnifierView() +{ + m_document->removeObserver(this); } void MagnifierView::notifySetup(const QVector< Okular::Page* >& pages, int setupFlags) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.04.0/ui/magnifierview.h new/okular-15.04.1/ui/magnifierview.h --- old/okular-15.04.0/ui/magnifierview.h 2015-04-07 22:37:49.000000000 +0200 +++ new/okular-15.04.1/ui/magnifierview.h 2015-05-02 14:49:49.000000000 +0200 @@ -30,6 +30,7 @@ public: MagnifierView( Okular::Document *document, QWidget *parent = 0 ); + ~MagnifierView(); void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags ); void notifyPageChanged( int page, int flags ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-15.04.0/ui/pageview.cpp new/okular-15.04.1/ui/pageview.cpp --- old/okular-15.04.0/ui/pageview.cpp 2015-04-07 22:37:49.000000000 +0200 +++ new/okular-15.04.1/ui/pageview.cpp 2015-05-02 14:49:49.000000000 +0200 @@ -396,7 +396,6 @@ d->magnifierView = new MagnifierView(document, this); d->magnifierView->hide(); d->magnifierView->setGeometry(0, 0, 351, 201); // TODO: more dynamic? - document->addObserver(d->magnifierView); connect(document, SIGNAL(processMovieAction(const Okular::MovieAction*)), this, SLOT(slotProcessMovieAction(const Okular::MovieAction*))); connect(document, SIGNAL(processRenditionAction(const Okular::RenditionAction*)), this, SLOT(slotProcessRenditionAction(const Okular::RenditionAction*)));
