diff options
Diffstat (limited to 'office/gbgoffice')
| -rw-r--r-- | office/gbgoffice/gbgoffice.SlackBuild | 1 | ||||
| -rw-r--r-- | office/gbgoffice/patches/12_gcc6.patch | 21 |
2 files changed, 22 insertions, 0 deletions
diff --git a/office/gbgoffice/gbgoffice.SlackBuild b/office/gbgoffice/gbgoffice.SlackBuild index 08a3eac59b..268a1f6f00 100644 --- a/office/gbgoffice/gbgoffice.SlackBuild +++ b/office/gbgoffice/gbgoffice.SlackBuild @@ -78,6 +78,7 @@ patch -p1 -i $CWD/patches/08_fix_const_conversion.patch patch -p1 -i $CWD/patches/09_deprecated_SigC.patch patch -p1 -i $CWD/patches/10_workhelper-buttonbox.patch patch -p1 -i $CWD/patches/11_explicit-linkage.patch +patch -p1 -i $CWD/patches/12_gcc6.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -std=c++11" \ diff --git a/office/gbgoffice/patches/12_gcc6.patch b/office/gbgoffice/patches/12_gcc6.patch new file mode 100644 index 0000000000..2ec2c344f4 --- /dev/null +++ b/office/gbgoffice/patches/12_gcc6.patch @@ -0,0 +1,21 @@ +Description: fixes compilation with GCC-6 + return type must be Translator* and can't be boolean +Author: Damyan Ivanov <dmn@debian.org> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811619 + +--- a/src/translator_manager.cpp ++++ b/src/translator_manager.cpp +@@ -176,11 +176,11 @@ Translator *TranslatorManager::getTestDi + isDataOk = isDataOk && tr->init(tr->BG_EN, string(string(prop->getDirectory()) + prop->getString("data")).c_str()); + } else { + cerr << "TranslatorManager::getTestDictionaryObject - Wrong description file: " << testDictionaries[index].fileName << "\n"; +- return false; ++ return NULL; + } + if (!isDataOk) { + cerr << "TranslatorManager::getTestDictionaryObject - Problem initialazing dictionary: " << testDictionaries[index].fileName << "\n"; +- return false; ++ return NULL; + } + char c[16]; + sprintf(c, "%d", level); |