Hello community,
here is the log from the commit of package mobipocket for openSUSE:Factory checked in at 2013-12-02 12:33:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mobipocket (Old)
and /work/SRC/openSUSE:Factory/.mobipocket.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mobipocket"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mobipocket/mobipocket.changes 2013-10-03 16:05:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mobipocket.new/mobipocket.changes 2013-12-02 12:33:27.000000000 +0100
@@ -1,0 +2,21 @@
+Sat Nov 16 18:00:51 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.11.90
+ * KDE 4.12 Beta 2 release
+ * See http://www.kde.org/announcements/announce-4.12-beta2.php
+
+-------------------------------------------------------------------
+Sat Nov 9 23:02:16 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.11.80
+ * KDE 4.12 Beta 1 release
+ * See http://www.kde.org/announcements/announce-4.12-beta1.php
+
+-------------------------------------------------------------------
+Sat Nov 2 15:15:38 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.11.3
+ * KDE 4.11.3 bugfix release
+ * See http://www.kde.org/announcements/announce-4.11.3.php
+
+-------------------------------------------------------------------
Old:
----
kdegraphics-mobipocket-4.11.2.tar.xz
New:
----
kdegraphics-mobipocket-4.11.90.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mobipocket.spec ++++++
--- /var/tmp/diff_new_pack.ly1BcZ/_old 2013-12-02 12:33:27.000000000 +0100
+++ /var/tmp/diff_new_pack.ly1BcZ/_new 2013-12-02 12:33:27.000000000 +0100
@@ -17,22 +17,34 @@
Name: mobipocket
-Version: 4.11.2
+Version: 4.11.90
Release: 0
-Summary: E-book plugin for Okular
+Summary: E-book plugin and library
License: GPL-2.0+
Group: Productivity/Office/Other
Url: http://www.kde.org
Source: kdegraphics-mobipocket-%{version}.tar.xz
-BuildRequires: okular-devel
+BuildRequires: libkde4-devel
BuildRequires: strigi-devel
BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%kde4_runtime_requires
%description
Mobipocket E-book support for Okular.
+%package devel
+Summary: E-book plugin and library
+Group: System/GUI/KDE
+Requires: %{name} = %{version}
+Requires: libkde4-devel
+Requires: strigi-devel
+
+%description devel
+Mobipocket E-book plugin and library.
+
+This package provides development files for mobipocket
+library
+
%prep
%setup -q -n kdegraphics-mobipocket-%{version}
@@ -41,18 +53,24 @@
%make_jobs
%install
- cd build
- %kde4_makeinstall
+ %kde4_makeinstall -C build
%kde_post_install
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
%files
%defattr(-,root,root)
-%{_kde4_applicationsdir}/okularApplication_mobi.desktop
+%{_kde4_libdir}/libqmobipocket.so.*
%{_kde4_libdir}/strigi/
%{_kde4_modulesdir}/mobithumbnail.so
-%{_kde4_modulesdir}/okularGenerator_mobi.so
-%{_kde4_servicesdir}/libokularGenerator_mobi.desktop
%{_kde4_servicesdir}/mobithumbnail.desktop
-%{_kde4_servicesdir}/okularMobi.desktop
+
+%files devel
+%defattr(-,root,root)
+%{_kde4_libdir}/libqmobipocket.so
+%{_kde4_libdir}/cmake/QMobipocket/
+%{_kde4_includedir}/qmobipocket/
%changelog
++++++ kdegraphics-mobipocket-4.11.2.tar.xz -> kdegraphics-mobipocket-4.11.90.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/CMakeLists.txt new/kdegraphics-mobipocket-4.11.90/CMakeLists.txt
--- old/kdegraphics-mobipocket-4.11.2/CMakeLists.txt 2013-06-28 19:36:09.000000000 +0200
+++ new/kdegraphics-mobipocket-4.11.90/CMakeLists.txt 2013-11-04 21:42:18.000000000 +0100
@@ -5,22 +5,21 @@
include(MacroLibrary)
include(MacroOptionalAddSubdirectory)
-find_package(Okular)
-macro_log_feature(OKULAR_FOUND "okular" "Provides an Okular backend for Mobipocket documents" "http://okular.kde.org/" FALSE "" "")
-
find_package(Strigi)
macro_log_feature(STRIGI_FOUND "strigi libraries" "Provide a strigi analyzer for Mobipocket documents" "" FALSE "" "")
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include_directories(${KDE4_INCLUDES})
+add_subdirectory(lib)
+
macro_optional_add_subdirectory(thumbnailers)
-if(OKULAR_FOUND)
- macro_optional_add_subdirectory(okular)
-endif()
if(STRIGI_FOUND)
macro_optional_add_subdirectory(strigi)
endif()
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/QMobipocketConfig.cmake
+ DESTINATION ${LIB_INSTALL_DIR}/cmake/QMobipocket )
+
macro_display_feature_log()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/QMobipocketConfig.cmake new/kdegraphics-mobipocket-4.11.90/QMobipocketConfig.cmake
--- old/kdegraphics-mobipocket-4.11.2/QMobipocketConfig.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/kdegraphics-mobipocket-4.11.90/QMobipocketConfig.cmake 2013-11-04 21:42:18.000000000 +0100
@@ -0,0 +1,20 @@
+get_filename_component( _currentDir ${CMAKE_CURRENT_LIST_FILE} PATH)
+get_filename_component( _currentDir ${_currentDir} PATH)
+get_filename_component( _currentDir ${_currentDir} PATH)
+get_filename_component( _currentDir ${_currentDir} PATH)
+
+# find the full paths to the library and the includes:
+find_path(QMOBIPOCKET_INCLUDE_DIR qmobipocket/mobipocket.h
+ HINTS ${_currentDir}/include
+ NO_DEFAULT_PATH)
+
+find_library(QMOBIPOCKET_LIBRARY qmobipocket
+ HINTS ${_currentDir}/lib
+ NO_DEFAULT_PATH)
+
+set(QMOBIPOCKET_LIBRARIES ${QMOBIPOCKET_LIBRARY})
+
+if(QMOBIPOCKET_INCLUDE_DIR AND QMOBIPOCKET_LIBRARY)
+ set(QMOBIPOCKET_FOUND TRUE)
+endif()
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/lib/CMakeLists.txt new/kdegraphics-mobipocket-4.11.90/lib/CMakeLists.txt
--- old/kdegraphics-mobipocket-4.11.2/lib/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/kdegraphics-mobipocket-4.11.90/lib/CMakeLists.txt 2013-11-04 21:42:18.000000000 +0100
@@ -0,0 +1,23 @@
+
+set (QMOBIPOCKET_SRCS
+ decompressor.cpp
+ mobipocket.cpp
+ qfilestream.cpp
+)
+
+kde4_add_library(qmobipocket SHARED ${QMOBIPOCKET_SRCS})
+
+target_link_libraries (qmobipocket
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+)
+
+install(FILES
+ mobipocket.h
+ qmobipocket_export.h
+ qfilestream.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/qmobipocket/ COMPONENT Devel
+)
+
+install(TARGETS qmobipocket ${INSTALL_TARGETS_DEFAULT_ARGS})
+set_target_properties(qmobipocket PROPERTIES VERSION 1.0.0 SOVERSION 1 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/lib/mobipocket.h new/kdegraphics-mobipocket-4.11.90/lib/mobipocket.h
--- old/kdegraphics-mobipocket-4.11.2/lib/mobipocket.h 2013-06-28 19:36:09.000000000 +0200
+++ new/kdegraphics-mobipocket-4.11.90/lib/mobipocket.h 2013-11-04 21:42:18.000000000 +0100
@@ -15,6 +15,8 @@
#include
#include
+#include "qmobipocket_export.h"
+
class QIODevice;
namespace Mobipocket {
@@ -23,7 +25,7 @@
Minimalistic stream abstraction. It is supposed to allow mobipocket document classes to be
used with both QIODevice (for Okular generator) and InputStream for Strigi analyzer.
*/
-class Stream {
+class QMOBIPOCKET_EXPORT Stream {
public:
virtual int read(char* buf, int size)=0;
virtual bool seek(int pos)=0;
@@ -47,7 +49,7 @@
};
struct DocumentPrivate;
-class Document {
+class QMOBIPOCKET_EXPORT Document {
public:
enum MetaKey { Title, Author, Copyright, Description, Subject };
~Document();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/lib/qfilestream.cpp new/kdegraphics-mobipocket-4.11.90/lib/qfilestream.cpp
--- old/kdegraphics-mobipocket-4.11.2/lib/qfilestream.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/kdegraphics-mobipocket-4.11.90/lib/qfilestream.cpp 2013-11-04 21:42:18.000000000 +0100
@@ -0,0 +1,33 @@
+/***************************************************************************
+ * Copyright (C) 2008 by Jakub Stachowski *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ ***************************************************************************/
+
+#include "qfilestream.h"
+
+using namespace Mobipocket;
+
+QFileStream::QFileStream(const QString& name)
+ : d(new QFile(name))
+{
+ d->open(QIODevice::ReadOnly);
+}
+
+QFileStream::~QFileStream()
+{
+ delete d;
+}
+
+int QFileStream::read(char* buf, int size)
+{
+ return d->read(buf,size);
+}
+
+bool QFileStream::seek(int pos)
+{
+ return d->seek(pos);
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/lib/qfilestream.h new/kdegraphics-mobipocket-4.11.90/lib/qfilestream.h
--- old/kdegraphics-mobipocket-4.11.2/lib/qfilestream.h 2013-06-28 19:36:09.000000000 +0200
+++ new/kdegraphics-mobipocket-4.11.90/lib/qfilestream.h 2013-11-04 21:42:18.000000000 +0100
@@ -15,14 +15,15 @@
namespace Mobipocket {
-class QFileStream : public Stream
+class QMOBIPOCKET_EXPORT QFileStream : public Stream
{
public:
- QFileStream(const QString& name) : d(name) { d.open(QIODevice::ReadOnly); }
- int read(char* buf, int size) { return d.read(buf,size); }
- bool seek(int pos) { return d.seek(pos); }
+ QFileStream(const QString& name);
+ ~QFileStream();
+ int read(char* buf, int size);
+ bool seek(int pos);
private:
- QFile d;
+ QFile *d;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/lib/qmobipocket_export.h new/kdegraphics-mobipocket-4.11.90/lib/qmobipocket_export.h
--- old/kdegraphics-mobipocket-4.11.2/lib/qmobipocket_export.h 1970-01-01 01:00:00.000000000 +0100
+++ new/kdegraphics-mobipocket-4.11.90/lib/qmobipocket_export.h 2013-11-04 21:42:18.000000000 +0100
@@ -0,0 +1,37 @@
+/* This file is part of the KDE project
+ Copyright (C) 2007 David Faure
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of
+ the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see http://www.gnu.org/licenses/.
+*/
+
+#ifndef _QMOBIPOCKET_EXPORT_H
+#define _QMOBIPOCKET_EXPORT_H
+
+/* needed for KDE_EXPORT and KDE_IMPORT macros */
+#include
+
+#ifndef QMOBIPOCKET_EXPORT
+# if defined(KDELIBS_STATIC_LIBS)
+ /* No export/import for static libraries */
+# define QMOBIPOCKET_EXPORT
+# elif defined(MAKE_QMOBIPOCKET_LIB)
+ /* We are building this library */
+# define QMOBIPOCKET_EXPORT KDE_EXPORT
+# else
+ /* We are using this library */
+# define QMOBIPOCKET_EXPORT KDE_IMPORT
+# endif
+#endif
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/okular/CMakeLists.txt new/kdegraphics-mobipocket-4.11.90/okular/CMakeLists.txt
--- old/kdegraphics-mobipocket-4.11.2/okular/CMakeLists.txt 2013-08-28 19:06:53.000000000 +0200
+++ new/kdegraphics-mobipocket-4.11.90/okular/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-include_directories(
- ${OKULAR_INCLUDE_DIR}
- ${PROJECT_SOURCE_DIR}/lib
- )
-
-########### next target ###############
-
-set(okularGenerator_mobi_PART_SRCS
- ${PROJECT_SOURCE_DIR}/lib/mobipocket.cpp
- ${PROJECT_SOURCE_DIR}/lib/decompressor.cpp
- mobidocument.cpp
- generator_mobi.cpp
- converter.cpp
-)
-
-kde4_add_plugin(okularGenerator_mobi ${okularGenerator_mobi_PART_SRCS})
-
-target_link_libraries(okularGenerator_mobi ${OKULAR_CORE_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
-
-install(TARGETS okularGenerator_mobi DESTINATION ${PLUGIN_INSTALL_DIR})
-
-########### install files ###############
-
-install( FILES libokularGenerator_mobi.desktop okularMobi.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS okularApplication_mobi.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/okular/Messages.sh new/kdegraphics-mobipocket-4.11.90/okular/Messages.sh
--- old/kdegraphics-mobipocket-4.11.2/okular/Messages.sh 2013-06-28 19:36:09.000000000 +0200
+++ new/kdegraphics-mobipocket-4.11.90/okular/Messages.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-#!/bin/sh
-$XGETTEXT *.cpp -o $podir/okular_mobi.pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/okular/converter.cpp new/kdegraphics-mobipocket-4.11.90/okular/converter.cpp
--- old/kdegraphics-mobipocket-4.11.2/okular/converter.cpp 2013-06-28 19:36:09.000000000 +0200
+++ new/kdegraphics-mobipocket-4.11.90/okular/converter.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,107 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2008 by Jakub Stachowski *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- ***************************************************************************/
-
-#include "converter.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include "mobipocket.h"
-
-#include
-#include
-
-using namespace Mobi;
-
-Converter::Converter()
-{
-
-}
-
-Converter::~Converter()
-{
-}
-
-void Converter::handleMetadata(const QMapMobipocket::Document::MetaKey,QString metadata)
-{
- QMapIteratorMobipocket::Document::MetaKey,QString it(metadata);
- while (it.hasNext()) {
- it.next();
- switch (it.key()) {
- case Mobipocket::Document::Title: addMetaData(Okular::DocumentInfo::Title, it.value()); break;
- case Mobipocket::Document::Author: addMetaData(Okular::DocumentInfo::Author, it.value()); break;
- case Mobipocket::Document::Description: addMetaData(Okular::DocumentInfo::Description, it.value()); break;
- case Mobipocket::Document::Subject: addMetaData(Okular::DocumentInfo::Subject, it.value()); break;
- case Mobipocket::Document::Copyright: addMetaData(Okular::DocumentInfo::Copyright, it.value()); break;
- }
- }
-}
-
-QTextDocument* Converter::convert( const QString &fileName )
-{
- MobiDocument* newDocument=new MobiDocument(fileName);
- if (!newDocument->mobi()->isValid()) {
- emit error(i18n("Error while opening the Mobipocket document."), -1);
- delete newDocument;
- return NULL;
- }
- if (newDocument->mobi()->hasDRM()) {
- emit error(i18n("This book is protected by DRM and can be displayed only on designated device"), -1);
- delete newDocument;
- return NULL;
- }
-
- handleMetadata(newDocument->mobi()->metadata());
- newDocument->setPageSize(QSizeF(600, 800));
-
- QTextFrameFormat frameFormat;
- frameFormat.setMargin( 20 );
- QTextFrame *rootFrame = newDocument->rootFrame();
- rootFrame->setFrameFormat( frameFormat );
- QMap > links;
- QMap targets;
-
- // go over whole document and add all <a> tags to links or targets map
- for (QTextBlock it = newDocument->begin(); it != newDocument->end(); it = it.next())
- for (QTextBlock::iterator fit=it.begin(); !fit.atEnd(); ++fit) {
- QTextFragment frag=fit.fragment();
- QTextCharFormat format=frag.charFormat();
- if (!format.isAnchor()) continue;
- //link
- if (!format.anchorHref().isEmpty()) links[format.anchorHref()]=
- QPair(frag.position(), frag.position()+frag.length());
- if (!format.anchorNames().isEmpty()) {
- // link targets
- Q_FOREACH(const QString& name, format.anchorNames())
- targets['#'+name]=it;
- }
- }
-
- // create link actions
- QMapIterator > it(links);
- while (it.hasNext()) {
- it.next();
- QUrl u(it.key());
- // external or internal link
- if (!u.isRelative()) emit addAction(new Okular::BrowseAction(it.key()), it.value().first, it.value().second);
- else {
- // is there valid target?
- if (!targets.contains( it.key() ) || !targets[it.key()].isValid()) continue;
- emit addAction(new Okular::GotoAction(QString(), calculateViewport( newDocument, targets[it.key()] )),
- it.value().first, it.value().second);
- }
-
- }
-
- return newDocument;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/okular/converter.h new/kdegraphics-mobipocket-4.11.90/okular/converter.h
--- old/kdegraphics-mobipocket-4.11.2/okular/converter.h 2013-06-28 19:36:09.000000000 +0200
+++ new/kdegraphics-mobipocket-4.11.90/okular/converter.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2008 by Jakub Stachowski *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- ***************************************************************************/
-#ifndef MOBI_CONVERTER_H
-#define MOBI_CONVERTER_H
-
-#include
-#include
-
-#include "mobidocument.h"
-#include "mobipocket.h"
-
-
-namespace Mobi {
- class Converter : public Okular::TextDocumentConverter
- {
- public:
- Converter();
- ~Converter();
-
- virtual QTextDocument *convert( const QString &fileName );
- private:
- void handleMetadata(const QMap metadata);
- };
-}
-
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/okular/generator_mobi.cpp new/kdegraphics-mobipocket-4.11.90/okular/generator_mobi.cpp
--- old/kdegraphics-mobipocket-4.11.2/okular/generator_mobi.cpp 2013-08-28 19:06:53.000000000 +0200
+++ new/kdegraphics-mobipocket-4.11.90/okular/generator_mobi.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2008 by Ely Levy *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- ***************************************************************************/
-#include "generator_mobi.h"
-
-#include "converter.h"
-
-#include
-#include
-
-static KAboutData createAboutData()
-{
- KAboutData aboutData(
- "okular_mobi",
- "okular_mobi",
- ki18n("Mobipocket Backend"),
- "0.1",
- ki18n("A mobipocket backend"),
- KAboutData::License_GPL,
- ki18n("© 2008-2009 Jakub Stachowski")
- );
- aboutData.addAuthor(ki18n("Jakub Stachowski"), KLocalizedString(),
- "qbast@go2.pl");
-
- return aboutData;
-}
-
-OKULAR_EXPORT_PLUGIN( MobiGenerator, createAboutData() )
-
-MobiGenerator::MobiGenerator( QObject *parent, const QVariantList &args )
-: Okular::TextDocumentGenerator( new Mobi::Converter, "okular_mobi_generator_settings", parent, args )
-{
-}
-
-void MobiGenerator::addPages( KConfigDialog* dlg )
-{
- Okular::TextDocumentSettingsWidget *widget = new Okular::TextDocumentSettingsWidget();
-
- dlg->addPage( widget, generalSettings(), i18n("Mobipocket"), "application-x-mobipocket-ebook", i18n("Mobipocket Backend Configuration") );
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/okular/generator_mobi.h new/kdegraphics-mobipocket-4.11.90/okular/generator_mobi.h
--- old/kdegraphics-mobipocket-4.11.2/okular/generator_mobi.h 2013-08-28 19:06:53.000000000 +0200
+++ new/kdegraphics-mobipocket-4.11.90/okular/generator_mobi.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2008 by Ely Levy *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- ***************************************************************************/
-#ifndef OKULAR_GENERATOR_MOBI_H
-#define OKULAR_GENERATOR_MOBI_H
-#include
-
-class MobiGenerator : public Okular::TextDocumentGenerator
-{
- public:
- MobiGenerator( QObject *parent, const QVariantList &args );
- ~MobiGenerator() {}
-
- // [INHERITED] reparse configuration
- void addPages( KConfigDialog* dlg );
-};
-
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/okular/libokularGenerator_mobi.desktop new/kdegraphics-mobipocket-4.11.90/okular/libokularGenerator_mobi.desktop
--- old/kdegraphics-mobipocket-4.11.2/okular/libokularGenerator_mobi.desktop 2013-08-28 19:06:53.000000000 +0200
+++ new/kdegraphics-mobipocket-4.11.90/okular/libokularGenerator_mobi.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,120 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=Mobipocket document
-Name[ar]=مستند Mobipocket
-Name[ast]=Documentu Mobipocket
-Name[bg]=Документ Mobipocket
-Name[bs]=Mobipocket dokument
-Name[ca]=Document Mobipocket
-Name[ca@valencia]=Document Mobipocket
-Name[cs]=Mobipocket dokument
-Name[da]=Mobipocket-dokument
-Name[de]=Mobipocket-Dokument
-Name[el]=Έγγραφο Mobipocket
-Name[en_GB]=Mobipocket document
-Name[es]=Documento Mobipocket
-Name[et]=Mobipocketi dokument
-Name[eu]=Mobipocket dokumentua
-Name[fi]=Mobipocket-asiakirja
-Name[fr]=Document « Mobipocket »
-Name[ga]=Cáipéis Mobipocket
-Name[gl]=Documento Mobipocket
-Name[hr]=Dokument oblika Mobipocket
-Name[hu]=Mobipocket-dokumentum
-Name[ia]=Documento de Mobipocket
-Name[is]=Mobipocket skjal
-Name[it]=Documento Mobipocket
-Name[ja]=Mobipocket 文書
-Name[kk]=Mobipocket құжаты
-Name[km]=ឯកសារ Mobipocket
-Name[ko]=Mobipocket 문서
-Name[lt]=Mobipocket dokumentas
-Name[lv]=Mobipocket dokuments
-Name[mr]=मोबीपॉकेट दस्तऐवज
-Name[nb]=Mobipocket-dokument
-Name[nds]=Mobipocket-Dokment
-Name[nl]=Mobipocket-document
-Name[nn]=Mobipocket-dokument
-Name[pa]=ਮੋਬੀਪਾਕਟ ਡੌਕੂਮੈਂਟ
-Name[pl]=Dokument Mobipocket
-Name[pt]=Documento do Mobipocket
-Name[pt_BR]=Documento Mobipocket
-Name[ro]=Document Mobipocket
-Name[ru]=Документ Mobipocket
-Name[sk]=Mobipocket dokument
-Name[sl]=Dokument Mobipocket
-Name[sq]=Dokument Mobipocket
-Name[sr]=Мобипокет
-Name[sr@ijekavian]=Мобипокет
-Name[sr@ijekavianlatin]=Mobipocket
-Name[sr@latin]=Mobipocket
-Name[sv]=Mobipocket-dokument
-Name[th]=เอกสาร Mobipocket
-Name[tr]=Mobipocket belgesi
-Name[ug]=Mobipocket پۈتۈكى
-Name[uk]=Документ Mobipocket
-Name[x-test]=xxMobipocket documentxx
-Name[zh_CN]=Mobipocket 文档
-Name[zh_TW]=Mobipocket 文件
-Comment=Mobipocket backend for Okular
-Comment[ar]=خلفية Mobipocket لأوكلار
-Comment[ast]=Motor Mobipocket pa Okular
-Comment[bg]=Ядро на Okular за Mobipocket
-Comment[bs]=Pozadina Mobipocketa za Okular
-Comment[ca]=Dorsal de Mobipocket per a l'Okular
-Comment[ca@valencia]=Dorsal de Mobipocket per a l'Okular
-Comment[cs]= Implementace Mobipocket pro Okular
-Comment[da]=Mobipocket-motor til Okular
-Comment[de]=Ein Anzeigemodul für Mobipocket-Dateien in Okular
-Comment[el]=Σύστημα υποστήριξης Mobipocket για το Okular
-Comment[en_GB]=Mobipocket backend for Okular
-Comment[es]=Motor Mobipocket para Okular
-Comment[et]=Okulari Mobipocketi taustaprogramm
-Comment[eu]=Okular-en Mobipocket motorra
-Comment[fi]=Mobipocket-taustaosa Okular-lukijalle
-Comment[fr]=Moteur Mobipocket pour Okular
-Comment[ga]=Inneall Mobipocket le haghaidh Okular
-Comment[gl]=Infraestrutura de Mobipocket para Okular
-Comment[hr]=Podrška za Mobipocket za Okular
-Comment[hu]=Mobipocket-bővítmény az Okularhoz
-Comment[ia]=Retro-administration de Mobipocket pro Okular
-Comment[is]=Mobipocket stuðningur fyrir Okular
-Comment[it]=Backend Mobipocket per Okular
-Comment[ja]=Okular の Mobipocket 用バックエンド
-Comment[kk]=Okular-дың Mobipocket тетігі
-Comment[km]=កម្មវិធីខាងក្រោយសម្រាប់ Mobipocket សម្រាប់ Okular
-Comment[ko]=Okular의 Mobipocket 백엔드
-Comment[lt]=Mobipocket programinė sąsaja, skirta Okular
-Comment[lv]=Mobipocket Okular aizmugure
-Comment[mr]=ओक्युलर करिता मोबीपॉकेट बॅकएन्ड
-Comment[nb]=Mobipocket-motor for okular
-Comment[nds]=Mobipocket-Hülppropgramm för Okular
-Comment[nl]=Mobipocket-backend voor Okular
-Comment[nn]=Mobipocket-motor for Okular
-Comment[pa]=ਓਕੁਲਾਰ ਲਈ ਮੋਬੀਪਾਕਟ ਬੈਕਐਂਡ
-Comment[pl]=Obsługa formatu Mobipocket dla Okulara
-Comment[pt]=Infra-estrutura do Mobipocket para o Okular
-Comment[pt_BR]=Infraestrutura Mobipocket para o Okular
-Comment[ro]=Platformă Mobipocket pentru Okular
-Comment[ru]=Модуль поддержки формата Mobipocket для Okular
-Comment[sk]=Backend Mobipocket pre Okular
-Comment[sl]=Zaledje Mobipocket za Okular
-Comment[sq]=Mbështetje Mobipocket për Okular
-Comment[sr]=Позадина Мобипокета за Окулар
-Comment[sr@ijekavian]=Позадина Мобипокета за Окулар
-Comment[sr@ijekavianlatin]=Pozadina Mobipocketa za Okular
-Comment[sr@latin]=Pozadina Mobipocketa za Okular
-Comment[sv]=Mobipocket-gränssnitt för Okular
-Comment[th]=แบ็กเอนด์แฟ้มแบบ Mobipocket สำหรับโอกูลาร์
-Comment[tr]=Okular için Mobipocket arka ucu
-Comment[ug]=Okular نىڭ Mobipocket ئارقائۇچى
-Comment[uk]=Модуль Mobipocket для Okular
-Comment[x-test]=xxMobipocket backend for Okularxx
-Comment[zh_CN]=Okular 的 Mobipocket 格式后端
-Comment[zh_TW]=Okular 的 Mobipocket 後端介面
-X-KDE-ServiceTypes=okular/Generator
-MimeType=application/x-mobipocket-ebook;
-X-KDE-Library=okularGenerator_mobi
-X-KDE-Priority=1
-X-KDE-okularAPIVersion=1
-X-KDE-okularHasInternalSettings=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/okular/mobidocument.cpp new/kdegraphics-mobipocket-4.11.90/okular/mobidocument.cpp
--- old/kdegraphics-mobipocket-4.11.2/okular/mobidocument.cpp 2013-06-28 19:36:09.000000000 +0200
+++ new/kdegraphics-mobipocket-4.11.90/okular/mobidocument.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,99 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2008 by Jakub Stachowski *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- ***************************************************************************/
-#include "mobidocument.h"
-#include "mobipocket.h"
-#include "qfilestream.h"
-#include
-#include
-#include
-#include
-
-using namespace Mobi;
-
-MobiDocument::MobiDocument(const QString &fileName) : QTextDocument()
-{
- file = new Mobipocket::QFileStream(fileName);
- doc = new Mobipocket::Document(file);
- if (doc->isValid()) {
- QString text=doc->text();
- QString header=text.left(1024);
- if (header.contains("<html>") || header.contains("<HTML>")) setHtml(fixMobiMarkup(text));
- else setPlainText(text);
- }
-}
-
-MobiDocument::~MobiDocument()
-{
- delete doc;
- delete file;
-}
-
-QVariant MobiDocument::loadResource(int type, const QUrl &name)
-{
- if (type!=QTextDocument::ImageResource || name.scheme()!=QString("pdbrec")) return QVariant();
- bool ok;
- quint16 recnum=name.path().mid(1).toUShort(&ok);
- if (!ok || recnum>=doc->imageCount()) return QVariant();
-
- QVariant resource;
- resource.setValue(doc->getImage(recnum-1));
- addResource(type, name, resource);
-
- return resource;
-}
-
-// starting from 'pos', find position in the string that is not inside a tag
-int outsideTag(const QString& data, int pos)
-{
- for (int i=pos-1;i>=0;i--) {
- if (data[i]=='>') return pos;
- if (data[i]=='<') return i;
- }
- return pos;
-}
-
-QString MobiDocument::fixMobiMarkup(const QString& data)
-{
- QString ret=data;
- QMap anchorPositions;
- static QRegExp anchors(" it(anchorPositions);
- while (it.hasNext()) {
- it.next();
- // link pointing outside the document, ignore
- if ( (it.key()+offset) >= ret.size()) continue;
- int fixedpos=outsideTag(ret, it.key()+offset);
- ret.insert(fixedpos,QString(" </a>"));
- // inserting anchor shifts all offsets after the anchor
- offset+=21+it.value().size();
- }
-
- // replace links referencing filepos with normal internal links
- ret.replace(anchors,"", Qt::CaseInsensitive);
-
- imgs.setMinimal(true);
- ret.replace(imgs,"");
- ret.replace("mbp:pagebreak/","</p>");
-
- return ret;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/okular/mobidocument.h new/kdegraphics-mobipocket-4.11.90/okular/mobidocument.h
--- old/kdegraphics-mobipocket-4.11.2/okular/mobidocument.h 2013-06-28 19:36:09.000000000 +0200
+++ new/kdegraphics-mobipocket-4.11.90/okular/mobidocument.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2008 by Jakub Stachowski *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- ***************************************************************************/
-#ifndef MOBI_DOCUMENT_H
-#define MOBI_DOCUMENT_H
-
-#include <QTextDocument>
-#include <QUrl>
-#include <QVariant>
-
-class QFile;
-namespace Mobipocket {
-class Document;
-class QFileStream;
-}
-
-namespace Mobi {
-
- class MobiDocument : public QTextDocument {
-
- public:
- MobiDocument(const QString &fileName);
- ~MobiDocument();
-
- Mobipocket::Document* mobi() const { return doc; }
-
- protected:
- virtual QVariant loadResource(int type, const QUrl &name);
-
- private:
- QString fixMobiMarkup(const QString& data);
- Mobipocket::Document *doc;
- Mobipocket::QFileStream* file;
- };
-
-}
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/okular/okularApplication_mobi.desktop new/kdegraphics-mobipocket-4.11.90/okular/okularApplication_mobi.desktop
--- old/kdegraphics-mobipocket-4.11.2/okular/okularApplication_mobi.desktop 2013-08-28 19:06:53.000000000 +0200
+++ new/kdegraphics-mobipocket-4.11.90/okular/okularApplication_mobi.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,180 +0,0 @@
-[Desktop Entry]
-MimeType=application/x-mobipocket-ebook;
-Terminal=false
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=Okular
-GenericName=Document Viewer
-GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
-GenericName[bg]=Преглед на доументи
-GenericName[bs]=Prikazivač dokumenata
-GenericName[ca]=Visualitzador de documents
-GenericName[ca@valencia]=Visualitzador de documents
-GenericName[cs]=Prohlížeč dokumentů
-GenericName[da]=Dokumentfremviser
-GenericName[de]=Dokumentenbetrachter
-GenericName[el]=Προβολέας εγγράφων
-GenericName[en_GB]=Document Viewer
-GenericName[eo]=Dokumenta rigardilo
-GenericName[es]=Visor de documentos
-GenericName[et]=Dokumendinäitaja
-GenericName[eu]=Dokumentu ikustailea
-GenericName[fa]=مشاهدهگر سند
-GenericName[fi]=Asiakirjan näyttöohjelma
-GenericName[fr]=Afficheur de documents
-GenericName[ga]=Amharcán Cáipéisí
-GenericName[gl]=Visor de documentos
-GenericName[hi]=दस्तावेज़ प्रदर्शक
-GenericName[hne]=कागद प्रदर्सक
-GenericName[hr]=Preglednik dokumenata
-GenericName[hu]=Dokumentumnézegető
-GenericName[ia]=Visor de documento
-GenericName[is]=Skjalaskoðari
-GenericName[it]=Visore di documenti
-GenericName[ja]=文書ビューア
-GenericName[kk]=Құжатты қарау құралы
-GenericName[km]=កម្មវិធីមើលឯកសារ
-GenericName[ko]=문서 뷰어
-GenericName[ku]=Nîşanderê Belgeyan
-GenericName[lt]=Dokumentų žiūryklė
-GenericName[lv]=Dokumentu skatītājs
-GenericName[mr]=दस्तऐवज प्रदर्शक
-GenericName[nb]=Dokumentviser
-GenericName[nds]=Dokmentkieker
-GenericName[ne]=कागजात दर्शक
-GenericName[nl]=Documentenviewer
-GenericName[nn]=Dokumentvisar
-GenericName[oc]=Visualizaire de documents
-GenericName[pa]=ਡੌਕੂਮੈਂਟ ਦਰਸ਼ਕ
-GenericName[pl]=Przeglądarka dokumentów
-GenericName[pt]=Visualizador de Documentos
-GenericName[pt_BR]=Visualizador de documentos
-GenericName[ro]=Vizualizor de documente
-GenericName[ru]=Просмотр документов
-GenericName[sk]=Prehliadač dokumentov
-GenericName[sl]=Pregledovalnik dokumentov
-GenericName[sq]=Shikues dokumentesh
-GenericName[sr]=Приказивач докумената
-GenericName[sr@ijekavian]=Приказивач докумената
-GenericName[sr@ijekavianlatin]=Prikazivač dokumenata
-GenericName[sr@latin]=Prikazivač dokumenata
-GenericName[sv]=Dokumentvisare
-GenericName[th]=เครื่องมือแสดงเอกสาร
-GenericName[tr]=Belge Gösterici
-GenericName[ug]=پۈتۈك كۆرگۈچ
-GenericName[uk]=Перегляд документів
-GenericName[x-test]=xxDocument Viewerxx
-GenericName[zh_CN]=文档查看器
-GenericName[zh_TW]=文件檢視器
-TryExec=okular
-Exec=okular %U %i -caption %c
-Icon=okular
-Type=Application
-InitialPreference=1
-Categories=Qt;KDE;Graphics;Viewer;
-NoDisplay=true
-X-KDE-Keywords=mobipocket
-X-KDE-Keywords[ar]=mobipocket
-X-KDE-Keywords[bg]=mobipocket
-X-KDE-Keywords[bs]=mobipocket
-X-KDE-Keywords[ca]=mobipocket
-X-KDE-Keywords[ca@valencia]=mobipocket
-X-KDE-Keywords[cs]=mobipocket
-X-KDE-Keywords[da]=mobipocket
-X-KDE-Keywords[de]=Mobipocket
-X-KDE-Keywords[el]=mobipocket
-X-KDE-Keywords[es]=mobipocket
-X-KDE-Keywords[et]=mobipocket
-X-KDE-Keywords[fi]=mobipocket
-X-KDE-Keywords[fr]=Mobipocket
-X-KDE-Keywords[ga]=mobipocket
-X-KDE-Keywords[gl]=mobipocket
-X-KDE-Keywords[hu]=mobipocket
-X-KDE-Keywords[ia]=mobipocket
-X-KDE-Keywords[is]=mobipocket
-X-KDE-Keywords[it]=mobipocket
-X-KDE-Keywords[kk]=mobipocket
-X-KDE-Keywords[km]=mobipocket
-X-KDE-Keywords[ko]=mobipocket
-X-KDE-Keywords[lt]=mobipocket
-X-KDE-Keywords[lv]=mobipocket
-X-KDE-Keywords[mr]=मोबीपॉकेट
-X-KDE-Keywords[nb]=mobipocket
-X-KDE-Keywords[nds]=Mobipocket
-X-KDE-Keywords[nl]=mobipocket
-X-KDE-Keywords[pa]=ਮੋਬੀਪਾਕਟ
-X-KDE-Keywords[pl]=mobipocket
-X-KDE-Keywords[pt]=Mobipocket
-X-KDE-Keywords[pt_BR]=mobipocket
-X-KDE-Keywords[ro]=mobipocket
-X-KDE-Keywords[ru]=mobipocket,электронная книга
-X-KDE-Keywords[sk]=mobipocket
-X-KDE-Keywords[sl]=mobipocket,mobi
-X-KDE-Keywords[sr]=mobipocket,Мобипокет
-X-KDE-Keywords[sr@ijekavian]=mobipocket,Мобипокет
-X-KDE-Keywords[sr@ijekavianlatin]=mobipocket,Mobipocket
-X-KDE-Keywords[sr@latin]=mobipocket,Mobipocket
-X-KDE-Keywords[sv]=mobipocket
-X-KDE-Keywords[tr]=mobipocket
-X-KDE-Keywords[uk]=mobipocket,мобіпокет
-X-KDE-Keywords[x-test]=xxmobipocketxx
-X-KDE-Keywords[zh_CN]=mobipocket
-X-KDE-Keywords[zh_TW]=mobipocket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/okular/okularMobi.desktop new/kdegraphics-mobipocket-4.11.90/okular/okularMobi.desktop
--- old/kdegraphics-mobipocket-4.11.2/okular/okularMobi.desktop 2013-06-28 19:36:09.000000000 +0200
+++ new/kdegraphics-mobipocket-4.11.90/okular/okularMobi.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,66 +0,0 @@
-[Desktop Entry]
-Icon=okular
-Name=Okular
-Name[ar]=اوكلار
-Name[ast]=Okular
-Name[bg]=Okular
-Name[bs]=Okular
-Name[ca]=Okular
-Name[ca@valencia]=Okular
-Name[cs]=Okular
-Name[da]=Okular
-Name[de]=Okular
-Name[el]=Okular
-Name[en_GB]=Okular
-Name[eo]=Okular
-Name[es]=Okular
-Name[et]=Okular
-Name[eu]=Okular
-Name[fi]=Okular
-Name[fr]=Okular
-Name[ga]=Okular
-Name[gl]=Okular
-Name[hne]=ओकुलर
-Name[hr]=Okular
-Name[hu]=Okular
-Name[ia]=Okular
-Name[is]=Okular
-Name[it]=Okular
-Name[ja]=Okular
-Name[kk]=Okular
-Name[km]=Okular
-Name[ko]=Okular
-Name[ku]=Okular
-Name[lt]=Okular
-Name[lv]=Okular
-Name[mr]=ओक्युलर
-Name[nb]=Okular
-Name[nds]=Okular
-Name[nl]=Okular
-Name[nn]=Okular
-Name[pa]=ਓਕੁਲਾਰ
-Name[pl]=Okular
-Name[pt]=Okular
-Name[pt_BR]=Okular
-Name[ro]=Okular
-Name[ru]=Okular
-Name[si]=Okular
-Name[sk]=Okular
-Name[sl]=Okular
-Name[sq]=Okular
-Name[sr]=Окулар
-Name[sr@ijekavian]=Окулар
-Name[sr@ijekavianlatin]=Okular
-Name[sr@latin]=Okular
-Name[sv]=Okular
-Name[th]=โอกูลาร์
-Name[tr]=Okular
-Name[ug]=Okular
-Name[uk]=Okular
-Name[x-test]=xxOkularxx
-Name[zh_CN]=Okular
-Name[zh_TW]=Okular
-X-KDE-ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=okularpart
-Type=Service
-MimeType=application/x-mobipocket-ebook;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/strigi/CMakeLists.txt new/kdegraphics-mobipocket-4.11.90/strigi/CMakeLists.txt
--- old/kdegraphics-mobipocket-4.11.2/strigi/CMakeLists.txt 2013-06-28 19:36:09.000000000 +0200
+++ new/kdegraphics-mobipocket-4.11.90/strigi/CMakeLists.txt 2013-11-04 21:42:18.000000000 +0100
@@ -6,14 +6,12 @@
########### next target ###############
set(mobianalyzer_SRCS
- ${PROJECT_SOURCE_DIR}/lib/mobipocket.cpp
- ${PROJECT_SOURCE_DIR}/lib/decompressor.cpp
mobiendanalyzer.cpp
)
kde4_add_library(mobi MODULE ${mobianalyzer_SRCS})
-target_link_libraries(mobi ${STRIGI_STREAMS_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+target_link_libraries(mobi ${STRIGI_STREAMS_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qmobipocket)
# install the module in the right directory so it is picked up
set_target_properties(mobi PROPERTIES PREFIX ${STRIGI_LINE_ANALYZER_PREFIX})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.11.2/thumbnailers/CMakeLists.txt new/kdegraphics-mobipocket-4.11.90/thumbnailers/CMakeLists.txt
--- old/kdegraphics-mobipocket-4.11.2/thumbnailers/CMakeLists.txt 2013-06-28 19:36:09.000000000 +0200
+++ new/kdegraphics-mobipocket-4.11.90/thumbnailers/CMakeLists.txt 2013-11-04 21:42:18.000000000 +0100
@@ -6,13 +6,11 @@
########### next target ###############
set(mobithumbnail_SRCS
- ${PROJECT_SOURCE_DIR}/lib/mobipocket.cpp
- ${PROJECT_SOURCE_DIR}/lib/decompressor.cpp
mobithumbnail.cpp
)
kde4_add_plugin(mobithumbnail ${mobithumbnail_SRCS})
-target_link_libraries(mobithumbnail ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} )
+target_link_libraries(mobithumbnail ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} qmobipocket)
install(TARGETS mobithumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
########### install files ###############
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org