[arch-commits] Commit in calligra/trunk (PKGBUILD calligra-poppler-0.83.patch)
Antonio Rojas
arojas at archlinux.org
Tue Jan 7 20:01:27 UTC 2020
Date: Tuesday, January 7, 2020 @ 20:01:26
Author: arojas
Revision: 372768
Fix build with poppler 0.83
Added:
calligra/trunk/calligra-poppler-0.83.patch
Modified:
calligra/trunk/PKGBUILD
-----------------------------+
PKGBUILD | 10 ++++--
calligra-poppler-0.83.patch | 69 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 76 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-01-07 19:34:56 UTC (rev 372767)
+++ PKGBUILD 2020-01-07 20:01:26 UTC (rev 372768)
@@ -13,7 +13,7 @@
depends=(kcmutils knotifyconfig kross kactivities kdiagram libspnav kdelibs4support
gsl openexr kcontacts qca-qt5 poppler-qt5 libodfgen qt5-webkit cauchy khtml)
makedepends=(extra-cmake-modules kdoctools kdesignerplugin boost openjpeg akonadi-contacts
- libwpg okular eigen marble-common pstoedit libvisio libetonyek libwps vc libgit2)
+ libwpg okular eigen marble-common pstoedit libvisio libetonyek libwps vc libgit2 kinit)
optdepends=('libwpg: Corel WordPerfect Graphics image importer'
'libwps: Microsoft Works file word processor format import'
'libvisio: Microsoft Visio import filter'
@@ -42,7 +42,8 @@
calligra-poppler-0.71.patch
calligra-poppler-0.72.patch
calligra-poppler-0.73.patch
- calligra-poppler-0.82.patch)
+ calligra-poppler-0.82.patch
+ calligra-poppler-0.83.patch)
sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870'
'SKIP'
'40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a'
@@ -51,7 +52,8 @@
'052adc4ea812d7667812ff7867e703327dbe7c1ecad86094fd6772dc09782d87'
'87a09710b9e7e825a46344ddec08eb98b3454d6d067b0177d284733b2342cece'
'ef95f49f69c9f2a5b530e416003f2d6d106bb3c85e8458ae27494c64c8b474a8'
- 'a2f02dccd8f7748b187dba805220ded95c41bbddc084091794691164184d1b82')
+ 'a2f02dccd8f7748b187dba805220ded95c41bbddc084091794691164184d1b82'
+ '3877210cc58c11472909c62bdc1678a05deb30051f0180c47893e51bae9182d1')
validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt <foundation at krita.org>
42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen <danders at get2net.dk>
@@ -73,6 +75,8 @@
patch -p1 -i ../calligra-poppler-0.73.patch
# Fix build with poppler 0.82
patch -p1 -i ../calligra-poppler-0.82.patch
+# Fix build with poppler 0.83
+ patch -p1 -i ../calligra-poppler-0.83.patch
}
build() {
Added: calligra-poppler-0.83.patch
===================================================================
--- calligra-poppler-0.83.patch (rev 0)
+++ calligra-poppler-0.83.patch 2020-01-07 20:01:26 UTC (rev 372768)
@@ -0,0 +1,69 @@
+Source: Timo Gurr <tgurr at exherbo.org>
+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
+--- calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp 2019-12-04 12:41:13.000000000 +0100
++++ calligra-3.1.0.new/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
+--- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 2019-12-04 12:41:14.000000000 +0100
++++ calligra-3.1.0.new/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
+--- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h 2019-12-04 12:41:14.000000000 +0100
++++ calligra-3.1.0.new/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();
More information about the arch-commits
mailing list