From 047a5fac6239eedff73769379e72bfa6649c4838 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sun, 17 Jun 2018 19:27:14 +0300 Subject: [PATCH] Calligra: fix build --- .../calligra/patches/calligra-3.1.0.patchset | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/app-office/calligra/patches/calligra-3.1.0.patchset b/app-office/calligra/patches/calligra-3.1.0.patchset index 15eea917e..271546fb8 100644 --- a/app-office/calligra/patches/calligra-3.1.0.patchset +++ b/app-office/calligra/patches/calligra-3.1.0.patchset @@ -1,4 +1,4 @@ -From 17a82f4674306171bfa74e76ed19ccaaf59c1fa4 Mon Sep 17 00:00:00 2001 +From 84ee90ad9dd504621f904b5a41269b607650e6b9 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 11 Oct 2017 20:56:45 +1000 Subject: Fix Haiku build @@ -86,7 +86,7 @@ index b18b166..c576b92 100644 2.16.4 -From 38cdd4424913b0150ff1113b4899b63cc5600df5 Mon Sep 17 00:00:00 2001 +From 2e1de2206117e8df0ca7378e37499c9904d8f37b Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 20 Nov 2017 15:11:16 +1000 Subject: Disable scripting for Plan @@ -106,7 +106,7 @@ index bb8a192..3b7ad36 100644 2.16.4 -From 22bc3019f5144278f3404c932eed4f20f5c1e691 Mon Sep 17 00:00:00 2001 +From 5ec83657f083851c0bf4cf92a981a0dfcdd09483 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 18 Apr 2018 19:46:33 +1000 Subject: Disable DBUS @@ -281,7 +281,7 @@ index bebcc9a..eaccffa 100644 2.16.4 -From 1144a88d5a23d398b565868ca1d939e06c0e885b Mon Sep 17 00:00:00 2001 +From d43341902395c6898ef0c6239b0c213bd7fc6c12 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 18 Apr 2018 22:44:32 +1000 Subject: Disable DBUS for plan @@ -344,7 +344,7 @@ index 03ad374..aa7281e 100644 2.16.4 -From 5bdcc021524182e82dbc00ed0b91fb2ff1fa57b4 Mon Sep 17 00:00:00 2001 +From 257f9881be396e6d0cd2f5d37c26ef27bb85549c Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 17 Jun 2018 23:18:01 +1000 Subject: Fix build for Qt 5.11 @@ -511,6 +511,18 @@ index a0a9832..7d7db53 100644 #include #include #include +diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp +index 2e39f59..60887e4 100644 +--- a/stage/part/KPrPresentationTool.cpp ++++ b/stage/part/KPrPresentationTool.cpp +@@ -24,6 +24,7 @@ + + #include "KPrPresentationTool.h" + ++#include + #include + #include + #include diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp index d64208c..bfddb3a 100644 --- a/words/part/dialogs/KWAnchoringProperties.cpp