20190518.1 global branch merge.current-20190518.1

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

1 files changed, 17 insertions, 0 deletions

diff --git a/office/kbgoffice/gcc6.patch b/office/kbgoffice/gcc6.patch
new file mode 100644
index 0000000000..6e2d45e572
--- /dev/null
+++ b/office/kbgoffice/gcc6.patch
@@ -0,0 +1,17 @@
+diff -Naur kbgoffice-2.1.orig/src/translator_manager.cpp kbgoffice-2.1/src/translator_manager.cpp
+--- kbgoffice-2.1.orig/src/translator_manager.cpp	2010-04-30 14:37:42.000000000 +0200
++++ kbgoffice-2.1/src/translator_manager.cpp	2017-06-01 18:10:20.308920738 +0200
+@@ -141,11 +141,11 @@
+                 isDataOk = isDataOk && tr->init(tr->BG_EN, string(string(dataDir) + prop->getString("data")).c_str());
+         } else {
+                 cerr << "TranslatorManager::getTestDictionaryObject - Wrong description file: " << testDictionaries[index].file << "\n";
+-                return false;
++                return NULL;
+         }
+         if (!isDataOk) {
+                 cerr << "TranslatorManager::getTestDictionaryObject - Problem initialazing dictionary: " << testDictionaries[index].file << "\n";
+-                return false;
++                return NULL;
+         }
+         char c[16];
+         sprintf(c, "%d", level);