OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Mar-2005 13:22:02
Branch: HEAD Handle: 2005030112220200
Modified files:
openpkg-src/papyrus papyrus.patch papyrus.spec
Log:
upgrading package: papyrus 1.4.3 -> 1.4.4
Summary:
Revision Changes Path
1.4 +14 -13 openpkg-src/papyrus/papyrus.patch
1.9 +2 -2 openpkg-src/papyrus/papyrus.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/papyrus/papyrus.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 papyrus.patch
--- openpkg-src/papyrus/papyrus.patch 1 Dec 2004 18:40:42 -0000 1.3
+++ openpkg-src/papyrus/papyrus.patch 1 Mar 2005 12:22:02 -0000 1.4
@@ -4,15 +4,15 @@
@@ -12,7 +12,7 @@
d = equation_evaluate (eqn);
- printf ("%s = %Lf", eqn, d);
+ printf ("%s = %f", eqn, d);
- if (lrintl (d) != answer)
+ if ((long int)(d) != answer)
{
printf (" INCORRECT\n");
return -1;
Index: equation/lexer.l
---- equation/lexer.l.orig 2002-05-07 07:38:45 +0200
-+++ equation/lexer.l 2004-06-08 20:32:13 +0200
+--- equation/lexer.l.orig 2005-02-09 14:41:23 +0100
++++ equation/lexer.l 2005-03-01 13:20:03 +0100
@@ -3,21 +3,18 @@
#include <stdio.h>
#include <stdlib.h>
@@ -21,29 +21,30 @@
#include "parser.h"
--long double strtold(const char *nptr, char **endptr);
+-double strtod(const char *nptr, char **endptr);
-
%}
%option noyywrap
%option yylineno
%%
--[0-9]* { eqnlval.d = strtold (eqntext, NULL); return NUMBER; }
--[0-9]*\.[0-9]+ { eqnlval.d = strtold (eqntext, NULL); return NUMBER; }
--[0-9]+\.[0-9]* { eqnlval.d = strtold (eqntext, NULL); return NUMBER; }
+-[0-9]* { eqnlval.d = strtod (eqntext, NULL); return NUMBER; }
+-[0-9]*\.[0-9]+ { eqnlval.d = strtod (eqntext, NULL); return NUMBER; }
+-[0-9]+\.[0-9]* { eqnlval.d = strtod (eqntext, NULL); return NUMBER; }
-"NaN" { eqnlval.d = NAN; return NUMBER;}
-+[0-9]* { eqnlval.d = (long double)strtod (eqntext, NULL);
return NUMBER; }
-+[0-9]*\.[0-9]+ { eqnlval.d = (long double)strtod (eqntext, NULL);
return NUMBER; }
-+[0-9]+\.[0-9]* { eqnlval.d = (long double)strtod (eqntext, NULL);
return NUMBER; }
-+"NaN" { eqnlval.d = __builtin_nan(""); return NUMBER;}
++[0-9]* { eqnlval.d = (double)strtod (eqntext, NULL); return
NUMBER; }
++[0-9]*\.[0-9]+ { eqnlval.d = (double)strtod (eqntext, NULL); return
NUMBER; }
++[0-9]+\.[0-9]* { eqnlval.d = (double)strtod (eqntext, NULL); return
NUMBER; }
++"NaN" { eqnlval.d = __builtin_nan(""); return NUMBER;}
"lt" { return '<';}
"gt" { return '>';}
[a-zA-Z_]+ { eqnlval.string = strdup (eqntext); return STRING; }
Index: backend/Makefile.in
--- backend/Makefile.in.orig 2004-06-08 20:40:27 +0200
+++ backend/Makefile.in 2004-06-08 20:44:47 +0200
-@@ -242,7 +242,7 @@
+@@ -176,7 +176,7 @@
libpapyrus_backend_la_LIBADD =
+
papyrus_backend_SOURCES = backend.c $(libpapyrus_backend_la_SOURCES)
papyrus_backend_LDFLAGS = -rdynamic @LDFLAGS@ @GLIB_CFLAGS@
-papyrus_backend_LDADD = -ldl \
@@ -61,7 +62,7 @@
+#ifndef INFINITY
+#define INFINITY 99999999
+#endif
- long double retval = INFINITY;
+ double retval = INFINITY;
for (child = equation->children; child != NULL; child = child->next)
Index: html/xml2html.c
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/papyrus/papyrus.spec
============================================================================
$ cvs diff -u -r1.8 -r1.9 papyrus.spec
--- openpkg-src/papyrus/papyrus.spec 9 Feb 2005 20:24:57 -0000 1.8
+++ openpkg-src/papyrus/papyrus.spec 1 Mar 2005 12:22:02 -0000 1.9
@@ -33,8 +33,8 @@
Class: EVAL
Group: Database
License: GPL
-Version: 1.4.3
-Release: 20050209
+Version: 1.4.4
+Release: 20050301
# list of sources
Source0: http://papyrus.treshna.com/papyrus-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
