Bug#910873: calligra: diff for NMU version 1:3.1.0+dfsg-3.1
Control: tags 910873 + patch
Control: tags 910873 + pending
Dear maintainer,
I've prepared an NMU for calligra (versioned as 1:3.1.0+dfsg-3.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards.
Gianfranco
diff -Nru calligra-3.1.0+dfsg/debian/changelog calligra-3.1.0+dfsg/debian/changelog
--- calligra-3.1.0+dfsg/debian/changelog 2018-09-05 08:39:20.000000000 +0200
+++ calligra-3.1.0+dfsg/debian/changelog 2018-10-22 10:28:51.000000000 +0200
@@ -1,3 +1,10 @@
+calligra (1:3.1.0+dfsg-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix build with new poppler 0.69.0-1 (Closes: #910873)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org> Mon, 22 Oct 2018 10:28:51 +0200
+
calligra (1:3.1.0+dfsg-3) unstable; urgency=medium
* Team upload.
diff -Nru calligra-3.1.0+dfsg/debian/patches/poppler-0.69.patch calligra-3.1.0+dfsg/debian/patches/poppler-0.69.patch
--- calligra-3.1.0+dfsg/debian/patches/poppler-0.69.patch 1970-01-01 01:00:00.000000000 +0100
+++ calligra-3.1.0+dfsg/debian/patches/poppler-0.69.patch 2018-10-22 10:28:49.000000000 +0200
@@ -0,0 +1,17 @@
+Description: Fix build with poppler 0.69
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+Bug-Debian: https://bugs.debian.org/910873
+Last-Update: 2018-10-22
+
+--- calligra-3.1.0+dfsg.orig/filters/karbon/pdf/PdfImport.cpp
++++ calligra-3.1.0+dfsg/filters/karbon/pdf/PdfImport.cpp
+@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::co
+ delete globalParams;
+ globalParams = 0;
+
+- // check for memory leaks
+- Object::memCheck(stderr);
+-
+ return KoFilter::OK;
+ }
+
diff -Nru calligra-3.1.0+dfsg/debian/patches/series calligra-3.1.0+dfsg/debian/patches/series
--- calligra-3.1.0+dfsg/debian/patches/series 2018-09-05 08:21:42.000000000 +0200
+++ calligra-3.1.0+dfsg/debian/patches/series 2018-10-22 10:27:43.000000000 +0200
@@ -1,2 +1,3 @@
upstream_Fix-build-with-Qt-5.11-missing-headers.patch
upstream_Fix-compilation-with-Qt-5.11-missing-include.patch
+poppler-0.69.patch
Reply to: