1 files changed, 0 insertions, 114 deletions
diff --git a/user/calligra/poppler2.patch b/user/calligra/poppler2.patch
deleted file mode 100644
index 6f18c070f..000000000
--- a/user/calligra/poppler2.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From fa4c2961b8280456d4c1484565b973d312e0bd1c Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Thu, 25 Oct 2018 23:04:39 +0200
-Subject: Mark the functions as override
-
-So when poppler API breaks (as it often does) it stops compiling and
-someone has to fix it
----
- filters/karbon/pdf/SvgOutputDev.cpp | 13 +++--------
- filters/karbon/pdf/SvgOutputDev.h   | 43 +++++++++++++++++--------------------
- 2 files changed, 23 insertions(+), 33 deletions(-)
-
-diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
-index 5692824..1d07f16 100644
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -387,7 +387,7 @@ QString SvgOutputDev::printStroke()
-     return stroke;
- }
- 
--void SvgOutputDev::drawString(GfxState * state, GooString * s)
-+void SvgOutputDev::drawString(GfxState * state, const GooString * s)
- {
-     int render = state->getRender();
-     // check for invisible text -- this is used by Acrobat Capture
-@@ -478,9 +478,9 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
-     *d->body << "</text>" << endl;
- }
- 
--void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
-+void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
-                              int width, int height, GfxImageColorMap *colorMap,
--                             int *maskColors, GBool /*inlineImg*/)
-+                             GBool /*interpolate*/, int *maskColors, GBool inlineImg)
- {
-     ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
-     imgStr->reset();
-@@ -547,10 +547,3 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
-     delete imgStr;
- }
- 
--void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
--                             int width, int height, GfxImageColorMap *colorMap,
--                             GBool /*interpolate*/, int *maskColors, GBool inlineImg)
--{
--    drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
--}
--
-diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h
-index 2a44908..422027c 100644
---- a/filters/karbon/pdf/SvgOutputDev.h
-+++ b/filters/karbon/pdf/SvgOutputDev.h
-@@ -46,38 +46,35 @@ public:
- 
-     GBool isOk();
- 
--    virtual GBool upsideDown();
--    virtual GBool useDrawChar();
--    virtual GBool interpretType3Chars();
--    virtual void startPage(int pageNum, GfxState *state, XRef *xref);
--    virtual void endPage();
-+    GBool upsideDown() override;
-+    GBool useDrawChar() override;
-+    GBool interpretType3Chars() override;
-+    void startPage(int pageNum, GfxState *state, XRef *xref) override;
-+    void endPage() override;
- 
-     // path painting
--    virtual void stroke(GfxState * state);
--    virtual void fill(GfxState * state);
--    virtual void eoFill(GfxState *state);
-+    void stroke(GfxState * state) override;
-+    void fill(GfxState * state) override;
-+    void eoFill(GfxState *state) override;
- 
-     // text
--    virtual void drawString(GfxState * state, GooString * s);
-+    void drawString(GfxState * state, const GooString * s) override;
- 
-     // images
--    virtual void drawImage(GfxState *state, Object *ref, Stream *str,
-+    void drawImage(GfxState *state, Object *ref, Stream *str,
-                            int width, int height, GfxImageColorMap *colorMap,
--                           int *maskColors, GBool inlineImg);
--    virtual void drawImage(GfxState *state, Object *ref, Stream *str,
--                           int width, int height, GfxImageColorMap *colorMap,
--                           GBool interpolate, int *maskColors, GBool inlineImg);
-+                           GBool interpolate, int *maskColors, GBool inlineImg) override;
- 
-     // styles
--    virtual void updateAll(GfxState *state);
--    virtual void updateFillColor(GfxState *state);
--    virtual void updateStrokeColor(GfxState *state);
--    virtual void updateFillOpacity(GfxState *state);
--    virtual void updateStrokeOpacity(GfxState *state);
--    virtual void updateLineJoin(GfxState *state);
--    virtual void updateLineCap(GfxState *state);
--    virtual void updateMiterLimit(GfxState *state);
--    virtual void updateLineWidth(GfxState *state);
-+    void updateAll(GfxState *state) override;
-+    void updateFillColor(GfxState *state) override;
-+    void updateStrokeColor(GfxState *state) override;
-+    void updateFillOpacity(GfxState *state) override;
-+    void updateStrokeOpacity(GfxState *state) override;
-+    void updateLineJoin(GfxState *state) override;
-+    void updateLineCap(GfxState *state) override;
-+    void updateMiterLimit(GfxState *state) override;
-+    void updateLineWidth(GfxState *state) override;
- 
-     /// Dumps content to svg file
-     void dumpContent();
--- 
-cgit v1.1
-