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

libraries/cuneiform: Patch for the newer gccs.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Matteo Bernardini 2021-08-28 20:51:32 +02:00 committed by Willy Sudiarto Raharjo
parent 37a5871072
commit 4033fc1c86
No known key found for this signature in database
GPG key ID: 3F617144D7238786
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/cuneiform/cuneiform.SlackBuild
View file

@ -67,12 +67,14 @@ sed -i 's/\r//g' cuneiform_src/Addfiles/license.txt
patch -p1 < $CWD/strings.patch
# Thanks to ARCH Linux
patch -p1 < $CWD/cuneiform-gcc.patch
# Thanks to Gentoo
patch -p1 < $CWD/gcc11.patch
mkdir build
cd build
cmake \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -fcommon" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_SKIP_RPATH:BOOL=YES \
-DCMAKE_BUILD_TYPE=Release ..

30
libraries/cuneiform/gcc11.patch Normal file
View file

@ -0,0 +1,30 @@
--- cuneiform-linux-1.1.0/cuneiform_src/Kern/hh/internal.h.orig 2021-05-23 10:45:12.714043888 +0300
+++ cuneiform-linux-1.1.0/cuneiform_src/Kern/hh/internal.h 2021-05-23 10:45:47.233178549 +0300
@@ -84,6 +84,7 @@
#endif
#if !defined(__MATH_H) && !defined(_INC_MATH)
+ #undef _GLIBCXX_USE_STD_SPEC_FUNCS
#include <math.h>
#endif
--- cuneiform-linux-1.1.0/cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp.orig 2021-05-23 10:51:00.757379453 +0300
+++ cuneiform-linux-1.1.0/cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp 2021-05-23 10:51:22.445461911 +0300
@@ -212,7 +212,7 @@
}
*/
// write the text lines
- for (;sect>0;sect=sect->next)
+ for (;sect;sect=sect->next)
{
if (!WriteRtfSection(rtf,sect)) goto WRITE_END; //write section properties
// int sectNum=0;
@@ -897,7 +897,7 @@
// if (curChar->fontNum>=rtf->page->fontsUsed || (prevChar&&prevChar->fontNum>=rtf->page->fontsUsed)) return TRUE;
// extract value for comparison
- if (prevChar>0) {
+ if (prevChar) {
// lstrcpy(PrevTypeFace,TerFont[PrevFont].TypeFace);
PrevFamily=rtf->table[rtf->page->GetFontByNum(prevChar->fontNum)];
PrevStyle=prevChar->fontAttribs;