Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-06 08:26:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

office/gbgoffice: Added a patch for gcc >= 6.x.

Browse source 
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
Matteo Bernardini 2017-06-01 18:43:37 +02:00 committed by Robby Workman
parent f6bebc2446
commit b3983dcc10
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
office/gbgoffice/gbgoffice.SlackBuild
View file

@ -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" \

21
office/gbgoffice/patches/12_gcc6.patch Normal file
View file

@ -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);