Merge branch 'sync_upstream' into 'master'

Rebase patches against upstream

See merge request mer-core/calligra!45

rpm/calligra-background.patch

@@ -1,17 +1,17 @@
-From 6596dbd5e5c25f7b5cefea4dbc2f0b2f30fef1c3 Mon Sep 17 00:00:00 2001
+From 4bb4d98c05e08f90ef9b1725bef60c64137f3206 Mon Sep 17 00:00:00 2001
 From: Damien Caliste <dcaliste@free.fr>
 Date: Tue, 11 Dec 2018 13:27:28 +0100
-Subject: [PATCH 10/10] Reenable transparent background.
+Subject: [PATCH 12/14] Reenable transparent background.
 
 ---
  words/part/KWCanvasItem.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/words/part/KWCanvasItem.cpp b/words/part/KWCanvasItem.cpp
-index ce850e5e738..18f5b4040c5 100644
+index 1edd07e1764..247518b0f44 100644
 --- a/words/part/KWCanvasItem.cpp
 +++ b/words/part/KWCanvasItem.cpp
-@@ -163,7 +163,7 @@ void KWCanvasItem::updateCanvas(const QRectF &rc)
+@@ -162,7 +162,7 @@ void KWCanvasItem::updateCanvas(const QRectF &rc)
 
  void KWCanvasItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *)
  {
@@ -21,5 +21,5 @@ index ce850e5e738..18f5b4040c5 100644
  }
 
 -- 
-2.20.1
+2.23.0
 

rpm/calligra-buildsystem.patch

@@ -1,7 +1,7 @@
-From dd282581767914695602585d5580615dbed28001 Mon Sep 17 00:00:00 2001
+From 0caea77821ff484ed0bd017242180d50a118b289 Mon Sep 17 00:00:00 2001
 From: Damien Caliste <dcaliste@free.fr>
 Date: Tue, 11 Dec 2018 13:13:49 +0100
-Subject: [PATCH 04/10] Disable various dependencies in build system.
+Subject: [PATCH 04/14] Disable various dependencies in build system.
 
 ---
  CMakeLists.txt                      | 29 +++++++++++++++--------------
@@ -19,7 +19,7 @@ Subject: [PATCH 04/10] Disable various dependencies in build system.
  12 files changed, 46 insertions(+), 39 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 81e2a5760ed..05137cd8984 100644
+index 273a0b45f3d..8c69e8e37fc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -202,6 +202,7 @@ include(MacroDesktopToJson)
@@ -79,10 +79,10 @@ index 81e2a5760ed..05137cd8984 100644
 
  # Qt5Declarative was removed in Qt 5.6.0 so search for it in a separate call
 diff --git a/karbon/CMakeLists.txt b/karbon/CMakeLists.txt
-index 98eae2b828d..909418d11e7 100644
+index 10b9498c658..2092058bbbe 100644
 --- a/karbon/CMakeLists.txt
 +++ b/karbon/CMakeLists.txt
-@@ -60,6 +60,9 @@ ecm_install_icons(ICONS
+@@ -61,6 +61,9 @@ ecm_install_icons(ICONS
      DESTINATION ${ICON_INSTALL_DIR}
  )
 
@@ -299,5 +299,5 @@ index 9bdc840fa65..700d80b154d 100644
       KPrPdfPrintJob.cpp
       KPrSlidesSorterDocumentModel.cpp
 -- 
-2.20.1
+2.23.0
 

rpm/calligra-cache.patch

@@ -1,7 +1,7 @@
-From 93f5ab5db6210f6583996236ed6b79e912064773 Mon Sep 17 00:00:00 2001
+From 66fa918f0550fa735b2cb3496cdddf33d5d3df6a Mon Sep 17 00:00:00 2001
 From: Damien Caliste <dcaliste@free.fr>
 Date: Tue, 11 Dec 2018 13:26:34 +0100
-Subject: [PATCH 08/10] Enable page caching to improve performences.
+Subject: [PATCH 10/14] Enable page caching to improve performences.
 
 ---
  words/part/KWCanvasBase.cpp | 2 +-
@@ -21,5 +21,5 @@ index f20322ab14b..7e9a35ee602 100644
 
  KWCanvasBase::~KWCanvasBase()
 -- 
-2.20.1
+2.23.0
 

rpm/calligra-error-reporting.patch

@@ -1,8 +1,8 @@
-From a7e305bbfa9015b8a5ce2fbcaaf07d0a397d760f Mon Sep 17 00:00:00 2001
+From 57c986fbd6e28460549dd32cd60094bfb271714a Mon Sep 17 00:00:00 2001
 From: Pekka Vuorela <pekka.vuorela@jolla.com>
 Date: Thu, 23 May 2019 11:13:41 +0300
-Subject: [PATCH] Add error reporting signals for KoDocument and use it in
- components
+Subject: [PATCH 07/14] Add error reporting signals for KoDocument and use it
+ in components
 
 ---
  components/Document.cpp              | 16 +++++++++++++
@@ -64,7 +64,7 @@ index e29b871db55..d4267e6685d 100644
          connect(impl, &DocumentImpl::currentIndexChanged, q, &Document::currentIndexChanged);
          connect(impl, &DocumentImpl::requestViewUpdate, q, &Document::requestViewUpdate);
 diff --git a/components/Document.h b/components/Document.h
-index 1f5a005ea29..b350d7e437c 100644
+index b846e941bce..70608447ad6 100644
 --- a/components/Document.h
 +++ b/components/Document.h
 @@ -88,6 +88,8 @@ class Document : public QObject
@@ -75,7 +75,7 @@ index 1f5a005ea29..b350d7e437c 100644
 +
  public:
      explicit Document(QObject* parent = 0);
-     ~Document();
+     ~Document() override;
 @@ -114,6 +116,9 @@ public:
       */
      int indexCount() const;
@@ -95,7 +95,7 @@ index 1f5a005ea29..b350d7e437c 100644
      /**
       * Notify signal for property #currentIndex.
 diff --git a/components/impl/DocumentImpl.h b/components/impl/DocumentImpl.h
-index cddc31c07c5..75f7d64a52e 100644
+index 142d56ce284..de148e4491b 100644
 --- a/components/impl/DocumentImpl.h
 +++ b/components/impl/DocumentImpl.h
 @@ -68,6 +68,7 @@ Q_SIGNALS:
@@ -107,10 +107,10 @@ index cddc31c07c5..75f7d64a52e 100644
  protected:
      void setDocumentType(DocumentType::Type type);
 diff --git a/components/impl/PresentationImpl.cpp b/components/impl/PresentationImpl.cpp
-index 714740f367c..e6381b73881 100644
+index 3ca29fb24c2..8e896946a91 100644
 --- a/components/impl/PresentationImpl.cpp
 +++ b/components/impl/PresentationImpl.cpp
-@@ -164,6 +164,8 @@ bool PresentationImpl::load(const QUrl& url)
+@@ -166,6 +166,8 @@ bool PresentationImpl::load(const QUrl& url)
 
      d->part = new KPrPart{this};
      d->document = new KPrDocument{d->part};
@@ -120,10 +120,10 @@ index 714740f367c..e6381b73881 100644
      d->part->setDocument(d->document);
 
 diff --git a/components/impl/SpreadsheetImpl.cpp b/components/impl/SpreadsheetImpl.cpp
-index 9512918fe45..260f4975add 100644
+index 0ab71e1e8d2..9a8d4232353 100644
 --- a/components/impl/SpreadsheetImpl.cpp
 +++ b/components/impl/SpreadsheetImpl.cpp
-@@ -166,6 +166,8 @@ bool SpreadsheetImpl::load(const QUrl& url)
+@@ -168,6 +168,8 @@ bool SpreadsheetImpl::load(const QUrl& url)
      d->part = new Calligra::Sheets::Part{this};
      d->document = new Calligra::Sheets::Doc{d->part};
      setKoDocument(d->document);
@@ -133,10 +133,10 @@ index 9512918fe45..260f4975add 100644
 
      bool retval = d->document->openUrl(url);
 diff --git a/components/impl/TextDocumentImpl.cpp b/components/impl/TextDocumentImpl.cpp
-index 5dd7f881aff..6968ccd4746 100644
+index 63cd5a9b03a..c558d500788 100644
 --- a/components/impl/TextDocumentImpl.cpp
 +++ b/components/impl/TextDocumentImpl.cpp
-@@ -180,6 +180,8 @@ bool TextDocumentImpl::load(const QUrl& url)
+@@ -182,6 +182,8 @@ bool TextDocumentImpl::load(const QUrl& url)
 
      d->part = new KWPart{this};
      d->document = new KWDocument{d->part};
@@ -146,7 +146,7 @@ index 5dd7f881aff..6968ccd4746 100644
      d->part->setDocument(d->document);
 
 diff --git a/libs/main/KoDocument.cpp b/libs/main/KoDocument.cpp
-index 9a8cedff8bd..0c530106b3e 100644
+index 8ab1ca289d0..c7740fdf786 100644
 --- a/libs/main/KoDocument.cpp
 +++ b/libs/main/KoDocument.cpp
 @@ -160,7 +160,7 @@ public:
@@ -245,7 +245,7 @@ index 9a8cedff8bd..0c530106b3e 100644
  {
      d->profileStream = profilestream;
 diff --git a/libs/main/KoDocument.h b/libs/main/KoDocument.h
-index 36472c95a01..4d8cdd35cdf 100644
+index 1af2193d9fd..f2b04ddda42 100644
 --- a/libs/main/KoDocument.h
 +++ b/libs/main/KoDocument.h
 @@ -759,6 +759,7 @@ Q_SIGNALS:
@@ -266,5 +266,5 @@ index 36472c95a01..4d8cdd35cdf 100644
      bool oldLoadAndParse(KoStore *store, const QString& filename, KoXmlDocument& doc);
  private:
 -- 
-2.20.1
+2.23.0
 

rpm/calligra-fake-kde4libs.patch

@@ -1,7 +1,7 @@
-From 1e5f2946052f9f1712ee24fcd80716aae05dec1f Mon Sep 17 00:00:00 2001
+From 52e4cd8852394df7ea8dc3f6a812e2c93d494ccb Mon Sep 17 00:00:00 2001
 From: Damien Caliste <dcaliste@free.fr>
 Date: Tue, 11 Dec 2018 13:02:17 +0100
-Subject: [PATCH 01/10] Add fake kde4libs headers.
+Subject: [PATCH 01/14] Add fake kde4libs headers.
 
 ---
  plugins/pictureshape/kfile.h       |   64 +
@@ -4075,5 +4075,5 @@ index 00000000000..11077d4cef4
 +
 +#endif
 -- 
-2.20.1
+2.23.0
 

rpm/calligra-find.patch

@@ -1,7 +1,7 @@
-From 922bbf563762ff76aa0ccd4f3ec97ef9550a0df9 Mon Sep 17 00:00:00 2001
+From 555fcf6ce7194892a7125fe309435b691e14f190 Mon Sep 17 00:00:00 2001
 From: Damien Caliste <dcaliste@free.fr>
 Date: Tue, 11 Dec 2018 13:13:11 +0100
-Subject: [PATCH 03/10] Disable windowing actions in find strategy.
+Subject: [PATCH 03/14] Disable windowing actions in find strategy.
 
 ---
  libs/text/FindDirection_p.cpp |  4 +--
@@ -297,5 +297,5 @@ index d757099d889..cf22224eef6 100644
      QTextDocument *document;
      QTextDocument *startDocument;
 -- 
-2.20.1
+2.23.0
 

rpm/calligra-invalidate-cache.patch

@@ -1,41 +1,41 @@
-From 3bd0ee6215b699b1249d25e91da53026cb5c9420 Mon Sep 17 00:00:00 2001
+From ccb193205d30adb564315e3d9eaa51bdb7d16d35 Mon Sep 17 00:00:00 2001
 From: Andrew den Exter <andrew.den.exter@qinetic.com.au>
 Date: Mon, 13 May 2019 03:24:40 -0400
-Subject: [PATCH 01/12] Update the document cache when an image is reloaded.
+Subject: [PATCH 13/14] Update the document cache when an image is reloaded.
 
 ---
  sheets/part/CanvasItem.h    | 5 +++--
  words/part/KWCanvasItem.cpp | 2 +-
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/sheets/part/CanvasItem.h b/sheets/part/CanvasItem.h
-index 9497292..feebf02 100644
+index e1a21dd6aab..3df62375b28 100644
 --- a/sheets/part/CanvasItem.h
 +++ b/sheets/part/CanvasItem.h
 @@ -121,6 +121,7 @@ public Q_SLOTS:
  Q_SIGNALS:
-     /* virtual */ void documentSizeChanged(const QSize&);
+     /* virtual */ void documentSizeChanged(const QSize&) override;
      void obscuredRangeChanged(const Calligra::Sheets::Sheet* sheet, const QSize&);
 +    void canvasUpdated();
 
  public:
-     virtual void mousePressEvent(QGraphicsSceneMouseEvent* _ev);
+     void mousePressEvent(QGraphicsSceneMouseEvent* _ev) override;
 @@ -170,8 +171,8 @@ public:
-     virtual void setVertScrollBarPos(qreal) {}
-     virtual void setHorizScrollBarPos(qreal) {}
+     void setVertScrollBarPos(qreal) override {}
+     void setHorizScrollBarPos(qreal) override {}
 
--    virtual void update() { QGraphicsWidget::update(); }
--    virtual void update(const QRectF& rect) { QGraphicsWidget::update(rect); }
-+    virtual void update() { QGraphicsWidget::update(); emit canvasUpdated(); }
-+    virtual void update(const QRectF& rect) { QGraphicsWidget::update(rect); emit canvasUpdated(); }
-     virtual Qt::LayoutDirection layoutDirection() const { return QGraphicsWidget::layoutDirection(); }
-     virtual QRectF rect() const { return QGraphicsWidget::rect(); }
-     virtual QSizeF size() const { return QGraphicsWidget::size(); }
+-    void update() override { QGraphicsWidget::update(); }
+-    void update(const QRectF& rect) override { QGraphicsWidget::update(rect); }
++    void update() override { QGraphicsWidget::update(); emit canvasUpdated(); }
++    void update(const QRectF& rect) override { QGraphicsWidget::update(rect); emit canvasUpdated(); }
+     Qt::LayoutDirection layoutDirection() const override { return QGraphicsWidget::layoutDirection(); }
+     QRectF rect() const override { return QGraphicsWidget::rect(); }
+     QSizeF size() const override { return QGraphicsWidget::size(); }
 diff --git a/words/part/KWCanvasItem.cpp b/words/part/KWCanvasItem.cpp
-index 18f5b40..0885708 100644
+index 247518b0f44..dc7e759a693 100644
 --- a/words/part/KWCanvasItem.cpp
 +++ b/words/part/KWCanvasItem.cpp
-@@ -157,7 +157,7 @@ void KWCanvasItem::updateInputMethodInfo()
+@@ -156,7 +156,7 @@ void KWCanvasItem::updateInputMethodInfo()
 
  void KWCanvasItem::updateCanvas(const QRectF &rc)
  {
@@ -45,5 +45,5 @@ index 18f5b40..0885708 100644
  }
 
 -- 
-1.8.3-rc3
+2.23.0
 

rpm/calligra-libs.patch

@@ -1,7 +1,7 @@
-From 20635033602eaa8b6607594558a885569aab9f1d Mon Sep 17 00:00:00 2001
+From 5e16ef3344e098ed8fc948f1bbb592a27abc920e Mon Sep 17 00:00:00 2001
 From: Damien Caliste <dcaliste@free.fr>
 Date: Tue, 11 Dec 2018 13:19:59 +0100
-Subject: [PATCH 05/10] Disable various dependencies in libs.
+Subject: [PATCH 05/14] Disable various dependencies in libs.
 
 ---
  libs/main/KoApplication.cpp         |  4 ++--
@@ -35,7 +35,7 @@ index a8416e0ad69..cea05f88796 100644
          KoPart *part = entry.createKoPart(&errorMsg);
          d->partList << part;
 diff --git a/libs/main/KoDocument.cpp b/libs/main/KoDocument.cpp
-index 4f06210ae05..87de27cceb4 100644
+index 2af8c9c216a..8ab1ca289d0 100644
 --- a/libs/main/KoDocument.cpp
 +++ b/libs/main/KoDocument.cpp
 @@ -25,7 +25,9 @@
@@ -100,7 +100,7 @@ index 4f06210ae05..87de27cceb4 100644
          KoXmlDocument versionInfo;
          KoOdfReadStore oasisStore(store);
 diff --git a/libs/main/KoMainWindow.cpp b/libs/main/KoMainWindow.cpp
-index 8f28680435c..c9bb39b8071 100644
+index 73720ada303..bc104819dcc 100644
 --- a/libs/main/KoMainWindow.cpp
 +++ b/libs/main/KoMainWindow.cpp
 @@ -45,7 +45,7 @@
@@ -122,7 +122,7 @@ index 8f28680435c..c9bb39b8071 100644
          } else {
              KRecentDocument::add(url.adjusted(QUrl::StripTrailingSlash));
 diff --git a/libs/main/KoRecentDocumentsPane.cpp b/libs/main/KoRecentDocumentsPane.cpp
-index b920ea3a303..e77e47bbf4f 100644
+index fe3eaa5878b..3c3081d97c8 100644
 --- a/libs/main/KoRecentDocumentsPane.cpp
 +++ b/libs/main/KoRecentDocumentsPane.cpp
 @@ -27,7 +27,9 @@
@@ -308,7 +308,7 @@ index ed9b5562a7f..3a05f7f6332 100644
  void NetAccess::slotData(KIO::Job *, const QByteArray &data)
  {
 diff --git a/libs/store/KoNetAccess.h b/libs/store/KoNetAccess.h
-index f3e5f14e34c..d00d33b7f0e 100644
+index 9d8cc4979a7..1c061d71e30 100644
 --- a/libs/store/KoNetAccess.h
 +++ b/libs/store/KoNetAccess.h
 @@ -474,7 +474,7 @@ private:
@@ -321,5 +321,5 @@ index f3e5f14e34c..d00d33b7f0e 100644
      void slotData(KIO::Job *, const QByteArray &);
      void slotRedirection(KIO::Job *, const QUrl &);
 -- 
-2.20.1
+2.23.0
 

rpm/calligra-plugins.patch

@@ -1,14 +1,14 @@
-From a4f0a0d0a88ccd2a713ca3197ab23dc4ef059d69 Mon Sep 17 00:00:00 2001
+From d041e09b7e4e0e69cb8e363e495aea6e9b9d6194 Mon Sep 17 00:00:00 2001
 From: Damien Caliste <dcaliste@free.fr>
 Date: Tue, 11 Dec 2018 13:21:35 +0100
-Subject: [PATCH 06/10] Disable various dependencies in plugins.
+Subject: [PATCH 06/14] Disable various dependencies in plugins.
 
 ---
  plugins/textshape/TextTool.cpp | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/plugins/textshape/TextTool.cpp b/plugins/textshape/TextTool.cpp
-index c5ab189ec42..d1852cb41dd 100644
+index 8a58425d886..b81161514c1 100644
 --- a/plugins/textshape/TextTool.cpp
 +++ b/plugins/textshape/TextTool.cpp
 @@ -76,8 +76,10 @@
@@ -22,15 +22,15 @@ index c5ab189ec42..d1852cb41dd 100644
  #include <kactionmenu.h>
  #include <kstandardaction.h>
  #include <ksharedconfig.h>
-@@ -2914,6 +2916,7 @@ void TextTool::runUrl(KoPointerEvent *event, QString &url)
+@@ -2916,6 +2918,7 @@ void TextTool::runUrl(KoPointerEvent *event, QString &url)
          QMimeDatabase db;
          QString type = db.mimeTypeForUrl(_url).name();
 
 +#ifdef HAVE_KRUN
          if (KRun::isExecutableFile(_url, type)) {
              QString question = i18n("This link points to the program or script '%1'.\n"
                                      "Malicious programs can harm your computer. "
-@@ -2924,10 +2927,13 @@ void TextTool::runUrl(KoPointerEvent *event, QString &url)
+@@ -2926,10 +2929,13 @@ void TextTool::runUrl(KoPointerEvent *event, QString &url)
              if (choice != KMessageBox::Yes)
                  return;
          }
@@ -45,5 +45,5 @@ index c5ab189ec42..d1852cb41dd 100644
 
  void TextTool::debugTextDocument()
 -- 
-2.20.1
+2.23.0