summaryrefslogtreecommitdiff
path: root/editors/calligra/files
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2020-01-22 17:59:22 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2020-01-22 17:59:22 +0000
commit90a4ed701a4a68d4ed2c54b96f8f5371dbfd9ffb (patch)
treeb78dc987b5630ee8fd0fcabe9d02b299721bed32 /editors/calligra/files
parentemulators/qemu: fix build on powerpc64 elfv2 (diff)
graphics/poppler: update to 0.84.0
Release 0.84.0: core: * Fix crash when converting from Unicode to ASCII-7 * Splash::scaleImageYdXu: Protect against crash if srcWidth is too big * JBIG2Stream: fix potential crash in malformed documents * JBIG2Stream: fix leak in reset() if called several times * Internal code improvements utils: * pdfimages: Add error message if first page is larger then number of pages. * pdfinfo: Improved paper size recognition * pdfsig: Fix exit code when dumping signatures * pdftocairo: Error out when even/odd selects 0 pages * pdftohtml: Fix memory leak * pdftoppm: Add an option to scale before rotate * pdftoppm: Add -hide-annotations option * pdftoppm: Error out when even/odd selects 0 pages * pdftops: Improve -optimizecolorspace qt5: * Code cleanups glib: * Fix compiler warnings Release 0.83.0 core: * Improve when a file is recognized as Linearized * Improve const-ness of the code * Make code a bit more readable/maintanable * Fix uninitialized memory uses in broken files utils: * pdffonts: Make code a bit more readable/maintanable * pdftohtml: Make code a bit more readable/maintanable qt5: * Remove a bunch of unused internal functions * trUtf8 -> tr (less warnings) build system: * make-glib-api-docs: switch to python3 PR: 243433 Exp-run by: antoine
Notes
Notes: svn path=/head/; revision=523824
Diffstat (limited to 'editors/calligra/files')
-rw-r--r--editors/calligra/files/patch-kde_pr-41479569
1 files changed, 69 insertions, 0 deletions
diff --git a/editors/calligra/files/patch-kde_pr-414795 b/editors/calligra/files/patch-kde_pr-414795
new file mode 100644
index 000000000000..2a8e252f8c2d
--- /dev/null
+++ b/editors/calligra/files/patch-kde_pr-414795
@@ -0,0 +1,69 @@
+Source: Timo Gurr <timo.gurr@gmail.com>
+Upstream: Reported, https://bugs.kde.org/show_bug.cgi?id=414795
+Reason: Fix build with poppler 0.83.0
+
+diff -Naur calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp calligra-3.1.0.new/filters/karbon/pdf/PdfImport.cpp
+--- filters/karbon/pdf/PdfImport.cpp 2019-12-04 12:41:13.000000000 +0100
++++ filters/karbon/pdf/PdfImport.cpp 2019-12-04 12:39:03.000000000 +0100
+@@ -60,19 +60,17 @@
+ }
+
+ // read config file
+- globalParams = new GlobalParams();
++ globalParams.reset(new GlobalParams());
+ if (! globalParams)
+ return KoFilter::NotImplemented;
+
+ GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
+ PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
+ if (! pdfDoc) {
+- delete globalParams;
+ return KoFilter::StupidError;
+ }
+
+ if (! pdfDoc->isOk()) {
+- delete globalParams;
+ delete pdfDoc;
+ return KoFilter::StupidError;
+ }
+@@ -99,7 +97,6 @@
+
+ delete dev;
+ delete pdfDoc;
+- delete globalParams;
+ globalParams = 0;
+
+ return KoFilter::OK;
+diff -Naur calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.cpp
+--- filters/karbon/pdf/SvgOutputDev.cpp 2019-12-04 12:41:14.000000000 +0100
++++ filters/karbon/pdf/SvgOutputDev.cpp 2019-12-04 12:35:30.000000000 +0100
+@@ -172,7 +172,7 @@
+ *d->body << "/>" << endl;
+ }
+
+-QString SvgOutputDev::convertPath(GfxPath *path)
++QString SvgOutputDev::convertPath(const GfxPath *path)
+ {
+ if (! path)
+ return QString();
+@@ -180,7 +180,7 @@
+ QString output;
+
+ for (int i = 0; i < path->getNumSubpaths(); ++i) {
+- GfxSubpath * subpath = path->getSubpath(i);
++ const GfxSubpath * subpath = path->getSubpath(i);
+ if (subpath->getNumPoints() > 0) {
+ output += QString("M%1 %2").arg(subpath->getX(0)).arg(subpath->getY(0));
+ int j = 1;
+diff -Naur calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.h
+--- filters/karbon/pdf/SvgOutputDev.h 2019-12-04 12:41:14.000000000 +0100
++++ filters/karbon/pdf/SvgOutputDev.h 2019-12-04 12:30:41.000000000 +0100
+@@ -83,7 +83,7 @@
+ /// Dumps content to svg file
+ void dumpContent();
+ private:
+- QString convertPath(GfxPath *path);
++ QString convertPath(const GfxPath *path);
+ QString convertMatrix(const QMatrix &matrix);
+ QString convertMatrix(const double * matrix);
+ QString printFill();