Skip to content
Permalink
Browse files

cuneiform: add debian patches

  • Loading branch information
jmroot committed Dec 2, 2019
1 parent 69f51e1 commit efb296b8757d127b245b03b302dddd24482de513
@@ -5,7 +5,7 @@ PortGroup cmake 1.1

name cuneiform
version 1.1.0
revision 6
revision 7
set branch [join [lrange [split ${version} .] 0 1] .]
platforms darwin
maintainers nomaintainer
@@ -31,13 +31,18 @@ checksums sha1 b78ebcf987c4792c360f23bdbe054d554ce2251c \
depends_lib port:ImageMagick

platform darwin powerpc {
patchfiles patch-perc.c.diff \
patchfiles-append patch-perc.c.diff \
patch-CMakeLists.txt.diff
}

patchfiles-append patch-cuneiform_src-Kern-ced-sources-main-ced_func_rtf.cpp.diff
patchfiles-append patch-cuneiform_src-Kern-leo-src-leo_dll.c.diff
patchfiles-append patch-cuneiform_src-Kern-rimage-sources-main-cricontrol-abs.diff
patchfiles-append patch-cuneiform_src-Kern-ced-sources-main-ced_func_rtf.cpp.diff \
patch-cuneiform_src-Kern-leo-src-leo_dll.c.diff \
patch-cuneiform_src-Kern-rimage-sources-main-cricontrol-abs.diff

# From https://sources.debian.org/src/cuneiform/1.1.0+dfsg-7/debian/patches/
patchfiles-append fix_buffer_overflow.diff \
fix_buffer_overflow_2.diff \
typos.patch

# https://trac.macports.org/ticket/59676
configure.cxxflags-append -std=c++03
@@ -0,0 +1,27 @@
Description: Fix buffer overflow during crash when using user supplied image.
Author: Sławomir Nizio
Forwarded: no
Last-Update: 2017-04-05

--- cuneiform_src/Kern/rstr/src/acc_tabs.c
+++ cuneiform_src/Kern/rstr/src/acc_tabs.c
@@ -1233,7 +1233,7 @@ if(is_cen_language(language))

strcpy(decode_ASCII_to_[(uchar)liga_i ], "_i_");
strcpy(decode_ASCII_to_[(uchar)liga_exm ], "_!_");
- strcpy(decode_ASCII_to_[(uchar)liga_inv_exm], "_!!_");
+ strcpy(decode_ASCII_to_[(uchar)liga_inv_exm], "_!_");
strcpy(decode_ASCII_to_[(uchar)right_quocket], "\xbb");
strcpy(decode_ASCII_to_[(uchar)liga_CC ], "\xa9");
strcpy(decode_ASCII_to_[(uchar)liga_CR ], "\xae");
--- cuneiform_src/Kern/rstr/src/match_wd.c
+++ cuneiform_src/Kern/rstr/src/match_wd.c
@@ -484,7 +484,7 @@
str_raster->w=(int32_t)(right-left);
str_raster->h=(int32_t)(bottom-top);

- if (str_raster->w > LINE_WIDTH || str_raster->h > LINE_HEIGHT)
+ if ((str_raster->w+7) > LINE_WIDTH || str_raster->h > LINE_HEIGHT)
return FALSE;

memset(&str_raster->pict,0,(str_raster->w+7)/8*str_raster->h);
@@ -0,0 +1,18 @@
Description: Split original patch by Slawomir and update the same to apply
neatly.
Author: Bhavani Shankar <bhavi@ubuntu.com>


--- cuneiform_src/Kern/rstr/src/acc_tabs.c
+++ cuneiform_src/Kern/rstr/src/acc_tabs.c
@@ -2821,8 +2821,8 @@ if( CodePages[language]==CSTR_EASTEUROPE
strcpy(decode_ASCII_to_[(uchar)liga_j ], "_j_");
strcpy(decode_ASCII_to_[(uchar)liga_exm ], "_!_");
strcpy(decode_ASCII_to_[(uchar)liga_qm ], "_?_");
- strcpy(decode_ASCII_to_[(uchar)liga_inv_exm], "_!!_");
- strcpy(decode_ASCII_to_[(uchar)liga_inv_qm ], "_??_");
+ strcpy(decode_ASCII_to_[(uchar)liga_inv_exm], "_!_");
+ strcpy(decode_ASCII_to_[(uchar)liga_inv_qm ], "_?_");
strcpy(decode_ASCII_to_[(uchar)liga_bull ], "\xB0");
strcpy(decode_ASCII_to_[(uchar)left_quocket], "«");
strcpy(decode_ASCII_to_[(uchar)right_quocket], "»");
@@ -0,0 +1,54 @@
Description: fix typos
Author: Andreas Beckmann <anbe@debian.org>

--- cuneiform_src/Kern/rblock/sources/c/ltmain.c
+++ cuneiform_src/Kern/rblock/sources/c/ltmain.c
@@ -344,7 +344,7 @@ i=0; i=i;
# ifdef LT_DEBUG
//if (LT_DebugGraphicsLevel >= 2)
if(!LDPUMA_Skip(hFirstDustAbsorbtion))
- LT_GraphicsBlocksOutput ("After first dust absorbtion");
+ LT_GraphicsBlocksOutput ("After first dust absorption");
# endif

PageMatrixExcludeSeparators (TRUE);
@@ -368,7 +368,7 @@ i=0; i=i;
# ifdef LT_DEBUG
//if (LT_DebugGraphicsLevel >= 2)
if(!LDPUMA_Skip(hSecondDustAbsorbtion))
- LT_GraphicsBlocksOutput ("After second dust absorbtion");
+ LT_GraphicsBlocksOutput ("After second dust absorption");
# endif

if (cut_page_left || cut_page_right)
--- cuneiform_src/Kern/rstr/src/pass3.c
+++ cuneiform_src/Kern/rstr/src/pass3.c
@@ -648,7 +648,7 @@ ready_BL:;
{
if (snap_activity('d'))
{
- snap_show_text("Skiped as dust");
+ snap_show_text("Skipped as dust");
snap_monitor();
}

@@ -3135,7 +3135,7 @@ Bool match_word_prepare(CSTR_line ln, uc
{
if (snap_activity('n'))
{
- snap_show_text("Skiped as dust");
+ snap_show_text("Skipped as dust");
snap_monitor();
}
return FALSE;
--- cuneiform_src/Kern/rstr/src/snap.c
+++ cuneiform_src/Kern/rstr/src/snap.c
@@ -542,7 +542,7 @@ if( short_spell_re(wrd,lang) )
else
strcat(buf," n");

-strcat(buf," new agressive : ");
+strcat(buf," new aggressive : ");
if( _spell_agressive(wrd,lang) )
strcat(buf,"y ");
else

0 comments on commit efb296b

Please sign in to comment.
You can’t perform that action at this time.