diff options
| author |   Matteo Bernardini | 2017-06-01 18:12:48 +0200 |
|---|---|---|
| committer | Matteo Bernardini | 2018-06-09 08:28:03 +0200 |
| commit | 8218121f60681dcdaf64a3c7f393cda22605a13e (patch) | |
| tree | f86186ae5ec1fa63dc2c8b3e8c5a761ebdb5b199 | |
| parent | 81c344443219574587ae3d6bccb8f19c1bd346af (diff) | |
| download | old.slackbuilds-kbgoffice.tar.gz | |
office/kbgoffice: Added patch for gcc >= 6.x.kbgoffice
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
| -rw-r--r-- | office/kbgoffice/gcc6.patch | 17 | ||||
| -rw-r--r-- | office/kbgoffice/kbgoffice.SlackBuild | 3 |
2 files changed, 20 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); diff --git a/office/kbgoffice/kbgoffice.SlackBuild b/office/kbgoffice/kbgoffice.SlackBuild index c4f4cbb1af..91069ba041 100644 --- a/office/kbgoffice/kbgoffice.SlackBuild +++ b/office/kbgoffice/kbgoffice.SlackBuild @@ -52,6 +52,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Thanks debian +patch -p1 < $CWD/gcc6.patch + cd src sed "s:/usr/local:/usr:" -i.orig $PRGNAM.pro sed "s:/usr/local:/usr:" -i.orig main.cpp |