Root/jbofihe/patches/00-jbofihe_0.38-5.1.diff

1--- jbofihe-0.38.orig/dictaccs.c
2+++ jbofihe-0.38/dictaccs.c
3@@ -131,8 +131,8 @@
4     mmap_base = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fileno(in), 0);
5     result = (int) mmap_base;
6 
7- if (result < 0) {
8- perror("Could not mmap the dictionary data\n");
9+ if (result == -1) {
10+ perror("Could not mmap the dictionary data");
11       exit(1);
12     }
13 
14--- jbofihe-0.38.orig/categ.c
15+++ jbofihe-0.38/categ.c
16@@ -31,6 +31,7 @@
17 #include "rpc_tab.h"
18 #include "functions.h"
19 #include "stag.h"
20+#include <string.h>
21 
22 /*++++++++++++++++++++++++++++++
23   Look for any cmavo of selma'o JA and back up to where the 'jek'
24--- jbofihe-0.38.orig/functions.c
25+++ jbofihe-0.38/functions.c
26@@ -25,6 +25,7 @@
27 #include <assert.h>
28 #include <stdlib.h>
29 #include <ctype.h>
30+#include <string.h>
31 #include "functions.h"
32 #include "nonterm.h"
33 #include "rpc_tab.h"
34--- jbofihe-0.38.orig/Makefile.in
35+++ jbofihe-0.38/Makefile.in
36@@ -107,10 +107,10 @@
37     cat gismu_cmavo.dict places.dat extradict patterns | perl dict2inc.pl > dictdata.c
38 
39 stag.c : stag.tab.c
40- sed -e 's/YYSTYPE/STAG_YYSTYPE/g;' < stag.tab.c > stag.c
41+ cp stag.tab.c stag.c
42 
43 stag.h : stag.tab.h
44- sed -e 's/YYSTYPE/STAG_YYSTYPE/g;' < stag.tab.h > stag.h
45+ cp stag.tab.h stag.h
46 
47 stag.tab.c stag.tab.h : stag.y
48     bison -v -d -p stag_ stag.y
49@@ -176,8 +176,8 @@
50 dictionary : smujajgau gismu_cmavo.dict
51     rm -f $(DICTNAME)
52     ./smujajgau $(DICTNAME) gismu_cmavo.dict
53- if [ -r lujvo-list ]; then \
54- perl lujvod.pl < ./lujvo-list > lujvo.dict ;\
55+ if [ -r lujvo.txt ]; then \
56+ perl lujvod.pl < ./lujvo.txt > lujvo.dict ;\
57         ./smujajgau $(DICTNAME) lujvo.dict ;\
58     fi
59     if [ -r NORALUJV.txt ]; then \
60@@ -214,7 +214,7 @@
61 
62 clean:
63     -(cd dfasyn && make clean)
64- -rm *.output *.tab.c *_tab.c rpc_full.c *.o \
65+ rm -f *.output *.tab.c *_tab.c rpc_full.c *.o \
66         jbofihe cmafihe smujajgau vlatai jvocuhadju \
67         *.dict uncom.c uncom.o uncom \
68         morf_lex.c morfvlex.c morf_enc.c morf*_dfa.c \
69@@ -222,7 +222,8 @@
70         stag.c stag.h stag.tab.c stag.tab.h \
71         rpc2x_nc.y rpc2x_act.y rpc2x_full_nc.y rpc2x_full_act.y \
72         canonluj.inc version.h \
73- nonterm.c nonterm.h morf_dfa.report morf_lex.err
74+ nonterm.c nonterm.h morf_dfa.report morf_lex.err \
75+ bctables.c bctables.report bctest rpc_tab.h cm_scan.c
76 
77 # Specify in this perverse way so that the $-Name construction doesn't get replaced on checkout!
78 
79--- jbofihe-0.38.orig/output2elide.pl
80+++ jbofihe-0.38/output2elide.pl
81@@ -31,7 +31,7 @@
82 
83 while (<>) {
84     # Read rules
85- if (/^rule\s+([0-9]+)\s+subscript/) {
86+ if (/^\s+([0-9]+)\s+/) {
87         $losubscript = $1 unless (defined $losubscript);
88         $hisubscript = $1;
89     }
90@@ -67,7 +67,7 @@
91         next;
92     }
93 
94- if (/^\s+([^ \t]+)\s+shift, and go to state ([0-9]+)/) {
95+ if (/^\s+([^ \t\$]+)\s+shift, and go to state ([0-9]+)/) {
96         $code = $codes{$1};
97         if (!defined $code) {
98             print STDERR "No code for $1 in state $state\n";
99--- jbofihe-0.38.orig/cm_translate.c
100+++ jbofihe-0.38/cm_translate.c
101@@ -117,8 +117,8 @@
102     mmap_base = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fileno(in), 0);
103     result = (int) mmap_base;
104 
105- if (result < 0) {
106- perror("Could not mmap the dictionary data\n");
107+ if (result == -1) {
108+ perror("Could not mmap the dictionary data");
109       exit(1);
110     }
111 
112--- jbofihe-0.38.orig/morf.c
113+++ jbofihe-0.38/morf.c
114@@ -32,6 +32,8 @@
115  *
116  *********************************************************************/
117 
118+#include <stdlib.h>
119+
120 #ifdef TEST_MORF
121 #include <stdio.h>
122 #include <string.h>
123--- jbofihe-0.38.orig/lex2.c
124+++ jbofihe-0.38/lex2.c
125@@ -539,7 +539,7 @@
126     }
127     
128 done_this_block:
129-
130+ continue;
131   }
132 
133 }
134--- jbofihe-0.38.orig/output2table.pl
135+++ jbofihe-0.38/output2table.pl
136@@ -26,7 +26,7 @@
137 $prefix = shift || die "No prefix specified";
138 
139 while (<>) {
140- last if (/^Grammar/);
141+ last if (/^ Number, Line, Rule/);
142 }
143 
144 @lhs = ();
145@@ -40,11 +40,11 @@
146     chomp;
147     last if (/^\s*$/);
148 
149- m{^rule ([0-9]+) +([a-zA-Z0-9_]+) \-\>[ \t](.*)$} || die "Unmatched rule [$_];";
150+ m{^\s+([0-9]+)\s+([0-9]+)\s+([a-zA-Z0-9_]+) \-\>[ \t](.*)$} || die "Unmatched rule [$_];";
151 
152     $number = $1;
153- $lhs = $2;
154- $rhs = $3;
155+ $lhs = $3;
156+ $rhs = $4;
157     if ($rhs =~ m{/\* empty \*/}) {
158         @r = ();
159     } else {
160--- jbofihe-0.38.orig/uncom.l
161+++ jbofihe-0.38/uncom.l
162@@ -30,13 +30,10 @@
163  *********************************************************************/
164 
165 %{
166-#ifndef yywrap
167-#define yywrap() 1
168-#endif
169-
170 static int depth = 0;
171 %}
172 
173+%option noyywrap
174 %x COMMENT
175 
176 %%
177--- jbofihe-0.38.orig/dfasyn/Makefile
178+++ jbofihe-0.38/dfasyn/Makefile
179@@ -43,5 +43,5 @@
180 scan.o : scan.c parse.h n2d.h
181 
182 clean:
183- rm dfasyn *.o scan.c parse.c parse.h parse.output
184+ rm -f dfasyn *.o scan.c parse.c parse.h parse.output
185 
186--- jbofihe-0.38.orig/dfasyn/parse.y
187+++ jbofihe-0.38/dfasyn/parse.y
188@@ -94,7 +94,7 @@
189                 | STRING { add_tok_to_abbrev(curabbrev, $1); }
190                 ;
191 
192-token : STRING { (void) lookup_token($1, CREATE_MUST_NOT_EXIST); }
193+token : STRING { (void) lookup_token($1, CREATE_MUST_NOT_EXIST); } ;
194 
195 instance_decl_seq : /* empty */ | instance_decl_seq instance_decl ;
196 
197--- jbofihe-0.38.orig/debian/dirs
198+++ jbofihe-0.38/debian/dirs
199@@ -0,0 +1 @@
200+usr/bin
201--- jbofihe-0.38.orig/debian/docs
202+++ jbofihe-0.38/debian/docs
203@@ -0,0 +1,4 @@
204+NEWS
205+README
206+README.PLIST
207+contrib/emacs_functions
208--- jbofihe-0.38.orig/debian/control
209+++ jbofihe-0.38/debian/control
210@@ -0,0 +1,19 @@
211+Source: jbofihe
212+Section: misc
213+Priority: optional
214+Maintainer: Theodore Reed <treed@surreality.us>
215+Build-Depends: debhelper (>> 3.0.0), lojban-common (>= 1.4), flex, bison
216+Standards-Version: 3.6.1
217+
218+Package: jbofihe
219+Architecture: any
220+Depends: ${shlibs:Depends}
221+Description: A parser for the lojban language
222+ jbofihe is a command-line driven program with the following functions:
223+ .
224+ * Checking grammatical correctness of Lojban text
225+ * Displaying successfully analysed text with nesting of grammatical
226+ constructs shown (either inline or as a tree)
227+ * Displaying approximate word-for-word English translations of the Lojban
228+ words, with some limited 'part-of-speech' adjustment of the English forms.
229+ * Showing which sumti fill each of the places of each selbri
230--- jbofihe-0.38.orig/debian/changelog
231+++ jbofihe-0.38/debian/changelog
232@@ -0,0 +1,67 @@
233+jbofihe (0.38-5.1) unstable; urgency=low
234+
235+ * Non-maintainer upload.
236+ * Applied patch by Peter Green (except for the -Werror changes) to fix build
237+ error. (closes: #521952)
238+
239+ -- Michael Banck <mbanck@debian.org> Sun, 29 Nov 2009 00:34:26 +0100
240+
241+jbofihe (0.38-5) unstable; urgency=low
242+
243+ * s/lujvo-list/lujvo.txt/ in the rules file and Makefile.in to match a
244+ change in the lojban-common package.
245+ * Update build-depends to lojban-common 1.4 to reflect this change.
246+
247+ -- Theodore Reed <treed@surreality.us> Sat, 14 May 2005 20:56:37 -0700
248+
249+jbofihe (0.38-4) unstable; urgency=low
250+
251+ * New maintainer. (closes: #221307)
252+ * Change build depends to flex. Unsure why flex-old was needed.
253+ * Similarly with bison. Not sure why bison-1.35 was needed.
254+ * Apply mmap patch. (closes: #276677)
255+ * Apply FTBFS fix patch. (closes: #258923, 189911)
256+
257+ -- Theodore Reed <treed@surreality.us> Mon, 11 Apr 2005 20:06:21 -0700
258+
259+jbofihe (0.38-3.1) unstable; urgency=low
260+
261+ * NMU.
262+ * Change build depends to flex-old and bison-1.35 (closes: #189911).
263+
264+ -- Matthias Klose <doko@debian.org> Mon, 17 Nov 2003 20:12:52 +0100
265+
266+jbofihe (0.38-3) unstable; urgency=low
267+
268+ * Change build-deps to lock to bison 1.75-1.79.
269+ * Bison changed something again! *grr*
270+
271+ -- JP Sugarbroad <taral@taral.net> Wed, 30 Oct 2002 11:17:20 -0600
272+
273+jbofihe (0.38-2) unstable; urgency=low
274+
275+ * Change build-dep to reflect necessary bison version.
276+ * Someone please tell the bison people to stop changing the -v output!
277+
278+ -- JP Sugarbroad <taral@taral.net> Thu, 14 Mar 2002 11:45:14 -0600
279+
280+jbofihe (0.38-1) unstable; urgency=low
281+
282+ * Update to latest version. (closes: #119777)
283+
284+ -- JP Sugarbroad <taral@taral.net> Thu, 25 Oct 2001 14:18:31 -0500
285+
286+jbofihe (0.36b-1) unstable; urgency=low
287+
288+ * New maintainer.
289+ * Update to latest version.
290+ * Regenerate dictionary on build (closes: #102247)
291+ * lojban-common's been around for ages (closes: #94456)
292+
293+ -- JP Sugarbroad <taral@taral.net> Mon, 25 Jun 2001 17:43:14 -0500
294+
295+jbofihe (0.36-1) unstable; urgency=low
296+
297+ * Initial Release.
298+
299+ -- John Leuner <jewel@debian.org> Fri, 30 Mar 2001 05:31:14 +0000
300--- jbofihe-0.38.orig/debian/copyright
301+++ jbofihe-0.38/debian/copyright
302@@ -0,0 +1,26 @@
303+This package was (re-)debianized by JP Sugarbroad <taral@taral.net> on
304+Mon, 25 Jun 2001 17:38:09 -0500.
305+
306+It was downloaded from http://go.to/jbofihe/
307+
308+Upstream Author: <jbofihe@go.to>
309+
310+Copyright:
311+
312+ This package is free software; you can redistribute it and/or modify
313+ it under the terms of the GNU General Public License as published by
314+ the Free Software Foundation; version 2 dated June, 1991.
315+
316+ This package is distributed in the hope that it will be useful,
317+ but WITHOUT ANY WARRANTY; without even the implied warranty of
318+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
319+ GNU General Public License for more details.
320+
321+ You should have received a copy of the GNU General Public License
322+ along with this package; if not, write to the Free Software
323+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
324+ 02111-1307, USA.
325+
326+On Debian GNU/Linux systems, the complete text of the GNU General
327+Public License can be found in `/usr/share/common-licenses/GPL'.
328+
329--- jbofihe-0.38.orig/debian/rules
330+++ jbofihe-0.38/debian/rules
331@@ -0,0 +1,81 @@
332+#!/usr/bin/make -f
333+
334+# Uncomment this to turn on verbose mode.
335+#export DH_VERBOSE=1
336+
337+# This is the debhelper compatability version to use.
338+export DH_COMPAT=3
339+
340+configure: configure-stamp
341+configure-stamp:
342+ dh_testdir
343+
344+ mkdir -p bin
345+ ln -sf /usr/bin/bison-1.35 bin/bison
346+ PATH=`pwd`/bin:$$PATH \
347+ perl config.pl --prefix=/usr
348+
349+ touch configure-stamp
350+
351+build: configure-stamp build-stamp
352+build-stamp:
353+ dh_testdir
354+
355+ ln -sf /usr/share/lojban/lujvo.txt .
356+ ln -sf /usr/share/lojban/NORALUJV.txt .
357+
358+ #work arround an issue with including multiple bision parsers in one
359+ #C source file
360+ PATH=`pwd`/bin:$$PATH $(MAKE) stag.h
361+ sed -i s/YYTOKENTYPE/STAGYYTOKENTYPE/ stag.h
362+ sed -i s/yytokentype/stagyytokentype/ stag.h
363+
364+ PATH=`pwd`/bin:$$PATH $(MAKE) all
365+ touch build-stamp
366+
367+clean:
368+ dh_testdir
369+ dh_testroot
370+ rm -f build-stamp configure-stamp
371+ rm -rf bin
372+
373+ -$(MAKE) clean
374+ rm -rf Makefile smujmaji.dat lujvo.txt NORALUJV.txt n2d
375+
376+ dh_clean
377+
378+install: DH_OPTIONS=
379+install: build
380+ dh_testdir
381+ dh_testroot
382+ dh_clean -k
383+ dh_installdirs
384+
385+ PATH=`pwd`/bin:$$PATH \
386+ $(MAKE) install \
387+ PREFIX=$(CURDIR)/debian/jbofihe/usr \
388+ MANDIR=$(CURDIR)/debian/jbofihe/usr/share/man/man1
389+
390+binary-indep:;
391+# Nothing to do
392+
393+binary-arch: build install
394+ dh_testdir
395+ dh_testroot
396+ dh_installdocs
397+# dh_installman
398+ dh_installchangelogs
399+ dh_strip
400+ dh_link
401+ dh_compress
402+ dh_fixperms
403+ dh_installdeb
404+ dh_shlibdeps
405+ dh_gencontrol
406+ dh_md5sums
407+ dh_builddeb
408+
409+binary: binary-indep binary-arch
410+.PHONY: build clean binary-indep binary-arch binary install configure
411+
412+# vim:noet:nosta:nolist:
413

Archive Download this file

Branches:
backfire
master
release_2010-11-17
release_2010-12-14
release_2011-02-23
release_2011-05-28
release_2011-08-27
release_2011-11-13
release_2012-03-18
release_2012-04-09
release_2012-07-11
release_2012-10-11



interactive