From: Jakub Bogusz Date: Sat, 23 Nov 2013 06:58:16 +0000 (+0100) Subject: - updated to 2.0.2 X-Git-Tag: auto/th/3DLDF-2.0.2-1~1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=b7dba049342b1de33639e514684840f558ca7f62;p=packages%2F3DLDF.git - updated to 2.0.2 - updated info patch - added bison and texinfo patches (to fix build with bison 3 / texinfo 5 resp.) --- diff --git a/3DLDF-bison.patch b/3DLDF-bison.patch new file mode 100644 index 0000000..005c9f7 --- /dev/null +++ b/3DLDF-bison.patch @@ -0,0 +1,123 @@ +#--- 3DLDF-2.0.2/src/parser2.y++.orig 2013-11-21 18:40:43.899832522 +0100 +#+++ 3DLDF-2.0.2/src/parser2.y++ 2013-11-22 15:44:21.813317413 +0100 +#@@ -50,7 +50,7 @@ +# +# +# int +#-zzlex(YYSTYPE*lvalp,yyscan_t parameter); +#+zzlex(YYSTYPE*lvalp,void*parameter); +# +# int +# zzwrap(void); +#@@ -68,8 +68,8 @@ +# +# %verbose +# %pure-parser +#-%parse-param {yyscan_t parameter} +#-%lex-param {yyscan_t parameter} +#+%parse-param {void* parameter} +#+%lex-param {void* parameter} +# %name-prefix="zz" +# %debug +# +#--- 3DLDF-2.0.2/src/parser.y++.orig 2013-11-21 18:27:27.506532611 +0100 +#+++ 3DLDF-2.0.2/src/parser.y++ 2013-11-22 16:12:15.819913829 +0100 +#@@ -118,8 +118,6 @@ +# +# +# +#-#define YYPARSE_PARAM parameter +#-#define YYLEX_PARAM parameter +# #define YYLTYPE LDF_LOCATION_TYPE +# #define YYLOC_DEFAULT(Current, Rhs, N) +# +#@@ -170,7 +168,9 @@ +# +# %locations +# +#-%pure_parser +#+%pure-parser +#+%parse-param { void* parameter } +#+%lex-param { void* parameter } +# /* %token_table */ +# %verbose +# +#@@ -5520,7 +5520,7 @@ +# +# +# int +#-yyerror(char const*message); +#+yyerror(YYLTYPE *, void *, char const*message); +# +# +# +#@@ -88615,7 +88615,7 @@ +# +# +# int +#-yyerror(char const*message) +#+yyerror(YYLTYPE *, void *, char const*message) +# { +# cerr<<"ERROR! In yyparse(): "<= + +-#define YYPARSE_PARAM parameter +-#define YYLEX_PARAM parameter + #define YYLTYPE LDF_LOCATION_TYPE + #define YYLOC_DEFAULT(Current, Rhs, N) /* Do nothing. */ + +@@ -257,7 +255,9 @@ + @q =%expect 1@>@/ + @=%locations@>@/ + @q =%glr-parser@>@/ +-@=%pure_parser@>@/ ++@=%pure-parser@>@/ ++@=%parse-param { void* parameter }@>@/ ++@=%lex-param { void* parameter }@>@/ + @=/* %token_table */@>@/ + @=%verbose@> + +--- 3DLDF-2.0.2/src/pfuncfin.w.orig 2013-11-07 14:36:05.000000000 +0100 ++++ 3DLDF-2.0.2/src/pfuncfin.w 2013-11-22 16:52:09.186480056 +0100 +@@ -82,12 +82,12 @@ + @ {\it yyerror\/}(). + @= + int +-yyerror(char const* message);@/ ++yyerror(YYLTYPE*, void*, char const* message);@/ + + @ + @= + int +-yyerror(char const* message) ++yyerror(YYLTYPE*, void*, char const* message) + { + cerr << "ERROR! In yyparse(): " << message << endl << flush; + return 0; +--- 3DLDF-2.0.2/src/parser2.web.orig 2013-08-11 19:36:46.000000000 +0200 ++++ 3DLDF-2.0.2/src/parser2.web 2013-11-22 16:53:09.503144191 +0100 +@@ -49,7 +49,7 @@ + @= + + int +-zzlex(YYSTYPE* lvalp, yyscan_t parameter); ++zzlex(YYSTYPE* lvalp, void* parameter); + + int + zzwrap(void); +@@ -63,8 +63,8 @@ + @= + @=%verbose@>@;@/ + @=%pure-parser@>@;@/ +-@=%parse-param {yyscan_t parameter}@>@;@/ +-@=%lex-param {yyscan_t parameter}@>@;@/ ++@=%parse-param {void* parameter}@>@;@/ ++@=%lex-param {void* parameter}@>@;@/ + @=%name-prefix="zz"@>@;@/ + @=%debug@> + diff --git a/3DLDF-info.patch b/3DLDF-info.patch index cbb76e5..2d22c23 100644 --- a/3DLDF-info.patch +++ b/3DLDF-info.patch @@ -1,6 +1,20 @@ ---- 3DLDF-1.1.4/DOC/TEXINFO/3DLDF.texi.orig 2003-12-10 18:05:14.000000000 +0100 -+++ 3DLDF-1.1.4/DOC/TEXINFO/3DLDF.texi 2003-12-30 19:41:42.428966584 +0100 -@@ -366,9 +366,9 @@ +--- 3DLDF-2.0.2/doc/3dldf.texi.orig 2013-11-11 17:51:27.672881852 +0100 ++++ 3DLDF-2.0.2/doc/3dldf.texi 2013-11-11 18:02:17.612854576 +0100 +@@ -52,9 +52,9 @@ + + @c ********************* + +-@dircategory non-GNU packages ++@dircategory Graphics Utilities: + @direntry +-* 3DLDF: (3DLDF). 3DLDF Three-Dimensional Drawing Package ++* 3DLDF: (3dldf). 3DLDF Three-Dimensional Drawing Package + @end direntry + + @c ********************* +--- 3DLDF-2.0.2/doc/old_doc/3DLDF.texi.orig 2013-11-04 18:22:08.000000000 +0100 ++++ 3DLDF-2.0.2/doc/old_doc/3DLDF.texi 2013-11-22 19:32:04.326077385 +0100 +@@ -354,9 +354,9 @@ @c Added @dircategory and @direntry at the suggestion of @c Andreas Voegele. LDF 2003.12.01. diff --git a/3DLDF-texinfo.patch b/3DLDF-texinfo.patch new file mode 100644 index 0000000..dd7e385 --- /dev/null +++ b/3DLDF-texinfo.patch @@ -0,0 +1,326 @@ +--- 3DLDF-2.0.2/doc/3dldf.texi.orig 2013-11-22 16:54:08.976475028 +0100 ++++ 3DLDF-2.0.2/doc/3dldf.texi 2013-11-22 18:59:16.466159968 +0100 +@@ -6,6 +6,7 @@ + %%%% See the section "GNU Free Documentation License" in the file + %%%% fdl.texi for copying conditions. + ++@iftex + \input epsf + \def\epsfsize#1#2{#1} + +@@ -18,6 +19,7 @@ + \font\manual=manfnt % font used for the METAFONT logo, etc. + + \input texinfo @c -*-texinfo-*- ++@end iftex + + @c %**start of header + @setfilename 3dldf.info +@@ -147,6 +149,7 @@ Concept Index + + + @macro cpp {} ++ + @iftex + @tex + @CPLUSPLUS +@@ -155,10 +158,12 @@ Concept Index + @ifnottex + C++ + @end ifnottex ++ + @end macro + + + @macro MF {} ++ + @iftex + @tex + {@manual METAFONT} +@@ -167,6 +172,7 @@ C++ + @ifnottex + METAFONT + @end ifnottex ++ + @end macro + + @macro MP {} +--- 3DLDF-2.0.2/doc/dttypes.texi.orig 2013-11-06 18:26:14.000000000 +0100 ++++ 3DLDF-2.0.2/doc/dttypes.texi 2013-11-22 18:55:55.192835083 +0100 +@@ -50,13 +50,13 @@ Transformation matrix. + @c + Focus for the @dfn{perspective projection}. + +-@itemx pen ++@item pen + +-@itemx dash_pattern ++@item dash_pattern + +-@itemx color ++@item color + +-@itemx string ++@item string + @end table + + +--- 3DLDF-2.0.2/doc/old_doc/3DLDF.texi.orig 2013-11-22 19:32:04.326077385 +0100 ++++ 3DLDF-2.0.2/doc/old_doc/3DLDF.texi 2013-11-22 20:49:09.032549971 +0100 +@@ -6,6 +6,9 @@ + %% fdl.texi for copying conditions. + + %%%% LDF 2002.11.16. I hope doing this before I load texinfo.tex doesn't cause a problem. ++@iftex ++@tex ++ + \font\ninerm=cmr9 + \font\tenbbb=msbm10 % Blackboard bold + +@@ -303,6 +306,8 @@ + %%%% paragraphs. + + ++@end tex ++@end iftex + + + \input texinfo @c -*-texinfo-*- +@@ -856,6 +861,7 @@ Changes + @end menu + + @macro bibskip {} ++ + @iftex + @tex + @medskip +@@ -864,9 +870,11 @@ Changes + @ifnottex + @sp 1 + @end ifnottex ++ + @end macro + + @macro cpp {} ++ + @iftex + @tex + @CPLUSPLUS +@@ -875,6 +883,7 @@ Changes + @ifnottex + C++ + @end ifnottex ++ + @end macro + + +@@ -887,6 +896,7 @@ C++ + @ifnottex + N + @end ifnottex ++ + @end macro + + +@@ -899,6 +909,7 @@ N + @ifnottex + R + @end ifnottex ++ + @end macro + + @macro INT {} +@@ -910,6 +921,7 @@ R + @ifnottex + I + @end ifnottex ++ + @end macro + + @c UBAR is only used in code written to examples.web. There's no need +@@ -930,6 +942,7 @@ _@c + @end ifnottex + + @macro NEXTFIG {} ++ + @iftex + @tex + \\tempcnt=\\figcnt\\advance\\tempcnt by 1 +@@ -939,9 +952,11 @@ Fig.\\NBKS\\the\\tempcnt + @ifnottex + [next figure] + @end ifnottex ++ + @end macro + + @macro TWOPREFIG {} ++ + @iftex + @tex + \\tempcnt=\\figcnt\\advance\\tempcnt by -1 +@@ -951,9 +966,11 @@ Fig.\\NBKS\\the\\tempcnt + @ifnottex + [the second-to-last figure] + @end ifnottex ++ + @end macro + + @macro PREFIG {} ++ + @iftex + @tex + Fig.\\NBKS\\the\\figcnt +@@ -962,11 +979,13 @@ Fig.\\NBKS\\the\\figcnt + @ifnottex + [the previous figure] + @end ifnottex ++ + @end macro + + @c Kludge! This won't work for 1 degree in the Info version! + @c LDF 2003.11.25. + @macro DEG{NUMBER} ++ + @iftex + @tex + {$\NUMBER\^@circ$}% +@@ -975,9 +994,11 @@ Fig.\\NBKS\\the\\figcnt + @ifnottex + \NUMBER\ degrees + @end ifnottex ++ + @end macro + + @macro PRM{NUMBER} ++ + @iftex + @tex + {$\NUMBER\^\\prime$}% +@@ -986,11 +1007,13 @@ Fig.\\NBKS\\the\\figcnt + @ifnottex + \NUMBER\' + @end ifnottex ++ + @end macro + + + + @macro SECT {} ++ + @iftex + @tex + @S +@@ -999,6 +1022,7 @@ Fig.\\NBKS\\the\\figcnt + @ifnottex + section + @end ifnottex ++ + @end macro + + @c %% \OCB and \CCB are used in \BGRP and \EGRP (begin group and end group) +@@ -1027,6 +1051,7 @@ section + + + @macro angles{arg} ++ + @iftex + @tex + $\\langle$\\it{\arg\\\/}$\\rangle$% +@@ -1035,9 +1060,11 @@ $\\langle$\\it{\arg\\\/}$\\rangle$% + @ifnottex + <\arg\> + @end ifnottex ++ + @end macro + + @macro NEQ {arg} ++ + @iftex + @tex + $\\neq \arg\$ +@@ -1047,6 +1074,7 @@ $\\neq \arg\$ + @ifnottex + @math{!= \arg\} + @end ifnottex ++ + @end macro + + @c Calling this `@TIMES' caused problems. Maybe the name wasn't the +@@ -1054,6 +1082,7 @@ $\\neq \arg\$ + @c LDF 2003.12.08. + @c + @macro TMS {arg1, arg2} ++ + @iftex + @tex + $\arg1\ \\times \arg2\$% +@@ -1063,10 +1092,12 @@ $\arg1\ \\times \arg2\$% + @ifnottex + @math{\arg1\ * \arg2\} + @end ifnottex ++ + @end macro + + @c ``By'' for matrices. + @macro BYM {arg1, arg2} ++ + @iftex + @tex + $\arg1\ \\times \arg2\$% +@@ -1076,11 +1107,13 @@ $\arg1\ \\times \arg2\$% + @ifnottex + @math{\arg1\ X \arg2\} + @end ifnottex ++ + @end macro + + + + @macro OVERRTARROW {arg} ++ + @iftex + @tex + $\\overrightarrow{\arg\}$% +@@ -1090,9 +1123,11 @@ $\\overrightarrow{\arg\}$% + @ifnottex + @math{\arg\} + @end ifnottex ++ + @end macro + + @macro PLUSMINUS {arg} ++ + @iftex + @tex + $\\pm{\arg\}$% +@@ -1102,6 +1137,7 @@ $\\pm{\arg\}$% + @ifnottex + @math{+ or - \arg\} + @end ifnottex ++ + @end macro + + @include intro.texi +--- 3DLDF-2.0.2/doc/old_doc/path.texi.orig 2013-11-07 14:47:10.000000000 +0100 ++++ 3DLDF-2.0.2/doc/old_doc/path.texi 2013-11-22 19:57:36.219346432 +0100 +@@ -1744,7 +1744,7 @@ The length of the lines drawn. The defa + used as a dummy argument, if the default for @var{dist} is desired, but + other arguments must be specified. + +-@item ++@item pos_ + @itemx pos_x + @itemx pos_y + @itemx pos_z +--- 3DLDF-2.0.2/doc/old_doc/solid.texi.orig 2013-11-07 14:47:14.000000000 +0100 ++++ 3DLDF-2.0.2/doc/old_doc/solid.texi 2013-11-22 21:49:57.262396873 +0100 +@@ -501,8 +501,7 @@ is empty, a message to this effect is pr + @node Affine Transformations for Solids, Applying Transformations to Solids, Showing Solids, Solid Reference + @section Affine Transformations + +-@deftypefn {Virtual functions} Transform scale (real @var{x}, [real @var{y} = 0, [real @var{z} = 0]]) +-@code{Solid}. ++@deftypefn {Virtual functions} Transform scale (real @var{x}, [real @var{y} = 0, [real @var{z} = 0]]) @code{Solid}. + @deftypefnx {} Transform shear (real @var{xy}, [real @var{xz} = 0, [real @var{yx} = 0, [real @var{yz} = 0, [real @var{zx} = 0, [real @var{zy} = 0]]]]]) + @deftypefnx {} Transform shift (real @var{x}, [real @var{y} = 0, [real @var{z} = 0]]) + @deftypefnx {} Transform shift ({const Point&} @var{pt}) diff --git a/3DLDF.spec b/3DLDF.spec index 45e31dd..88f2393 100644 --- a/3DLDF.spec +++ b/3DLDF.spec @@ -1,17 +1,24 @@ Summary: Three-dimensional drawing with MetaPost output Summary(pl.UTF-8): Tworzenie trójwymiarowej grafiki z wyjściem w formacie MetaPost Name: 3DLDF -Version: 1.1.5.1 +Version: 2.0.2 Release: 1 License: GPL v2+ Group: Applications/Graphics Source0: http://ftp.gnu.org/gnu/3dldf/%{name}-%{version}.tar.gz -# Source0-md5: abe73cec9db802c039c2399b87e2528b +# Source0-md5: d64642c4e24115909b214c9b06c542a6 Patch0: %{name}-info.patch -URL: http://wwwuser.gwdg.de/~lfinsto1/ +Patch1: %{name}-bison.patch +Patch2: %{name}-texinfo.patch +URL: http://www.gnu.org/software/3dldf/ +# ps2pdf +BuildRequires: ghostscript +BuildRequires: gsl-devel BuildRequires: libstdc++-devel -BuildRequires: tetex +BuildRequires: texlive +BuildRequires: texlive-fonts-type1-hoekwater BuildRequires: texinfo +BuildRequires: texinfo-texi2dvi BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -28,9 +35,13 @@ w TeXu. %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build -%configure +# only 3dlfb binary uses libs, symbols are messed - no sense in building shared libs +%configure \ + --disable-shared %{__make} %install @@ -39,17 +50,25 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +install -D doc/3dldf.info $RPM_BUILD_ROOT%{_infodir}/3dldf.info + +# headers not installed +%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib3dldf*.{la,a} +# too common name +%{__rm} $RPM_BUILD_ROOT%{_bindir}/dummy + %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/postshell +%post -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} -%postun -p /sbin/postshell +%postun -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog NEWS README DOC/TEXINFO/3DLDF.ps -%attr(755,root,root) %{_bindir}/* -%{_infodir}/*.info* +%doc AUTHORS ChangeLog NEWS README +%attr(755,root,root) %{_bindir}/3dldf +%attr(755,root,root) %{_bindir}/prbsnflx +%{_infodir}/3dldf.info*