[neon/extras/calligra/Neon/release] debian/patches: refresh patch to avoid fuzz
Pino Toscano
null at kde.org
Wed Sep 7 17:19:49 BST 2022
Git commit 122a0150091f5e668e9a9960479fe31ca3ab7960 by Pino Toscano.
Committed on 06/07/2022 at 17:14.
Pushed by jriddell into branch 'Neon/release'.
refresh patch to avoid fuzz
M +15 -30 debian/patches/upstream_Raise-minimum-poppler-version-to-0.83.0-cleaning-up-.patch
https://invent.kde.org/neon/extras/calligra/commit/122a0150091f5e668e9a9960479fe31ca3ab7960
diff --git a/debian/patches/upstream_Raise-minimum-poppler-version-to-0.83.0-cleaning-up-.patch b/debian/patches/upstream_Raise-minimum-poppler-version-to-0.83.0-cleaning-up-.patch
index f674e76..2b457b7 100644
--- a/debian/patches/upstream_Raise-minimum-poppler-version-to-0.83.0-cleaning-up-.patch
+++ b/debian/patches/upstream_Raise-minimum-poppler-version-to-0.83.0-cleaning-up-.patch
@@ -13,11 +13,9 @@ Signed-off-by: Andreas Sturmlechner <asturm at gentoo.org>
filters/karbon/pdf/SvgOutputDev.h | 14 ----------
6 files changed, 2 insertions(+), 110 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 89636205c2b..3a86ec88f7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -704,7 +704,7 @@ set_package_properties(LibEtonyek PROPERTIES
+@@ -725,7 +725,7 @@ set_package_properties(LibEtonyek PROPER
##
## Test for qt-poppler
##
@@ -26,8 +24,6 @@ index 89636205c2b..3a86ec88f7d 100644
set_package_properties(Poppler PROPERTIES
DESCRIPTION "A PDF rendering library"
URL "http://poppler.freedesktop.org"
-diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt
-index 94d4071da3d..8fddf1ad757 100644
--- a/filters/karbon/pdf/CMakeLists.txt
+++ b/filters/karbon/pdf/CMakeLists.txt
@@ -1,19 +1,3 @@
@@ -50,11 +46,9 @@ index 94d4071da3d..8fddf1ad757 100644
set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp )
add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS})
-diff --git a/filters/karbon/pdf/Pdf2OdgImport.cpp b/filters/karbon/pdf/Pdf2OdgImport.cpp
-index f8a24c000b7..934e31dd5aa 100644
--- a/filters/karbon/pdf/Pdf2OdgImport.cpp
+++ b/filters/karbon/pdf/Pdf2OdgImport.cpp
-@@ -65,33 +65,19 @@ KoFilter::ConversionStatus Pdf2OdgImport::convert(const QByteArray& from, const
+@@ -78,33 +78,19 @@ KoFilter::ConversionStatus Pdf2OdgImport
Q_ASSERT(m_document->pages().isEmpty());
// read config file
@@ -88,7 +82,7 @@ index f8a24c000b7..934e31dd5aa 100644
delete pdfDoc;
return KoFilter::StupidError;
}
-@@ -126,12 +112,7 @@ KoFilter::ConversionStatus Pdf2OdgImport::convert(const QByteArray& from, const
+@@ -139,12 +125,7 @@ KoFilter::ConversionStatus Pdf2OdgImport
delete dev;
}
delete pdfDoc;
@@ -101,11 +95,9 @@ index f8a24c000b7..934e31dd5aa 100644
return status;
}
-diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
-index 6309caefa8e..abbe681b4e8 100644
--- a/filters/karbon/pdf/PdfImport.cpp
+++ b/filters/karbon/pdf/PdfImport.cpp
-@@ -26,9 +26,7 @@
+@@ -39,9 +39,7 @@
#include <PDFDoc.h>
#include <GlobalParams.h>
@@ -115,7 +107,7 @@ index 6309caefa8e..abbe681b4e8 100644
K_PLUGIN_FACTORY_WITH_JSON(PdfImportFactory, "calligra_filter_pdf2svg.json",
registerPlugin<PdfImport>();)
-@@ -52,33 +50,19 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
+@@ -65,33 +63,19 @@ KoFilter::ConversionStatus PdfImport::co
}
// read config file
@@ -149,7 +141,7 @@ index 6309caefa8e..abbe681b4e8 100644
delete pdfDoc;
return KoFilter::StupidError;
}
-@@ -105,12 +89,7 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
+@@ -118,12 +102,7 @@ KoFilter::ConversionStatus PdfImport::co
delete dev;
delete pdfDoc;
@@ -162,11 +154,9 @@ index 6309caefa8e..abbe681b4e8 100644
return KoFilter::OK;
}
-diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
-index 6c9dddfc661..0e6e5a934ca 100644
--- a/filters/karbon/pdf/SvgOutputDev.cpp
+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -160,11 +160,7 @@ void SvgOutputDev::eoFill(GfxState *state)
+@@ -172,11 +172,7 @@ void SvgOutputDev::eoFill(GfxState *stat
*d->body << "/>" << endl;
}
@@ -178,7 +168,7 @@ index 6c9dddfc661..0e6e5a934ca 100644
{
if (! path)
return QString();
-@@ -172,11 +168,7 @@ QString SvgOutputDev::convertPath(const GfxPath *path)
+@@ -184,11 +180,7 @@ QString SvgOutputDev::convertPath(const
QString output;
for (int i = 0; i < path->getNumSubpaths(); ++i) {
@@ -190,7 +180,7 @@ index 6c9dddfc661..0e6e5a934ca 100644
if (subpath->getNumPoints() > 0) {
output += QString("M%1 %2").arg(subpath->getX(0)).arg(subpath->getY(0));
int j = 1;
-@@ -383,11 +375,7 @@ QString SvgOutputDev::printStroke()
+@@ -395,11 +387,7 @@ QString SvgOutputDev::printStroke()
return stroke;
}
@@ -202,7 +192,7 @@ index 6c9dddfc661..0e6e5a934ca 100644
{
int render = state->getRender();
// check for invisible text -- this is used by Acrobat Capture
-@@ -402,22 +390,10 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+@@ -414,22 +402,10 @@ void SvgOutputDev::drawString(GfxState *
QString str;
@@ -226,7 +216,7 @@ index 6c9dddfc661..0e6e5a934ca 100644
int uLen;
double dx, dy, originX, originY;
while (len > 0) {
-@@ -463,18 +439,10 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+@@ -475,18 +451,10 @@ void SvgOutputDev::drawString(GfxState *
*d->body << " y=\"" << y << "px\"";
if (font && font->getFamily()) {
@@ -245,7 +235,7 @@ index 6c9dddfc661..0e6e5a934ca 100644
//debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() );
}
*d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\"";
-@@ -494,15 +462,9 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+@@ -506,15 +474,9 @@ void SvgOutputDev::drawString(GfxState *
*d->body << "</text>" << endl;
}
@@ -259,13 +249,11 @@ index 6c9dddfc661..0e6e5a934ca 100644
bool interpolate, const int *maskColors, bool inlineImg)
-#endif
{
- Q_UNUSED(ref)
Q_UNUSED(interpolate)
-diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h
-index 96cdb594309..9eeb105c81b 100644
+ Q_UNUSED(inlineImg)
--- a/filters/karbon/pdf/SvgOutputDev.h
+++ b/filters/karbon/pdf/SvgOutputDev.h
-@@ -40,22 +40,12 @@ public:
+@@ -53,22 +53,12 @@ public:
void eoFill(GfxState *state) override;
// text
@@ -288,7 +276,7 @@ index 96cdb594309..9eeb105c81b 100644
// styles
void updateAll(GfxState *state) override;
void updateFillColor(GfxState *state) override;
-@@ -70,11 +60,7 @@ public:
+@@ -83,11 +73,7 @@ public:
/// Dumps content to svg file
void dumpContent();
private:
@@ -300,6 +288,3 @@ index 96cdb594309..9eeb105c81b 100644
QString convertMatrix(const QMatrix &matrix);
QString convertMatrix(const double * matrix);
QString printFill();
---
-2.35.1
-
More information about the Neon-commits
mailing list