[packages/WordNet] - rel 4; fix build with tcl/tk 8.6

arekm arekm at pld-linux.org
Tue Jun 3 12:18:23 CEST 2014


commit 177aea78f6e1ad34c6822d74087604aaff9e5877
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Jun 3 12:18:21 2014 +0200

    - rel 4; fix build with tcl/tk 8.6

 WordNet-build.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 WordNet.spec        |  7 +++++--
 2 files changed, 45 insertions(+), 2 deletions(-)
---
diff --git a/WordNet.spec b/WordNet.spec
index 7bb0555..0beff50 100644
--- a/WordNet.spec
+++ b/WordNet.spec
@@ -2,7 +2,7 @@ Summary:	Online lexical reference system, ie. smart dictionary
 Summary(pl.UTF-8):	System referencji słownikowych, czyli mądry słownik
 Name:		WordNet
 Version:	3.0
-Release:	3
+Release:	4
 License:	Free to use (see COPYING)
 Group:		Applications/Dictionaries
 Source0:	ftp://ftp.cogsci.princeton.edu/pub/wordnet/3.0/%{name}-%{version}.tar.bz2
@@ -10,6 +10,7 @@ Source0:	ftp://ftp.cogsci.princeton.edu/pub/wordnet/3.0/%{name}-%{version}.tar.b
 Patch0:		%{name}-FHS.patch
 Patch1:		%{name}-shared.patch
 Patch2:		%{name}-dictdir.patch
+Patch3:		%{name}-build.patch
 URL:		http://wordnet.princeton.edu/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -76,6 +77,7 @@ Graficzny interfejs do sieciowej bazy danych słownika WordNet.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -83,7 +85,8 @@ Graficzny interfejs do sieciowej bazy danych słownika WordNet.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	CPPFLAGS="-DUSE_INTERP_RESULT %{rpmcppflags}"
 %{__make}
 
 %install
diff --git a/WordNet-build.patch b/WordNet-build.patch
new file mode 100644
index 0000000..4bec811
--- /dev/null
+++ b/WordNet-build.patch
@@ -0,0 +1,40 @@
+--- WordNet-3.0/lib/binsrch.c~	2006-11-29 22:02:21.000000000 +0100
++++ WordNet-3.0/lib/binsrch.c	2014-06-03 12:12:58.435884045 +0200
+@@ -187,7 +187,7 @@
+     copyfile(fp, tfp);
+     if (fseek(fp, offset, 0) == -1)
+ 	return(NULL);		/* could not seek to offset */
+-    fprintf(fp, new_line);	/* write line */
++    fprintf(fp, "%s", new_line);	/* write line */
+     rewind(tfp);
+     copyfile(tfp, fp);
+ 
+@@ -214,7 +214,7 @@
+     copyfile(fp, tfp);
+     if (fseek(fp, offset, 0) == -1)
+ 	return(NULL);		/* could not seek to offset */
+-    fprintf(fp, new_line);	/* write line */
++    fprintf(fp, "%s", new_line);	/* write line */
+     rewind(tfp);
+     copyfile(tfp, fp);
+ 
+--- WordNet-3.0/src/wn.c~	2006-11-30 22:40:26.000000000 +0100
++++ WordNet-3.0/src/wn.c	2014-06-03 12:16:04.205515240 +0200
+@@ -283,7 +283,7 @@
+ 	    printf("\t");
+ 	    printf(searchstr[j].template,
+ 		   partchars[dbase], partchars[dbase]);
+-	    printf(searchstr[j].helpstr);
++	    printf("%s", searchstr[j].helpstr);
+ 	    printf("\n");
+ 	}
+ }
+@@ -344,7 +344,7 @@
+ 
+ static int error_message(char *msg)
+ {
+-    fprintf(stderr, msg);
++    fprintf(stderr, "%s", msg);
+     return(0);
+ }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/WordNet.git/commitdiff/177aea78f6e1ad34c6822d74087604aaff9e5877



More information about the pld-cvs-commit mailing list