[packages/clara] Rel .4
arekm
arekm at pld-linux.org
Wed May 20 22:15:27 CEST 2026
commit 091d83cf1f79d6a207c7076d610de4ce321b79a4
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed May 20 22:15:11 2026 +0200
Rel .4
clara-gcc14.patch | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
clara.spec | 6 ++-
2 files changed, 152 insertions(+), 2 deletions(-)
---
diff --git a/clara.spec b/clara.spec
index 05ece75..bede72c 100644
--- a/clara.spec
+++ b/clara.spec
@@ -3,13 +3,14 @@ Summary(pl.UTF-8): Niewielkie narzędzie do kooperatywnego rozpoznawania znaków
Name: clara
Version: 0.9.9
%define snap 20031214
-Release: 1.%{snap}.3
+Release: 1.%{snap}.4
Epoch: 1
License: GPL
Group: X11/Applications/Graphics
#Source0Download: http://www.claraocr.org/download.html
Source0: http://www.claraocr.org/sources/%{name}-%{snap}.tar.gz
# Source0-md5: 3cd4eb76355d874f57058b19132e91d6
+Patch0: %{name}-gcc14.patch
URL: http://www.claraocr.org/
BuildRequires: perl-base
BuildRequires: xorg-lib-libX11-devel
@@ -27,11 +28,12 @@ cyfrowego obrazu dokumentu.
%prep
%setup -q -n %{name}-%{snap}
+%patch -P0 -p1
%build
%{__make} all \
CC="%{__cc}" \
- CFLAGS="%{rpmcflags} \$(INCLUDE) \$(COPTS)" \
+ CFLAGS="%{rpmcflags} %{rpmcppflags} \$(INCLUDE) \$(COPTS)" \
LDFLAGS="%{rpmldflags}" \
LIBPATH=
diff --git a/clara-gcc14.patch b/clara-gcc14.patch
new file mode 100644
index 0000000..66c2cd0
--- /dev/null
+++ b/clara-gcc14.patch
@@ -0,0 +1,148 @@
+diff -urNp clara-20031214.orig/clara.c clara-20031214/clara.c
+--- clara-20031214.orig/clara.c 2026-05-20 21:51:17.155124850 +0200
++++ clara-20031214/clara.c 2026-05-20 21:52:34.462883902 +0200
+@@ -1797,7 +1797,7 @@ void build_plist(void)
+
+ /* bad argument */
+ if (stat(f_arg,&statbuf) != 0) {
+- snprintf(mba,MMB+1,"could not stat %s",f_arg);
++ snprintf(mba,MMB+1,"could not stat %.*s",MMB-16,f_arg);
+ show_hint(2,mba);
+ }
+
+@@ -1902,7 +1902,7 @@ void build_plist(void)
+
+ /* argument is nor a regular file nor a directory */
+ else {
+- snprintf(mba,MMB,"%s is not a file nor a directory",f_arg);
++ snprintf(mba,MMB,"%.*s is not a file nor a directory",MMB-32,f_arg);
+ show_hint(2,mba);
+ }
+
+@@ -2346,7 +2346,7 @@ void process_cl(int argc,char *argv[])
+ if ((l+1+topb+1) > bsz)
+ argb = c_realloc(argb,(bsz+=l+256),NULL);
+ disp[largc] = topb + 1;
+- sprintf(argb+topb+1,a);
++ sprintf(argb+topb+1,"%s",a);
+ topb += l+1;
+ ++largc;
+ }
+diff -urNp clara-20031214.orig/cml.c clara-20031214/cml.c
+--- clara-20031214.orig/cml.c 2026-05-20 21:51:17.155239704 +0200
++++ clara-20031214/cml.c 2026-05-20 21:52:47.336217231 +0200
+@@ -1299,7 +1299,7 @@ int recover_acts(char *f)
+ if (f != NULL)
+ fatal(FD,"unexpected token at line %d of file %s",DLINE,f);
+ else {
+- printf(text);
++ printf("%s",text);
+ fatal(FD,"unexpected token found on internally generated act");
+ }
+ }
+@@ -2087,7 +2087,7 @@ void dict_behaviour(void)
+ dict_sel(&e);
+ dump_dict(1,NULL);
+ while (dump_dict(0,NULL));
+- printf(text);
++ printf("%s",text);
+ }
+
+ /* store with backup */
+diff -urNp clara-20031214.orig/common.h clara-20031214/common.h
+--- clara-20031214.orig/common.h 2026-05-20 21:51:17.156473419 +0200
++++ clara-20031214/common.h 2026-05-20 21:54:42.306217217 +0200
+@@ -507,7 +507,7 @@ typedef struct {
+ } cldesc;
+
+ /* the closures */
+-cldesc *cl;
++extern cldesc *cl;
+ extern int topcl,clsz;
+ extern int *clx,*cly;
+
+@@ -931,14 +931,14 @@ typedef struct {
+ Default skeleton parameters.
+
+ */
+-int DEF_SA;
+-float DEF_RR;
+-float DEF_MA;
+-int DEF_MP;
+-float DEF_ML;
+-int DEF_MB;
+-int DEF_RX;
+-int DEF_BT;
++extern int DEF_SA;
++extern float DEF_RR;
++extern float DEF_MA;
++extern int DEF_MP;
++extern float DEF_ML;
++extern int DEF_MB;
++extern int DEF_RX;
++extern int DEF_BT;
+
+ /*
+
+diff -urNp clara-20031214.orig/gui.h clara-20031214/gui.h
+--- clara-20031214.orig/gui.h 2026-05-20 21:51:17.156538676 +0200
++++ clara-20031214/gui.h 2026-05-20 21:54:48.379550552 +0200
+@@ -334,7 +334,7 @@ first word on the array of elements and
+ Divisors on PAGE tab.
+
+ */
+-int page_j1,page_j2,opage_j1,opage_j2;
++extern int page_j1,page_j2,opage_j1,opage_j2;
+
+ /* current color */
+ extern int COLOR;
+diff -urNp clara-20031214.orig/html.c clara-20031214/html.c
+--- clara-20031214.orig/html.c 2026-05-20 21:51:17.155521698 +0200
++++ clara-20031214/html.c 2026-05-20 21:53:14.992883894 +0200
+@@ -2605,10 +2605,10 @@ void mk_pattern_types(void)
+ totext("<HTML><HEAD><TITLE>Pattern types</TITLE></HEAD><BODY>\n");
+
+ if ((1 <= cpt) && (cpt <= toppt)) {
+- char a[18];
++ char a[32];
+
+- snprintf(a,17,"PATTERN TYPE %d",cpt);
+- a[17] = 0;
++ snprintf(a,sizeof(a),"PATTERN TYPE %d",cpt);
++ a[sizeof(a)-1] = 0;
+ pm_hl(a);
+
+ /* open FORM */
+diff -urNp clara-20031214.orig/pgmblock.c clara-20031214/pgmblock.c
+--- clara-20031214.orig/pgmblock.c 2026-05-20 21:51:17.155863538 +0200
++++ clara-20031214/pgmblock.c 2026-05-20 21:53:06.442883895 +0200
+@@ -161,7 +161,7 @@ void pgmmap(unsigned char *pb,int w,int
+
+ printf("%d rare pixels (%1.4f)\n",t,((float)t)/(w*h));
+
+- F = open("map",O_WRONLY|O_CREAT);
++ F = open("map",O_WRONLY|O_CREAT,0644);
+ write(F,m,h*bpl);
+ write(F,map,256);
+ close(F);
+@@ -197,7 +197,7 @@ void pgmunmap(unsigned char *pb,int w,in
+ {
+ int i,j,F;
+
+- F = open("map",O_RDONLY|O_CREAT);
++ F = open("map",O_RDONLY|O_CREAT,0644);
+ read(F,m,h*bpl);
+ read(F,map,256);
+ close(F);
+diff -urNp clara-20031214.orig/symbol.c clara-20031214/symbol.c
+--- clara-20031214.orig/symbol.c 2026-05-20 21:51:17.156304745 +0200
++++ clara-20031214/symbol.c 2026-05-20 21:52:53.619550564 +0200
+@@ -3649,7 +3649,7 @@ output: P_SPL[]=0 for splitting points,
+
+ */
+
+-void p_spl_comp(c) {
++void p_spl_comp(int c) {
+
+ unsigned char *p;
+ int i,j,h,w,d;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/clara.git/commitdiff/091d83cf1f79d6a207c7076d610de4ce321b79a4
More information about the pld-cvs-commit
mailing list