Merge branch 'converter' into 'master'

[calligra] Update to latest upstream and package converter.

See merge request mer-core/calligra!56

rpm/calligra-background.patch → rpm/0001-Reenable-transparent-background.patch

@@ -1,14 +1,14 @@
-From 4bb4d98c05e08f90ef9b1725bef60c64137f3206 Mon Sep 17 00:00:00 2001
+From b4e383c70f819d33a2dbaef2a06f1e1d8b07bb78 Mon Sep 17 00:00:00 2001
 From: Damien Caliste <dcaliste@free.fr>
 Date: Tue, 11 Dec 2018 13:27:28 +0100
-Subject: [PATCH 12/14] Reenable transparent background.
+Subject: [PATCH] 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 1edd07e1764..247518b0f44 100644
+index 4f2f9da21e7..7e7e265be5b 100644
 --- a/words/part/KWCanvasItem.cpp
 +++ b/words/part/KWCanvasItem.cpp
 @@ -162,7 +162,7 @@ void KWCanvasItem::updateCanvas(const QRectF &rc)
@@ -21,5 +21,5 @@ index 1edd07e1764..247518b0f44 100644
  }
 
 -- 
-2.23.0
+2.29.2
 

rpm/calligra-buildsystem.patch → rpm/0002-Disable-various-dependencies-in-build-system.patch

@@ -1,44 +1,48 @@
-From 0caea77821ff484ed0bd017242180d50a118b289 Mon Sep 17 00:00:00 2001
+From 881264d06ffb7cd9c56357f37f341af5a1149c32 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/14] Disable various dependencies in build system.
+Subject: [PATCH] Disable various dependencies in build system.
 
 ---
- CMakeLists.txt                      | 29 +++++++++++++++--------------
+ CMakeLists.txt                      | 33 +++++++++++++++--------------
  karbon/CMakeLists.txt               |  3 +++
  libs/main/CMakeLists.txt            |  4 ++--
  libs/store/CMakeLists.txt           |  4 ++--
- libs/text/CMakeLists.txt            |  8 ++++----
+ libs/text/CMakeLists.txt            |  8 +++----
  libs/widgets/CMakeLists.txt         |  4 ++--
  plugins/pictureshape/CMakeLists.txt |  6 ++++--
  plugins/textshape/CMakeLists.txt    |  4 ++--
- sheets/CMakeLists.txt               | 15 ++++++++-------
+ sheets/CMakeLists.txt               | 15 +++++++------
  sheets/plugins/CMakeLists.txt       |  2 +-
- sheets/shape/CMakeLists.txt         |  2 +-
  stage/part/CMakeLists.txt           |  4 ++--
- 12 files changed, 46 insertions(+), 39 deletions(-)
+ 11 files changed, 47 insertions(+), 40 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 273a0b45f3d..8c69e8e37fc 100644
+index 343525cb02a..944a2f798b1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -202,6 +202,7 @@ include(MacroDesktopToJson)
+@@ -201,6 +201,7 @@ include(MacroDesktopToJson)
 
- set(REQUIRED_KF5_VERSION "5.7.0")
+ set(REQUIRED_KF5_VERSION "5.30.0")
 
 +set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/calligra-kf5")
  find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
      COMPONENTS
      Archive
-@@ -211,24 +212,24 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
+@@ -209,27 +210,27 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
+     Config
      ConfigWidgets
      CoreAddons
+-    Crash
++#    Crash
      DBusAddons
 -    DocTools
 +#    DocTools
      GuiAddons
      I18n
      IconThemes
+-    Init
++#    Init
      ItemViews
 -    JobWidgets
 -    KCMUtils
@@ -67,7 +71,7 @@ index 273a0b45f3d..8c69e8e37fc 100644
      XmlGui
      )
 
-@@ -270,8 +271,8 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET
+@@ -261,8 +262,8 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET
      DBus
      OpenGL
      Quick
@@ -77,9 +81,9 @@ index 273a0b45f3d..8c69e8e37fc 100644
 +#    Sql
  )
 
- # Qt5Declarative was removed in Qt 5.6.0 so search for it in a separate call
+ set_package_properties(Qt5DBus PROPERTIES
 diff --git a/karbon/CMakeLists.txt b/karbon/CMakeLists.txt
-index 10b9498c658..2092058bbbe 100644
+index 3fc2d09d359..bfbe3eaff52 100644
 --- a/karbon/CMakeLists.txt
 +++ b/karbon/CMakeLists.txt
 @@ -61,6 +61,9 @@ ecm_install_icons(ICONS
@@ -153,10 +157,10 @@ index 16d7e066fa2..4d7c38dcfa7 100644
  if( SHOULD_BUILD_FEATURE_RDF )
      target_link_libraries(kotext PRIVATE ${SOPRANO_LIBRARIES})
 diff --git a/libs/widgets/CMakeLists.txt b/libs/widgets/CMakeLists.txt
-index dad5d91e1e3..cac0998057f 100644
+index 1cda349fb5f..2382f388f60 100644
 --- a/libs/widgets/CMakeLists.txt
 +++ b/libs/widgets/CMakeLists.txt
-@@ -90,7 +90,7 @@ set(kowidgets_LIB_SRCS
+@@ -87,7 +87,7 @@ set(kowidgets_LIB_SRCS
      KoModeBoxFactory.cpp
 
      KoDocumentInfoDlg.cpp
@@ -165,7 +169,7 @@ index dad5d91e1e3..cac0998057f 100644
 
      KoGlobal.cpp
      KoTableView.cpp
-@@ -118,7 +118,7 @@ target_link_libraries(kowidgets
+@@ -115,7 +115,7 @@ target_link_libraries(kowidgets
          kotext
          pigmentcms
          kowidgetutils
@@ -213,7 +217,7 @@ index af165b4a621..648f1fd3fa0 100644
    KF5::WidgetsAddons
    KF5::Completion
 diff --git a/sheets/CMakeLists.txt b/sheets/CMakeLists.txt
-index 87a8e6f6f64..0506edd7435 100644
+index 60da4f63edd..8900775c833 100644
 --- a/sheets/CMakeLists.txt
 +++ b/sheets/CMakeLists.txt
 @@ -72,7 +72,7 @@ set (commands_DIR_SRCS
@@ -270,21 +274,8 @@ index b18b166b3ac..af12e68b4f0 100644
  add_subdirectory( solver )
  if (SHOULD_BUILD_FEATURE_SCRIPTING)
    add_subdirectory( scripting )
-diff --git a/sheets/shape/CMakeLists.txt b/sheets/shape/CMakeLists.txt
-index 5a9b91a2e7c..542c840c259 100644
---- a/sheets/shape/CMakeLists.txt
-+++ b/sheets/shape/CMakeLists.txt
-@@ -26,7 +26,7 @@ add_library(calligra_shape_spreadsheet MODULE TableShapeFactory.cpp)
- calligra_shape_desktop_to_json(calligra_shape_spreadsheet calligra_shape_spreadsheet.desktop)
-
- target_link_libraries(calligra_shape_spreadsheet-deferred PUBLIC calligrasheetscommon PRIVATE KF5::Completion)
--target_link_libraries(calligra_shape_spreadsheet flake KF5::KDELibs4Support)
-+target_link_libraries(calligra_shape_spreadsheet flake)
-
- install(TARGETS calligra_shape_spreadsheet-deferred DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/deferred)
- install(TARGETS calligra_shape_spreadsheet DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/shapes)
 diff --git a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt
-index 9bdc840fa65..700d80b154d 100644
+index 264d2fcd25f..d17dc716989 100644
 --- a/stage/part/CMakeLists.txt
 +++ b/stage/part/CMakeLists.txt
 @@ -60,8 +60,8 @@ set( calligrastageprivate_LIB_SRCS
@@ -299,5 +290,5 @@ index 9bdc840fa65..700d80b154d 100644
       KPrPdfPrintJob.cpp
       KPrSlidesSorterDocumentModel.cpp
 -- 
-2.23.0
+2.29.2
 

rpm/calligra-cache.patch → rpm/0003-Enable-page-caching-to-improve-performences.patch

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

rpm/calligra-error-reporting.patch → rpm/0004-Add-error-reporting-signals-for-KoDocument-and-use-i.patch

@@ -1,8 +1,8 @@
-From e239414509c50c57ba6a40a5f1ea2643ac6e50ec Mon Sep 17 00:00:00 2001
+From efa6d8035dd01e7f7f7d1c11365f8981c30428a5 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 07/14] Add error reporting signals for KoDocument and use it
- in components
+Subject: [PATCH] Add error reporting signals for KoDocument and use it in
+ components
 
 ---
  components/Document.cpp              | 16 +++++++++++++
@@ -16,7 +16,7 @@ Subject: [PATCH 07/14] Add error reporting signals for KoDocument and use it
  8 files changed, 58 insertions(+), 10 deletions(-)
 
 diff --git a/components/Document.cpp b/components/Document.cpp
-index 90b34609854..6a9356c64c4 100644
+index 6d4664c0a89..fa11713aede 100644
 --- a/components/Document.cpp
 +++ b/components/Document.cpp
 @@ -54,6 +54,7 @@ public:
@@ -120,7 +120,7 @@ index 3ca29fb24c2..8e896946a91 100644
      d->part->setDocument(d->document);
 
 diff --git a/components/impl/SpreadsheetImpl.cpp b/components/impl/SpreadsheetImpl.cpp
-index 0ab71e1e8d2..9a8d4232353 100644
+index e15f929c573..d1895cdd6b5 100644
 --- a/components/impl/SpreadsheetImpl.cpp
 +++ b/components/impl/SpreadsheetImpl.cpp
 @@ -168,6 +168,8 @@ bool SpreadsheetImpl::load(const QUrl& url)
@@ -133,7 +133,7 @@ index 0ab71e1e8d2..9a8d4232353 100644
 
      bool retval = d->document->openUrl(url);
 diff --git a/components/impl/TextDocumentImpl.cpp b/components/impl/TextDocumentImpl.cpp
-index 63cd5a9b03a..c558d500788 100644
+index 60718286720..ddebcea68ba 100644
 --- a/components/impl/TextDocumentImpl.cpp
 +++ b/components/impl/TextDocumentImpl.cpp
 @@ -182,6 +182,8 @@ bool TextDocumentImpl::load(const QUrl& url)
@@ -146,10 +146,10 @@ index 63cd5a9b03a..c558d500788 100644
      d->part->setDocument(d->document);
 
 diff --git a/libs/main/KoDocument.cpp b/libs/main/KoDocument.cpp
-index 8ab1ca289d0..c7740fdf786 100644
+index 62652806824..ee4d9a168e9 100644
 --- a/libs/main/KoDocument.cpp
 +++ b/libs/main/KoDocument.cpp
-@@ -160,7 +160,7 @@ public:
+@@ -158,7 +158,7 @@ public:
          modifiedAfterAutosave(false),
          autosaving(false),
          shouldCheckAutoSaveFile(true),
@@ -160,7 +160,7 @@ index 8ab1ca289d0..c7740fdf786 100644
          doNotSaveExtDoc(false),
 @@ -464,6 +464,7 @@ KoDocument::KoDocument(KoPart *parent, KUndo2Stack *undoStack)
 
-     connect(d->undoStack, SIGNAL(indexChanged(int)), this, SLOT(slotUndoStackIndexChanged(int)));
+     connect(d->undoStack, &KUndo2QStack::indexChanged, this, &KoDocument::slotUndoStackIndexChanged);
 
 +    setAutoErrorHandlingEnabled(true);
  }
@@ -178,7 +178,7 @@ index 8ab1ca289d0..c7740fdf786 100644
              }
 
          }
-@@ -704,7 +705,16 @@ void KoDocument::setCheckAutoSaveFile(bool b)
+@@ -702,7 +703,16 @@ void KoDocument::setCheckAutoSaveFile(bool b)
 
  void KoDocument::setAutoErrorHandlingEnabled(bool b)
  {
@@ -232,7 +232,7 @@ index 8ab1ca289d0..c7740fdf786 100644
              }
          }
      }
-@@ -2359,6 +2370,11 @@ void KoDocument::slotUndoStackIndexChanged(int idx)
+@@ -2347,6 +2358,11 @@ void KoDocument::slotUndoStackIndexChanged(int idx)
      setModified(idx != d->undoStack->cleanIndex());
  }
 
@@ -266,5 +266,5 @@ index 1af2193d9fd..f2b04ddda42 100644
      bool oldLoadAndParse(KoStore *store, const QString& filename, KoXmlDocument& doc);
  private:
 -- 
-2.24.1
+2.29.2
 

rpm/calligra-fake-kde4libs.patch → rpm/0005-Add-fake-kde4libs-headers.patch

@@ -1,7 +1,7 @@
-From 52e4cd8852394df7ea8dc3f6a812e2c93d494ccb Mon Sep 17 00:00:00 2001
+From f9bb39a2c9d6636f74ca8b83a1aef64132687fd9 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/14] Add fake kde4libs headers.
+Subject: [PATCH] Add fake kde4libs headers.
 
 ---
  plugins/pictureshape/kfile.h       |   64 +
@@ -4075,5 +4075,5 @@ index 00000000000..11077d4cef4
 +
 +#endif
 -- 
-2.23.0
+2.29.2
 

rpm/calligra-find.patch → rpm/0006-Disable-windowing-actions-in-find-strategy.patch

@@ -1,7 +1,7 @@
-From 555fcf6ce7194892a7125fe309435b691e14f190 Mon Sep 17 00:00:00 2001
+From 67ffa3428bcd369e84b276ea161f56d3dfdd249b 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/14] Disable windowing actions in find strategy.
+Subject: [PATCH] Disable windowing actions in find strategy.
 
 ---
  libs/text/FindDirection_p.cpp |  4 +--
@@ -57,7 +57,7 @@ index 21513b7ec20..8a48a923726 100644
  }
 
 diff --git a/libs/text/KoFind_p.cpp b/libs/text/KoFind_p.cpp
-index d6cdd891817..965314f19ee 100644
+index ee46e8c0616..3123eb747e2 100644
 --- a/libs/text/KoFind_p.cpp
 +++ b/libs/text/KoFind_p.cpp
 @@ -23,9 +23,11 @@
@@ -164,7 +164,7 @@ index d6cdd891817..965314f19ee 100644
      parseSettingsAndFind();
 
 +#ifdef HAVE_ACTION
-     QTimer::singleShot(0, findStrategy.dialog(), SLOT(show())); // show the findDialog again.
+     QTimer::singleShot(0, findStrategy.dialog(), &QWidget::show); // show the findDialog again.
 +#endif
  }
 
@@ -297,5 +297,5 @@ index d757099d889..cf22224eef6 100644
      QTextDocument *document;
      QTextDocument *startDocument;
 -- 
-2.23.0
+2.29.2
 

rpm/calligra-invalidate-cache.patch → rpm/0007-Update-the-document-cache-when-an-image-is-reloaded.patch

@@ -1,7 +1,7 @@
-From ccb193205d30adb564315e3d9eaa51bdb7d16d35 Mon Sep 17 00:00:00 2001
+From 7aa8924c43bb3edbf961878014b5734717d4ccdb 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 13/14] Update the document cache when an image is reloaded.
+Subject: [PATCH] Update the document cache when an image is reloaded.
 
 ---
  sheets/part/CanvasItem.h    | 5 +++--
@@ -32,7 +32,7 @@ index e1a21dd6aab..3df62375b28 100644
      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 247518b0f44..dc7e759a693 100644
+index 7e7e265be5b..f795b15bd39 100644
 --- a/words/part/KWCanvasItem.cpp
 +++ b/words/part/KWCanvasItem.cpp
 @@ -156,7 +156,7 @@ void KWCanvasItem::updateInputMethodInfo()
@@ -45,5 +45,5 @@ index 247518b0f44..dc7e759a693 100644
  }
 
 -- 
-2.23.0
+2.29.2