OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   27-Jul-2004 21:11:18
  Branch: HEAD                             Handle: 2004072720111700

  Added files:
    openpkg-src/papyrus     papyrus.patch
  Modified files:
    openpkg-src/papyrus     papyrus.spec

  Log:
    upgrading package: papyrus 1.3.7 -> 1.3.8

  Summary:
    Revision    Changes     Path
    1.1         +89 -0      openpkg-src/papyrus/papyrus.patch
    1.2         +4  -4      openpkg-src/papyrus/papyrus.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/papyrus/papyrus.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1 papyrus.patch
  --- /dev/null 2004-07-27 21:11:17 +0200
  +++ papyrus.patch     2004-07-27 21:11:18 +0200
  @@ -0,0 +1,89 @@
  +Index: equation/eqntest.c
  +--- equation/eqntest.c.orig  2002-05-07 07:38:45 +0200
  ++++ equation/eqntest.c       2004-06-08 20:31:13 +0200
  +@@ -12,7 +12,7 @@
  +     
  +     d = equation_evaluate (eqn);
  +     printf ("%s = %Lf", 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
  +@@ -3,21 +3,18 @@
  + #include <stdio.h>
  + #include <stdlib.h>
  + #include <math.h>
  +-#include <bits/nan.h>
  + 
  + #include "parser.h"
  + 
  +-long double strtold(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; }
  +-"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;}
  + "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
  +@@ -172,7 +172,7 @@
  + 
  + papyrus_backend_SOURCES = backend.c $(libpapyrus_backend_la_SOURCES)
  + papyrus_backend_LDFLAGS = -rdynamic @LDFLAGS@ @GLIB_CFLAGS@
  +-papyrus_backend_LDADD = -ldl \
  ++papyrus_backend_LDADD = \
  +                   -L../common -lpapyrus_common \
  +                   -L../equation -lpapyrus_equation \
  +                   @GLIB_LIBS@ @LDFLAGS@ @PQ_LIBS@ \
  +Index: backend/convert.c
  +--- backend/convert.c.orig   2004-06-08 12:59:25 +0200
  ++++ backend/convert.c        2004-06-08 20:42:33 +0200
  +@@ -315,6 +315,9 @@
  +     xmlNodePtr child;
  +     char *old, *eq_str = NULL;
  +     char *data;
  ++#ifndef INFINITY
  ++#define INFINITY 99999999
  ++#endif
  +     long double retval = INFINITY;
  + 
  +     for (child = equation->children; child != NULL; child = child->next)
  +Index: html/xml2html.c
  +--- html/xml2html.c.orig     2004-05-28 04:46:26 +0200
  ++++ html/xml2html.c  2004-06-08 20:48:36 +0200
  +@@ -215,7 +215,8 @@
  +             /* Calculate size of number. e.g. "123cm" would be 3 and
  +             "12345cm" would be 5 */
  +             for (i = 0; i < str_size && isdigit(size[i]); i++);
  +-            num_str = strndup(size, i);
  ++            num_str = strdup(size);
  ++            num_str[i] = '\0';
  + 
  +             for (i = 0; i < atoi(size); i++) {
  +                     fputs("<BR>", output);
  +@@ -235,7 +236,8 @@
  +             /* Calculate size of number. e.g. "123cm" would be 3 and
  +             "12345cm" would be 5 */
  +             for (i = 0; i < str_size && isdigit(size[i]); i++);
  +-            num_str = strndup(size, i);
  ++            num_str = strdup(size);
  ++            num_str[i] = '\0';
  + 
  +             for (i = 0; i < atoi(size); i++) {
  +                     fputs("&nbsp;&nbsp;", output);
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/papyrus/papyrus.spec
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 papyrus.spec
  --- openpkg-src/papyrus/papyrus.spec  8 Jun 2004 18:58:48 -0000       1.1
  +++ openpkg-src/papyrus/papyrus.spec  27 Jul 2004 19:11:17 -0000      1.2
  @@ -33,8 +33,8 @@
   Class:        EVAL
   Group:        Database
   License:      GPL
  -Version:      1.3.7
  -Release:      20040608
  +Version:      1.3.8
  +Release:      20040727
   
   #   list of sources
   Source0:      http://papyrus.treshna.com/papyrus-%{version}.tar.gz
  @@ -45,8 +45,8 @@
   BuildRoot:    %{l_buildroot}
   BuildPreReq:  OpenPKG, openpkg >= 20040130, libtool, gcc, make, pkgconfig
   PreReq:       OpenPKG, openpkg >= 20040130
  -BuildPreReq:  glib, gettext, libiconv, libxml, libxslt
  -PreReq:       glib, gettext, libiconv, libxml, libxslt
  +BuildPreReq:  glib, gettext, libiconv, libxml, libxslt, libgda
  +PreReq:       glib, gettext, libiconv, libxml, libxslt, libgda
   AutoReq:      no
   AutoReqProv:  no
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to