OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 18-Jun-2006 09:49:34 Branch: HEAD Handle: 2006061808493100 Modified files: openpkg-src/papyrus papyrus.patch papyrus.spec Log: URLs have changed Summary: Revision Changes Path 1.6 +14 -28 openpkg-src/papyrus/papyrus.patch 1.13 +5 -5 openpkg-src/papyrus/papyrus.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/papyrus/papyrus.patch ============================================================================ $ cvs diff -u -r1.5 -r1.6 papyrus.patch --- openpkg-src/papyrus/papyrus.patch 10 Mar 2006 17:21:31 -0000 1.5 +++ openpkg-src/papyrus/papyrus.patch 18 Jun 2006 07:49:31 -0000 1.6 @@ -1,6 +1,6 @@ Index: backend/Makefile.in ---- backend/Makefile.in.orig 2006-03-08 08:25:17 +0100 -+++ backend/Makefile.in 2006-03-10 16:14:35 +0100 +--- backend/Makefile.in.orig 2005-09-14 02:14:17 +0200 ++++ backend/Makefile.in 2006-04-30 09:53:16 +0200 @@ -116,7 +116,7 @@ papyrus_backend_SOURCES = backend.c $(libpapyrus_backend_la_SOURCES) @@ -11,8 +11,8 @@ libpapyrus_binding_pg_la_SOURCES = binding_pg.c Index: backend/binding_gda.c ---- backend/binding_gda.c.orig 2006-03-08 08:25:17 +0100 -+++ backend/binding_gda.c 2006-03-10 16:36:27 +0100 +--- backend/binding_gda.c.orig 2004-03-16 04:52:22 +0100 ++++ backend/binding_gda.c 2006-04-30 09:53:16 +0200 @@ -27,6 +27,7 @@ GdaCommand *command; GdaConnection *conn = connection; @@ -79,9 +79,9 @@ if (!GDA_IS_CONNECTION(conn)) { g_error("Could not open connection from string `%s', using provider `%s'", Index: backend/convert.c ---- backend/convert.c.orig 2006-03-08 08:25:17 +0100 -+++ backend/convert.c 2006-03-10 16:14:23 +0100 -@@ -617,6 +617,9 @@ +--- backend/convert.c.orig 2005-12-21 04:29:53 +0100 ++++ backend/convert.c 2006-04-30 09:53:16 +0200 +@@ -337,6 +337,9 @@ xmlNodePtr child; char *old, *eq_str = NULL; char *data; @@ -92,8 +92,8 @@ for (child = equation->children; child != NULL; child = child->next) Index: equation/lexer.l ---- equation/lexer.l.orig 2006-03-08 08:25:16 +0100 -+++ equation/lexer.l 2006-03-10 16:14:23 +0100 +--- equation/lexer.l.orig 2005-09-14 02:14:18 +0200 ++++ equation/lexer.l 2006-04-30 09:53:16 +0200 @@ -3,21 +3,18 @@ #include <stdio.h> #include <stdlib.h> @@ -119,11 +119,11 @@ +"NaN" { eqnlval.d = __builtin_nan(""); return NUMBER;} "lt" { return '<';} "gt" { return '>';} - [a-zA-Z_]+ { eqnlval.string = g_strdup (eqntext); return STRING; } + [a-zA-Z_]+ { eqnlval.string = strdup (eqntext); return STRING; } Index: html/xml2html.c ---- html/xml2html.c.orig 2006-03-08 08:25:18 +0100 -+++ html/xml2html.c 2006-03-10 16:14:23 +0100 -@@ -220,7 +220,8 @@ +--- html/xml2html.c.orig 2005-11-23 02:34:13 +0100 ++++ html/xml2html.c 2006-04-30 09:53:16 +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++); @@ -133,7 +133,7 @@ for (i = 0; i < atoi(size); i++) { fputs("<BR>", output); -@@ -240,7 +241,8 @@ +@@ -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++); @@ -143,17 +143,3 @@ for (i = 0; i < atoi(size); i++) { fputs(" ", output); -Index: latex/xml2latex.c ---- latex/xml2latex.c.orig 2006-03-08 08:25:18 +0100 -+++ latex/xml2latex.c 2006-03-10 18:18:45 +0100 -@@ -4,8 +4,9 @@ - - #include <libxml/xmlmemory.h> - #include <libxml/parser.h> -+#include <glib.h> - --#include <bc.h> -+#include "debug.h" - #include "xml2latex.h" - #include "latex_output.h" - #include "xml_funcs.h" @@ . patch -p0 <<'@@ .' Index: openpkg-src/papyrus/papyrus.spec ============================================================================ $ cvs diff -u -r1.12 -r1.13 papyrus.spec --- openpkg-src/papyrus/papyrus.spec 10 Mar 2006 17:21:31 -0000 1.12 +++ openpkg-src/papyrus/papyrus.spec 18 Jun 2006 07:49:31 -0000 1.13 @@ -32,11 +32,11 @@ Class: EVAL Group: Database License: GPL -Version: 1.6.0 -Release: 20060310 +Version: 1.6.1 +Release: 20060618 # list of sources -Source0: http://papyrus.treshna.com/papyrus-%{version}.tar.gz +Source0: http://papyrus.treshna.com/downloads/papyrus-%{version}.tar.gz Patch0: papyrus.patch # build information @@ -61,12 +61,12 @@ %track prog papyrus = { version = %{version} - url = http://papyrus.treshna.com/index.php?selection=2&pagenumber=1 + url = http://www.treshna.com/papyrus/download/ regex = papyrus-(__VER__)\.tar\.gz } %prep - %setup -q -n papyrus + %setup -q -c %patch -p0 %build @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org