[kdegraphics] add missing okular
Than Ngo
than at fedoraproject.org
Wed Jun 29 17:20:50 UTC 2011
commit 74067e8feeaf5701563a1fa33c06c1a0f477c7f4
Author: Than Ngo <than at redhat.com>
Date: Wed Jun 29 19:20:35 2011 +0200
add missing okular
.gitignore | 1 +
...ch => kdegraphics-4.6.90-okular-landscape.patch | 130 ++++++++++----------
kdegraphics.spec | 9 +-
sources | 1 +
4 files changed, 71 insertions(+), 70 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c441cc5..f180ab5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@
/libksane-4.6.90.tar.bz2
/svgpart-4.6.90.tar.bz2
/kgamma-4.6.90.tar.bz2
+/okular-4.6.90.tar.bz2
diff --git a/kdegraphics-4.6.3-okular-landscape.patch b/kdegraphics-4.6.90-okular-landscape.patch
similarity index 73%
rename from kdegraphics-4.6.3-okular-landscape.patch
rename to kdegraphics-4.6.90-okular-landscape.patch
index a434c14..8ab5177 100644
--- a/kdegraphics-4.6.3-okular-landscape.patch
+++ b/kdegraphics-4.6.90-okular-landscape.patch
@@ -1,7 +1,7 @@
-diff -ur kdegraphics-4.6.3/okular/core/document.cpp kdegraphics-4.6.3-okular-landscape/okular/core/document.cpp
---- kdegraphics-4.6.3/okular/core/document.cpp 2011-02-12 15:48:53.000000000 +0100
-+++ kdegraphics-4.6.3-okular-landscape/okular/core/document.cpp 2011-06-06 01:07:43.000000000 +0200
-@@ -3456,6 +3456,28 @@
+diff -up kdegraphics-4.6.90/okular/core/document.cpp.okular-landscape kdegraphics-4.6.90/okular/core/document.cpp
+--- kdegraphics-4.6.90/okular/core/document.cpp.okular-landscape 2011-06-22 16:15:08.000000000 +0200
++++ kdegraphics-4.6.90/okular/core/document.cpp 2011-06-29 19:13:09.000000000 +0200
+@@ -3459,6 +3459,28 @@ bool Document::saveDocumentArchive( cons
return true;
}
@@ -30,9 +30,9 @@ diff -ur kdegraphics-4.6.3/okular/core/document.cpp kdegraphics-4.6.3-okular-lan
void DocumentPrivate::requestDone( PixmapRequest * req )
{
if ( !req )
-diff -ur kdegraphics-4.6.3/okular/core/document.h kdegraphics-4.6.3-okular-landscape/okular/core/document.h
---- kdegraphics-4.6.3/okular/core/document.h 2010-08-11 23:01:33.000000000 +0200
-+++ kdegraphics-4.6.3-okular-landscape/okular/core/document.h 2011-06-06 01:07:43.000000000 +0200
+diff -up kdegraphics-4.6.90/okular/core/document.h.okular-landscape kdegraphics-4.6.90/okular/core/document.h
+--- kdegraphics-4.6.90/okular/core/document.h.okular-landscape 2011-06-22 16:15:08.000000000 +0200
++++ kdegraphics-4.6.90/okular/core/document.h 2011-06-29 19:13:09.000000000 +0200
@@ -19,11 +19,11 @@
#include <QtCore/QObject>
#include <QtCore/QStringList>
@@ -46,7 +46,7 @@ diff -ur kdegraphics-4.6.3/okular/core/document.h kdegraphics-4.6.3-okular-lands
class QPrintDialog;
class KComponentData;
class KBookmark;
-@@ -604,6 +604,15 @@
+@@ -604,6 +604,15 @@ class OKULAR_EXPORT Document : public QO
*/
const SourceReference * dynamicSourceReference( int pageNr, double absX, double absY );
@@ -62,9 +62,9 @@ diff -ur kdegraphics-4.6.3/okular/core/document.h kdegraphics-4.6.3-okular-lands
public Q_SLOTS:
/**
-diff -ur kdegraphics-4.6.3/okular/core/fileprinter.cpp kdegraphics-4.6.3-okular-landscape/okular/core/fileprinter.cpp
---- kdegraphics-4.6.3/okular/core/fileprinter.cpp 2010-06-04 21:04:05.000000000 +0200
-+++ kdegraphics-4.6.3-okular-landscape/okular/core/fileprinter.cpp 2011-06-06 01:07:43.000000000 +0200
+diff -up kdegraphics-4.6.90/okular/core/fileprinter.cpp.okular-landscape kdegraphics-4.6.90/okular/core/fileprinter.cpp
+--- kdegraphics-4.6.90/okular/core/fileprinter.cpp.okular-landscape 2011-06-22 16:15:08.000000000 +0200
++++ kdegraphics-4.6.90/okular/core/fileprinter.cpp 2011-06-29 19:13:09.000000000 +0200
@@ -34,20 +34,26 @@
using namespace Okular;
@@ -96,7 +96,7 @@ diff -ur kdegraphics-4.6.3/okular/core/fileprinter.cpp kdegraphics-4.6.3-okular-
{
if ( fileList.size() < 1 ) {
-@@ -135,7 +141,7 @@
+@@ -135,7 +141,7 @@ int FilePrinter::doPrintFiles( QPrinter
bool useCupsOptions = cupsAvailable();
argList = printArguments( printer, fileDeletePolicy, pageSelectPolicy,
@@ -105,7 +105,7 @@ diff -ur kdegraphics-4.6.3/okular/core/fileprinter.cpp kdegraphics-4.6.3-okular-
kDebug(OkularDebug) << "Executing" << exe << "with arguments" << argList;
ret = KProcess::execute( exe, argList );
-@@ -360,7 +366,8 @@
+@@ -360,7 +366,8 @@ Generator::PrintError FilePrinter::print
QStringList FilePrinter::printArguments( QPrinter &printer, FileDeletePolicy fileDeletePolicy,
PageSelectPolicy pageSelectPolicy, bool useCupsOptions,
@@ -115,7 +115,7 @@ diff -ur kdegraphics-4.6.3/okular/core/fileprinter.cpp kdegraphics-4.6.3-okular-
{
QStringList argList;
-@@ -380,8 +387,8 @@
+@@ -380,8 +387,8 @@ QStringList FilePrinter::printArguments(
argList << pages( printer, pageSelectPolicy, pageRange, useCupsOptions, version );
}
@@ -126,7 +126,7 @@ diff -ur kdegraphics-4.6.3/okular/core/fileprinter.cpp kdegraphics-4.6.3-okular-
}
if ( ! deleteFile( printer, fileDeletePolicy, version ).isEmpty() ) {
-@@ -484,7 +491,7 @@
+@@ -484,7 +491,7 @@ QStringList FilePrinter::pages( QPrinter
return QStringList(); // AllPages
}
@@ -135,7 +135,7 @@ diff -ur kdegraphics-4.6.3/okular/core/fileprinter.cpp kdegraphics-4.6.3-okular-
{
QStringList optionList;
-@@ -492,8 +499,8 @@
+@@ -492,8 +499,8 @@ QStringList FilePrinter::cupsOptions( QP
optionList << optionMedia( printer );
}
@@ -146,7 +146,7 @@ diff -ur kdegraphics-4.6.3/okular/core/fileprinter.cpp kdegraphics-4.6.3-okular-
}
if ( ! optionDoubleSidedPrinting( printer ).isEmpty() ) {
-@@ -597,12 +604,17 @@
+@@ -597,12 +604,17 @@ QString FilePrinter::mediaPaperSource( Q
}
}
@@ -169,23 +169,23 @@ diff -ur kdegraphics-4.6.3/okular/core/fileprinter.cpp kdegraphics-4.6.3-okular-
}
}
-diff -ur kdegraphics-4.6.3/okular/core/fileprinter.h kdegraphics-4.6.3-okular-landscape/okular/core/fileprinter.h
---- kdegraphics-4.6.3/okular/core/fileprinter.h 2010-06-04 21:04:05.000000000 +0200
-+++ kdegraphics-4.6.3-okular-landscape/okular/core/fileprinter.h 2011-06-06 01:08:32.000000000 +0200
+diff -up kdegraphics-4.6.90/okular/core/fileprinter.h.okular-landscape kdegraphics-4.6.90/okular/core/fileprinter.h
+--- kdegraphics-4.6.90/okular/core/fileprinter.h.okular-landscape 2011-06-22 16:15:08.000000000 +0200
++++ kdegraphics-4.6.90/okular/core/fileprinter.h 2011-06-29 19:16:49.000000000 +0200
@@ -16,11 +16,11 @@
#include <QtCore/QList>
#include <QtCore/QString>
+#include <QtGui/QPrinter>
- #include <okular/core/okular_export.h>
- #include <okular/core/generator.h>
+ #include "okular_export.h"
+ #include "generator.h"
-class QPrinter;
class QSize;
namespace Okular {
-@@ -58,6 +58,7 @@
+@@ -58,6 +58,7 @@ public:
* @param fileDeletePolicy if the application or system deletes the file
* @param pageSelectPolicy if the application or system selects the pages to print
* @param pageRange page range to print if SystemSlectsPages and user chooses Selection in Print Dialog
@@ -193,7 +193,7 @@ diff -ur kdegraphics-4.6.3/okular/core/fileprinter.h kdegraphics-4.6.3-okular-la
*
* @returns Returns exit code:
* -9 if lpr not found
-@@ -73,7 +74,9 @@
+@@ -73,7 +74,9 @@ public:
static int printFile( QPrinter &printer, const QString file,
FileDeletePolicy fileDeletePolicy = FilePrinter::ApplicationDeletesFiles,
PageSelectPolicy pageSelectPolicy = FilePrinter::ApplicationSelectsPages,
@@ -204,7 +204,7 @@ diff -ur kdegraphics-4.6.3/okular/core/fileprinter.h kdegraphics-4.6.3-okular-la
/** Print a list of files using the settings in QPrinter
*
-@@ -171,11 +174,13 @@
+@@ -171,11 +174,13 @@ protected:
int doPrintFiles( QPrinter &printer, const QStringList fileList,
FileDeletePolicy fileDeletePolicy, PageSelectPolicy pageSelectPolicy,
@@ -220,7 +220,7 @@ diff -ur kdegraphics-4.6.3/okular/core/fileprinter.h kdegraphics-4.6.3-okular-la
QStringList destination( QPrinter &printer, const QString &version );
QStringList copies( QPrinter &printer, const QString &version );
-@@ -185,11 +190,11 @@
+@@ -185,11 +190,11 @@ protected:
QStringList pages( QPrinter &printer, PageSelectPolicy pageSelectPolicy,
const QString &pageRange, bool useCupsOptions, const QString &version );
@@ -234,10 +234,10 @@ diff -ur kdegraphics-4.6.3/okular/core/fileprinter.h kdegraphics-4.6.3-okular-la
QStringList optionDoubleSidedPrinting( QPrinter &printer );
QStringList optionPageOrder( QPrinter &printer );
QStringList optionCollateCopies( QPrinter &printer );
-diff -ur kdegraphics-4.6.3/okular/generators/djvu/generator_djvu.cpp kdegraphics-4.6.3-okular-landscape/okular/generators/djvu/generator_djvu.cpp
---- kdegraphics-4.6.3/okular/generators/djvu/generator_djvu.cpp 2011-01-06 00:46:08.000000000 +0100
-+++ kdegraphics-4.6.3-okular-landscape/okular/generators/djvu/generator_djvu.cpp 2011-06-06 01:07:43.000000000 +0200
-@@ -220,7 +220,8 @@
+diff -up kdegraphics-4.6.90/okular/generators/djvu/generator_djvu.cpp.okular-landscape kdegraphics-4.6.90/okular/generators/djvu/generator_djvu.cpp
+--- kdegraphics-4.6.90/okular/generators/djvu/generator_djvu.cpp.okular-landscape 2011-06-22 16:15:08.000000000 +0200
++++ kdegraphics-4.6.90/okular/generators/djvu/generator_djvu.cpp 2011-06-29 19:13:09.000000000 +0200
+@@ -220,7 +220,8 @@ bool DjVuGenerator::print( QPrinter& pri
int ret = Okular::FilePrinter::printFile( printer, fileName,
Okular::FilePrinter::SystemDeletesFiles,
Okular::FilePrinter::ApplicationSelectsPages,
@@ -247,10 +247,10 @@ diff -ur kdegraphics-4.6.3/okular/generators/djvu/generator_djvu.cpp kdegraphics
result = ( ret >=0 );
}
-diff -ur kdegraphics-4.6.3/okular/generators/dvi/dviexport.cpp kdegraphics-4.6.3-okular-landscape/okular/generators/dvi/dviexport.cpp
---- kdegraphics-4.6.3/okular/generators/dvi/dviexport.cpp 2009-10-08 23:55:51.000000000 +0200
-+++ kdegraphics-4.6.3-okular-landscape/okular/generators/dvi/dviexport.cpp 2011-06-06 01:52:08.000000000 +0200
-@@ -288,9 +288,11 @@
+diff -up kdegraphics-4.6.90/okular/generators/dvi/dviexport.cpp.okular-landscape kdegraphics-4.6.90/okular/generators/dvi/dviexport.cpp
+--- kdegraphics-4.6.90/okular/generators/dvi/dviexport.cpp.okular-landscape 2011-06-22 16:15:08.000000000 +0200
++++ kdegraphics-4.6.90/okular/generators/dvi/dviexport.cpp 2011-06-29 19:13:09.000000000 +0200
+@@ -288,9 +288,11 @@ DVIExportToPS::DVIExportToPS(dviRenderer
const QString& output_name,
const QStringList& options,
QPrinter* printer,
@@ -264,7 +264,7 @@ diff -ur kdegraphics-4.6.3/okular/generators/dvi/dviexport.cpp kdegraphics-4.6.3
{
// None of these should happen. Paranoia checks.
if (!parent.dviFile)
-@@ -460,7 +462,8 @@
+@@ -460,7 +462,8 @@ void DVIExportToPS::finished_impl(int ex
Okular::FilePrinter::printFile( (*printer_), output_name_,
Okular::FilePrinter::ApplicationDeletesFiles,
Okular::FilePrinter::ApplicationSelectsPages,
@@ -274,9 +274,9 @@ diff -ur kdegraphics-4.6.3/okular/generators/dvi/dviexport.cpp kdegraphics-4.6.3
}
}
-diff -ur kdegraphics-4.6.3/okular/generators/dvi/dviexport.h kdegraphics-4.6.3-okular-landscape/okular/generators/dvi/dviexport.h
---- kdegraphics-4.6.3/okular/generators/dvi/dviexport.h 2009-10-08 23:55:51.000000000 +0200
-+++ kdegraphics-4.6.3-okular-landscape/okular/generators/dvi/dviexport.h 2011-06-06 01:52:08.000000000 +0200
+diff -up kdegraphics-4.6.90/okular/generators/dvi/dviexport.h.okular-landscape kdegraphics-4.6.90/okular/generators/dvi/dviexport.h
+--- kdegraphics-4.6.90/okular/generators/dvi/dviexport.h.okular-landscape 2011-06-22 16:15:08.000000000 +0200
++++ kdegraphics-4.6.90/okular/generators/dvi/dviexport.h 2011-06-29 19:13:09.000000000 +0200
@@ -22,11 +22,11 @@
#include <ksharedptr.h>
@@ -290,7 +290,7 @@ diff -ur kdegraphics-4.6.3/okular/generators/dvi/dviexport.h kdegraphics-4.6.3-o
class KProcess;
class QStringList;
-@@ -124,13 +124,15 @@
+@@ -124,13 +124,15 @@ public:
* passed to the external process's argv command line.
* @param printer having generated the PostScript file, it is passed
* to @c printer (if not null).
@@ -307,7 +307,7 @@ diff -ur kdegraphics-4.6.3/okular/generators/dvi/dviexport.h kdegraphics-4.6.3-o
private:
virtual void abort_process_impl();
-@@ -139,6 +141,7 @@
+@@ -139,6 +141,7 @@ private:
QPrinter* printer_;
QString output_name_;
QString tmpfile_name_;
@@ -315,10 +315,10 @@ diff -ur kdegraphics-4.6.3/okular/generators/dvi/dviexport.h kdegraphics-4.6.3-o
};
#endif
-diff -ur kdegraphics-4.6.3/okular/generators/dvi/dviRenderer.cpp kdegraphics-4.6.3-okular-landscape/okular/generators/dvi/dviRenderer.cpp
---- kdegraphics-4.6.3/okular/generators/dvi/dviRenderer.cpp 2009-10-08 23:55:51.000000000 +0200
-+++ kdegraphics-4.6.3-okular-landscape/okular/generators/dvi/dviRenderer.cpp 2011-06-06 01:52:08.000000000 +0200
-@@ -767,9 +767,9 @@
+diff -up kdegraphics-4.6.90/okular/generators/dvi/dviRenderer.cpp.okular-landscape kdegraphics-4.6.90/okular/generators/dvi/dviRenderer.cpp
+--- kdegraphics-4.6.90/okular/generators/dvi/dviRenderer.cpp.okular-landscape 2011-06-22 16:15:08.000000000 +0200
++++ kdegraphics-4.6.90/okular/generators/dvi/dviRenderer.cpp 2011-06-29 19:13:09.000000000 +0200
+@@ -767,9 +767,9 @@ void dviRenderer::exportPDF()
}
@@ -330,9 +330,9 @@ diff -ur kdegraphics-4.6.3/okular/generators/dvi/dviRenderer.cpp kdegraphics-4.6
if (exporter->started())
all_exports_[exporter.data()] = exporter;
}
-diff -ur kdegraphics-4.6.3/okular/generators/dvi/dviRenderer.h kdegraphics-4.6.3-okular-landscape/okular/generators/dvi/dviRenderer.h
---- kdegraphics-4.6.3/okular/generators/dvi/dviRenderer.h 2010-01-20 23:42:01.000000000 +0100
-+++ kdegraphics-4.6.3-okular-landscape/okular/generators/dvi/dviRenderer.h 2011-06-06 01:52:08.000000000 +0200
+diff -up kdegraphics-4.6.90/okular/generators/dvi/dviRenderer.h.okular-landscape kdegraphics-4.6.90/okular/generators/dvi/dviRenderer.h
+--- kdegraphics-4.6.90/okular/generators/dvi/dviRenderer.h.okular-landscape 2011-06-22 16:15:08.000000000 +0200
++++ kdegraphics-4.6.90/okular/generators/dvi/dviRenderer.h 2011-06-29 19:13:09.000000000 +0200
@@ -29,6 +29,7 @@
#include <QVector>
#include <QTimer>
@@ -341,7 +341,7 @@ diff -ur kdegraphics-4.6.3/okular/generators/dvi/dviRenderer.h kdegraphics-4.6.3
class Anchor;
class DocumentWidget;
-@@ -37,7 +38,6 @@
+@@ -37,7 +38,6 @@ class dviRenderer;
class ghostscript_interface;
//class infoDialog;
class QEventLoop;
@@ -349,7 +349,7 @@ diff -ur kdegraphics-4.6.3/okular/generators/dvi/dviRenderer.h kdegraphics-4.6.3
class KProgressDialog;
class PreBookmark;
class TeXFontDefinition;
-@@ -154,7 +154,7 @@
+@@ -154,7 +154,7 @@ public:
//void editor_finished(const DVISourceEditor*);
public slots:
@@ -358,10 +358,10 @@ diff -ur kdegraphics-4.6.3/okular/generators/dvi/dviRenderer.h kdegraphics-4.6.3
void exportPDF();
//void showInfo();
-diff -ur kdegraphics-4.6.3/okular/generators/dvi/generator_dvi.cpp kdegraphics-4.6.3-okular-landscape/okular/generators/dvi/generator_dvi.cpp
---- kdegraphics-4.6.3/okular/generators/dvi/generator_dvi.cpp 2010-07-28 17:00:52.000000000 +0200
-+++ kdegraphics-4.6.3-okular-landscape/okular/generators/dvi/generator_dvi.cpp 2011-06-06 01:52:08.000000000 +0200
-@@ -567,7 +567,7 @@
+diff -up kdegraphics-4.6.90/okular/generators/dvi/generator_dvi.cpp.okular-landscape kdegraphics-4.6.90/okular/generators/dvi/generator_dvi.cpp
+--- kdegraphics-4.6.90/okular/generators/dvi/generator_dvi.cpp.okular-landscape 2011-06-22 16:15:08.000000000 +0200
++++ kdegraphics-4.6.90/okular/generators/dvi/generator_dvi.cpp 2011-06-29 19:13:09.000000000 +0200
+@@ -567,7 +567,7 @@ bool DviGenerator::print( QPrinter& prin
QEventLoop el;
m_dviRenderer->setEventLoop( &el );
@@ -370,10 +370,10 @@ diff -ur kdegraphics-4.6.3/okular/generators/dvi/generator_dvi.cpp kdegraphics-4
tf.close();
-diff -ur kdegraphics-4.6.3/okular/generators/poppler/generator_pdf.cpp kdegraphics-4.6.3-okular-landscape/okular/generators/poppler/generator_pdf.cpp
---- kdegraphics-4.6.3/okular/generators/poppler/generator_pdf.cpp 2011-03-31 22:02:04.000000000 +0200
-+++ kdegraphics-4.6.3-okular-landscape/okular/generators/poppler/generator_pdf.cpp 2011-06-06 01:07:43.000000000 +0200
-@@ -964,7 +964,8 @@
+diff -up kdegraphics-4.6.90/okular/generators/poppler/generator_pdf.cpp.okular-landscape kdegraphics-4.6.90/okular/generators/poppler/generator_pdf.cpp
+--- kdegraphics-4.6.90/okular/generators/poppler/generator_pdf.cpp.okular-landscape 2011-06-22 16:15:08.000000000 +0200
++++ kdegraphics-4.6.90/okular/generators/poppler/generator_pdf.cpp 2011-06-29 19:13:09.000000000 +0200
+@@ -978,7 +978,8 @@ bool PDFGenerator::print( QPrinter& prin
int ret = Okular::FilePrinter::printFile( printer, tempfilename,
Okular::FilePrinter::SystemDeletesFiles,
Okular::FilePrinter::ApplicationSelectsPages,
@@ -383,10 +383,10 @@ diff -ur kdegraphics-4.6.3/okular/generators/poppler/generator_pdf.cpp kdegraphi
lastPrintError = Okular::FilePrinter::printError( ret );
-diff -ur kdegraphics-4.6.3/okular/generators/spectre/generator_ghostview.cpp kdegraphics-4.6.3-okular-landscape/okular/generators/spectre/generator_ghostview.cpp
---- kdegraphics-4.6.3/okular/generators/spectre/generator_ghostview.cpp 2010-06-04 10:25:25.000000000 +0200
-+++ kdegraphics-4.6.3-okular-landscape/okular/generators/spectre/generator_ghostview.cpp 2011-06-06 01:07:43.000000000 +0200
-@@ -148,7 +148,8 @@
+diff -up kdegraphics-4.6.90/okular/generators/spectre/generator_ghostview.cpp.okular-landscape kdegraphics-4.6.90/okular/generators/spectre/generator_ghostview.cpp
+--- kdegraphics-4.6.90/okular/generators/spectre/generator_ghostview.cpp.okular-landscape 2011-06-22 16:15:08.000000000 +0200
++++ kdegraphics-4.6.90/okular/generators/spectre/generator_ghostview.cpp 2011-06-29 19:13:09.000000000 +0200
+@@ -148,7 +148,8 @@ bool GSGenerator::print( QPrinter& print
int ret = Okular::FilePrinter::printFile( printer, fileName,
Okular::FilePrinter::SystemDeletesFiles,
Okular::FilePrinter::ApplicationSelectsPages,
@@ -396,10 +396,10 @@ diff -ur kdegraphics-4.6.3/okular/generators/spectre/generator_ghostview.cpp kde
if ( ret >= 0 ) result = true;
}
-diff -ur kdegraphics-4.6.3/okular/part.cpp kdegraphics-4.6.3-okular-landscape/okular/part.cpp
---- kdegraphics-4.6.3/okular/part.cpp 2011-03-20 14:47:58.000000000 +0100
-+++ kdegraphics-4.6.3-okular-landscape/okular/part.cpp 2011-06-06 01:07:43.000000000 +0200
-@@ -2057,24 +2057,7 @@
+diff -up kdegraphics-4.6.90/okular/part.cpp.okular-landscape kdegraphics-4.6.90/okular/part.cpp
+--- kdegraphics-4.6.90/okular/part.cpp.okular-landscape 2011-06-22 16:15:08.000000000 +0200
++++ kdegraphics-4.6.90/okular/part.cpp 2011-06-29 19:13:09.000000000 +0200
+@@ -2060,24 +2060,7 @@ void Part::slotPrint()
void Part::setupPrint( QPrinter &printer )
{
diff --git a/kdegraphics.spec b/kdegraphics.spec
index f86d2c2..46675e6 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -37,6 +37,7 @@ Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/libksane-%{versi
Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/libkexiv2-%{version}.tar.bz2
Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/libkdcraw-%{version}.tar.bz2
Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/libkipi-%{version}.tar.bz2
+Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/okular-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,7 +53,7 @@ Patch51: kdegraphics-4.5.80-OkularConfig-dont-hardcode-paths.patch
# fix printing of landscape documents in Okular (#509645, kde#181290)
# https://git.reviewboard.kde.org/r/101513/
-Patch54: kdegraphics-4.6.3-okular-landscape.patch
+Patch54: kdegraphics-4.6.90-okular-landscape.patch
## upstream patches
@@ -145,12 +146,10 @@ Summary: A kioslave for displaying WinHelp files
%prep
-%setup -q -n kdegraphics-%{version}%{?alphatag}
-# Unpack all sources
-%setup -q -T -D -c -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -n kdegraphics-%{version}%{?alphatag}
+%setup -q -n %{name}-%{version}%{?alphatag} -c -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15
# Remove version number from directory names and add them to CMakeLists.txt
-for f in kdegraphics-strigi-analyzer kdegraphics-thumbnailers gwenview kamera kcolorchooser kgamma kolourpaint kruler ksaneplugin ksnapshot svgpart libksane libkdcraw libkexiv2 libkipi;
+for f in kdegraphics-strigi-analyzer kdegraphics-thumbnailers gwenview kamera kcolorchooser kgamma kolourpaint kruler ksaneplugin ksnapshot svgpart libksane libkdcraw libkexiv2 libkipi okular;
do
mv $f-%{version} $f;
printf "add_subdirectory ($f)\n" >> CMakeLists.txt
diff --git a/sources b/sources
index 084bfc9..f3bda1c 100644
--- a/sources
+++ b/sources
@@ -14,3 +14,4 @@ fbe8206e2ed398bedbc9d31386afc883 libkipi-4.6.90.tar.bz2
7703785c7a77ce2f1704575e6b44823a libksane-4.6.90.tar.bz2
8c399e8a1bae548f95994c38729caf2a svgpart-4.6.90.tar.bz2
15e5d17a4b6bb157d0319d74058fb3f3 kgamma-4.6.90.tar.bz2
+021e4ad479bb88937084d4510d1e1218 okular-4.6.90.tar.bz2
More information about the scm-commits
mailing list