Merge branch 'sync_with_upstream' into 'master'

[calligra] Sync with upstream. Contributes to JB#44422

See merge request mer-core/calligra!4

rpm/calligra-background.patch

@@ -1,7 +1,7 @@
 From 6596dbd5e5c25f7b5cefea4dbc2f0b2f30fef1c3 Mon Sep 17 00:00:00 2001
 From: Damien Caliste <dcaliste@free.fr>
 Date: Tue, 11 Dec 2018 13:27:28 +0100
-Subject: [PATCH 11/11] Reenable transparent background.
+Subject: [PATCH 10/10] Reenable transparent background.
 
 ---
  words/part/KWCanvasItem.cpp | 2 +-

rpm/calligra-buildsystem.patch

@@ -1,7 +1,7 @@
 From dd282581767914695602585d5580615dbed28001 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/11] Disable various dependencies in build system.
+Subject: [PATCH 04/10] Disable various dependencies in build system.
 
 ---
  CMakeLists.txt                      | 29 +++++++++++++++--------------

rpm/calligra-cache.patch

@@ -1,7 +1,7 @@
 From 93f5ab5db6210f6583996236ed6b79e912064773 Mon Sep 17 00:00:00 2001
 From: Damien Caliste <dcaliste@free.fr>
 Date: Tue, 11 Dec 2018 13:26:34 +0100
-Subject: [PATCH 09/11] Enable page caching to improve performences.
+Subject: [PATCH 08/10] Enable page caching to improve performences.
 
 ---
  words/part/KWCanvasBase.cpp | 2 +-

rpm/calligra-fake-kde4libs.patch

@@ -1,10 +1,10 @@
 From 1e5f2946052f9f1712ee24fcd80716aae05dec1f 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/11] Add fake kde4libs headers.
+Subject: [PATCH 01/10] Add fake kde4libs headers.
 
 ---
- plugins/pictureshape/kfile.h       |   65 +
+ plugins/pictureshape/kfile.h       |   64 +
  plugins/pictureshape/kfilewidget.h |  216 +++
  plugins/pictureshape/kurl.h        |  387 +++++
  sheets/kcalendarsystem.h           | 1014 +++++++++++++
@@ -14,7 +14,7 @@ Subject: [PATCH 01/11] Add fake kde4libs headers.
  sheets/kreplace.h                  |   28 +
  sheets/kreplacedialog.h            |   22 +
  sheets/ktextedit.h                 |   13 +
- 10 files changed, 3989 insertions(+)
+ 10 files changed, 3988 insertions(+)
  create mode 100644 plugins/pictureshape/kfile.h
  create mode 100644 plugins/pictureshape/kfilewidget.h
  create mode 100644 plugins/pictureshape/kurl.h
@@ -28,10 +28,10 @@ Subject: [PATCH 01/11] Add fake kde4libs headers.
 
 diff --git a/plugins/pictureshape/kfile.h b/plugins/pictureshape/kfile.h
 new file mode 100644
-index 00000000000..47a67fc3e55
+index 00000000000..975cc53da20
 --- /dev/null
 +++ b/plugins/pictureshape/kfile.h
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,64 @@
 +#ifndef FAKE_KFILE_H
 +#define FAKE_KFILE_H
 +
@@ -74,16 +74,16 @@ index 00000000000..47a67fc3e55
 +#if 0
 +    static bool isSortByName( const QDir::SortFlags& sort );
 +    static bool isSortBySize( const QDir::SortFlags& sort );
-+    static bool isSortByDate( const QDir::SortFlags& sort ); 
++    static bool isSortByDate( const QDir::SortFlags& sort );
 +    static bool isSortByType( const QDir::SortFlags& sort );
 +    static bool isSortDirsFirst( const QDir::SortFlags& sort );
 +    static bool isSortCaseInsensitive( const QDir::SortFlags& sort );
 +
 +    static bool isDefaultView( const FileView& view );
 +    static bool isSimpleView( const FileView& view );
-+    static bool isDetailView( const FileView& view ); 
++    static bool isDetailView( const FileView& view );
 +    static bool isSeparateDirs( const FileView& view );
-+    static bool isPreviewContents( const FileView& view ); 
++    static bool isPreviewContents( const FileView& view );
 +    static bool isPreviewInfo( const FileView& view );
 +    static bool isTreeView( const FileView& view );
 +    static bool isDetailTreeView( const FileView& view );
@@ -96,7 +96,6 @@ index 00000000000..47a67fc3e55
 +Q_DECLARE_OPERATORS_FOR_FLAGS(KFile::Modes)
 +
 +#endif
-+ 
 diff --git a/plugins/pictureshape/kfilewidget.h b/plugins/pictureshape/kfilewidget.h
 new file mode 100644
 index 00000000000..36f0da8750a
@@ -1734,7 +1733,7 @@ index 00000000000..81c1e6496f9
 +#endif
 diff --git a/sheets/kfind.h b/sheets/kfind.h
 new file mode 100644
-index 00000000000..54f84592959
+index 00000000000..772ce46a453
 --- /dev/null
 +++ b/sheets/kfind.h
 @@ -0,0 +1,74 @@
@@ -1764,7 +1763,7 @@ index 00000000000..54f84592959
 +        // Note that KReplaceDialog uses 256 and 512
 +        // User extensions can use boolean options above this value.
 +        MinimumUserOption = 65536 ///< user options start with this bit
-+    };    
++    };
 +#if 0
 +    Q_DECLARE_FLAGS(SearchOptions, Options)
 +#endif

rpm/calligra-find.patch

@@ -1,7 +1,7 @@
 From 922bbf563762ff76aa0ccd4f3ec97ef9550a0df9 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/11] Disable windowing actions in find strategy.
+Subject: [PATCH 03/10] Disable windowing actions in find strategy.
 
 ---
  libs/text/FindDirection_p.cpp |  4 +--

rpm/calligra-libs.patch

@@ -1,7 +1,7 @@
 From 20635033602eaa8b6607594558a885569aab9f1d 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/11] Disable various dependencies in libs.
+Subject: [PATCH 05/10] Disable various dependencies in libs.
 
 ---
  libs/main/KoApplication.cpp         |  4 ++--

rpm/calligra-plugins.patch

@@ -1,7 +1,7 @@
 From a4f0a0d0a88ccd2a713ca3197ab23dc4ef059d69 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/11] Disable various dependencies in plugins.
+Subject: [PATCH 06/10] Disable various dependencies in plugins.
 
 ---
  plugins/textshape/TextTool.cpp | 6 ++++++

rpm/calligra-qtdbus.patch

@@ -1,7 +1,7 @@
 From 81a792a398170b1f71753b50293c21fe6ca4cda3 Mon Sep 17 00:00:00 2001
 From: Damien Caliste <dcaliste@free.fr>
 Date: Tue, 11 Dec 2018 13:27:04 +0100
-Subject: [PATCH 10/11] Disable various dependencies on DBus.
+Subject: [PATCH 09/10] Disable various dependencies on DBus.
 
 ---
  libs/main/KoApplication.cpp | 12 ++++++------

rpm/calligra-sheets.patch

@@ -1,7 +1,7 @@
 From 7a47971fa4d576b0d8b4231e64a5d8567a539f12 Mon Sep 17 00:00:00 2001
 From: Damien Caliste <dcaliste@free.fr>
 Date: Tue, 11 Dec 2018 13:25:21 +0100
-Subject: [PATCH 07/11] Disable various dependencies in sheets.
+Subject: [PATCH 07/10] Disable various dependencies in sheets.
 
 ---
  sheets/commands/AbstractRegionCommand.cpp | 14 ++++-----

rpm/calligra-stage.patch

@@ -1,28 +1,14 @@
 From 696a3fad8b78b3ef403e0616c9772fcee5c33a14 Mon Sep 17 00:00:00 2001
 From: Damien Caliste <dcaliste@free.fr>
 Date: Tue, 11 Dec 2018 13:06:25 +0100
-Subject: [PATCH 02/11] Don't export HTML in stage.
+Subject: [PATCH 02/10] Don't export HTML in stage.
 
 ---
- stage/part/KPrAnimationDirector.cpp   | 2 +-
  stage/part/KPrHtmlExport.cpp          | 4 ++--
  stage/part/KPrView.cpp                | 4 ++++
  stage/part/ui/KPrHtmlExportDialog.cpp | 4 ++++
- 4 files changed, 11 insertions(+), 3 deletions(-)
+ 3 files changed, 10 insertions(+), 2 deletions(-)
 
-diff --git a/stage/part/KPrAnimationDirector.cpp b/stage/part/KPrAnimationDirector.cpp
-index ea67ce97f5a..cbbfbc73cc0 100644
---- a/stage/part/KPrAnimationDirector.cpp
-+++ b/stage/part/KPrAnimationDirector.cpp
-@@ -142,7 +142,7 @@ void KPrAnimationDirector::paint(QPainter& painter, const QRectF &paintRect)
-     // events still get through so that it is possible to cancel the
-     // events. It looks like this is not a problem with nvidia graphic
-     // cards.
--    qApp->syncX();
-+    // qApp->syncX();
- }
-
- void KPrAnimationDirector::paintEvent( QPaintEvent* event )
 diff --git a/stage/part/KPrHtmlExport.cpp b/stage/part/KPrHtmlExport.cpp
 index 20a856d176f..d3680413b85 100644
 --- a/stage/part/KPrHtmlExport.cpp

rpm/calligra.spec

@@ -31,7 +31,6 @@ Patch12: calligra-libs.patch
 Patch13: calligra-plugins.patch
 Patch15: calligra-sheets.patch
 # to be removed after Qt upgrade
-Patch16: calligra-qt.patch
 Patch18: calligra-cache.patch
 Patch19: calligra-qtdbus.patch
 Patch20: calligra-background.patch
@@ -182,7 +181,6 @@ BuildRequires:  extra-cmake-modules >= 5.34.0
 %patch12 -d upstream -p1
 %patch13 -d upstream -p1
 %patch15 -d upstream -p1
-%patch16 -d upstream -p1
 %patch18 -d upstream -p1
 %patch19 -d upstream -p1
 %patch20 -d upstream -p1

rpm/kio-no-solid.patch

@@ -1,5 +1,15 @@
+From 1693d1de33bc794f92e8588ec57393fc29614e98 Mon Sep 17 00:00:00 2001
+From: Pekka Vuorela <pekka.vuorela@jolla.com>
+Date: Tue, 26 Mar 2019 13:48:12 +0200
+Subject: [PATCH] Disable KIO trash
+
+---
+ CMakeLists.txt              | 2 +-
+ src/ioslaves/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8050a1b..388fcc4 100644
+index 8050a1b7..388fcc4a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -43,7 +43,7 @@ find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED)
@@ -12,7 +22,7 @@ index 8050a1b..388fcc4 100644
  if (NOT KIOCORE_ONLY)
  find_package(KF5Bookmarks ${KF5_DEP_VERSION} REQUIRED)
 diff --git a/src/ioslaves/CMakeLists.txt b/src/ioslaves/CMakeLists.txt
-index e0536e7..cd69314 100644
+index e0536e76..cd693140 100644
 --- a/src/ioslaves/CMakeLists.txt
 +++ b/src/ioslaves/CMakeLists.txt
 @@ -4,7 +4,7 @@ add_subdirectory( help )
@@ -24,3 +34,6 @@ index e0536e7..cd69314 100644
  add_subdirectory( remote )
  add_subdirectory( protocols )
 
+-- 
+2.20.1
+