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: 10-Mar-2006 18:21:32
Branch: HEAD Handle: 2006031017213100
Modified files:
openpkg-src/papyrus papyrus.patch papyrus.spec
Log:
upgrading package: papyrus 1.4.4 -> 1.6.0
Summary:
Revision Changes Path
1.5 +113 -44 openpkg-src/papyrus/papyrus.patch
1.12 +6 -3 openpkg-src/papyrus/papyrus.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/papyrus/papyrus.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 papyrus.patch
--- openpkg-src/papyrus/papyrus.patch 1 Mar 2005 12:22:02 -0000 1.4
+++ openpkg-src/papyrus/papyrus.patch 10 Mar 2006 17:21:31 -0000 1.5
@@ -1,18 +1,99 @@
-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 @@
+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
+@@ -116,7 +116,7 @@
+
+ papyrus_backend_SOURCES = backend.c $(libpapyrus_backend_la_SOURCES)
+ papyrus_backend_LDFLAGS = -rdynamic @LDFLAGS@ @GLIB_CFLAGS@
+-papyrus_backend_LDADD = -ldl -L../common
-lpapyrus_common -L../equation -lpapyrus_equation
@GLIB_LIBS@ @LDFLAGS@ @PQ_LIBS@ @MYSQL_LIBS@ @ORACLE_LIBS@
@LIBGDA_LIBS@
++papyrus_backend_LDADD = -L../common -lpapyrus_common
-L../equation -lpapyrus_equation @GLIB_LIBS@ @LDFLAGS@ @PQ_LIBS@
@MYSQL_LIBS@ @ORACLE_LIBS@ @LIBGDA_LIBS@
+
+
+ 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
+@@ -27,6 +27,7 @@
+ GdaCommand *command;
+ GdaConnection *conn = connection;
+ GdaDataModel *dm;
++ GError *error;
+
+ if (!conn) {
+ errormsg("Invalid connection");
+@@ -42,7 +43,7 @@
+ GDA_COMMAND_TYPE_SQL,
+ GDA_COMMAND_OPTION_STOP_ON_ERRORS);
+
+- dm = gda_connection_execute_single_command(conn, command, NULL);
++ dm = gda_connection_execute_single_command(conn, command, NULL, &error);
+
+ if (!dm) {
+ g_error("LibGda error returning data model from SQL query");
+@@ -130,6 +131,21 @@
+ return (q->cur_record <= (pap_query_length(query) - 1));
+ }
+
++static gint OLD_gda_data_model_get_column_position(GdaDataModel *model,
gchar *field)
++{
++ const gchar *title;
++ gint fieldno;
++
++ for (fieldno = 0; fieldno < 100; fieldno++) {
++ title = gda_data_model_get_column_title(model, fieldno);
++ if (strcmp(title, field) == 0)
++ break;
++ }
++ if (fieldno == 100)
++ fieldno = 0;
++ return fieldno;
++}
++
+ gchar *
+ pap_query_get_value(void *query, gchar *field)
+ {
+@@ -148,7 +164,7 @@
+ return NULL;
+ }
+
+- fieldno = gda_data_model_get_column_position(q->res, field);
++ fieldno = OLD_gda_data_model_get_column_position(q->res, field);
+ if (fieldno == -1) {
+ errormsg("Invalid field: %s in query %s", field, q->string);
+ return NULL;
+@@ -177,6 +193,7 @@
+ GdaConnection *conn;
+ GdaClient *client;
+ gchar *newconnectstr;
++ GError *error;
+
+ client = gda_client_new();
- d = equation_evaluate (eqn);
- printf ("%s = %f", eqn, d);
-- if (lrintl (d) != answer)
-+ if ((long int)(d) != answer)
- {
- printf (" INCORRECT\n");
- return -1;
+@@ -187,7 +204,7 @@
+ conn = gda_client_open_connection_from_string(client,
+ provider,
+ newconnectstr,
+-
GDA_CONNECTION_OPTIONS_READ_ONLY);
++
GDA_CONNECTION_OPTIONS_READ_ONLY, &error);
+
+ 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 @@
+ xmlNodePtr child;
+ char *old, *eq_str = NULL;
+ char *data;
++#ifndef INFINITY
++#define INFINITY 99999999
++#endif
+ double retval = INFINITY;
+
+ for (child = equation->children; child != NULL; child = child->next)
Index: equation/lexer.l
---- equation/lexer.l.orig 2005-02-09 14:41:23 +0100
-+++ equation/lexer.l 2005-03-01 13:20:03 +0100
+--- equation/lexer.l.orig 2006-03-08 08:25:16 +0100
++++ equation/lexer.l 2006-03-10 16:14:23 +0100
@@ -3,21 +3,18 @@
#include <stdio.h>
#include <stdlib.h>
@@ -38,37 +119,11 @@
+"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
-@@ -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 \
-+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
-@@ -331,6 +331,9 @@
- xmlNodePtr child;
- char *old, *eq_str = NULL;
- char *data;
-+#ifndef INFINITY
-+#define INFINITY 99999999
-+#endif
- double retval = INFINITY;
-
- for (child = equation->children; child != NULL; child = child->next)
+ [a-zA-Z_]+ { eqnlval.string = g_strdup (eqntext); return STRING; }
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 @@
+--- 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 @@
/* 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++);
@@ -78,7 +133,7 @@
for (i = 0; i < atoi(size); i++) {
fputs("<BR>", output);
-@@ -235,7 +236,8 @@
+@@ -240,7 +241,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++);
@@ -88,3 +143,17 @@
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.11 -r1.12 papyrus.spec
--- openpkg-src/papyrus/papyrus.spec 1 Jan 2006 13:18:28 -0000 1.11
+++ openpkg-src/papyrus/papyrus.spec 10 Mar 2006 17:21:31 -0000 1.12
@@ -32,8 +32,8 @@
Class: EVAL
Group: Database
License: GPL
-Version: 1.4.4
-Release: 20050301
+Version: 1.6.0
+Release: 20060310
# list of sources
Source0: http://papyrus.treshna.com/papyrus-%{version}.tar.gz
@@ -70,6 +70,9 @@
%patch -p0
%build
+ %{l_shtool} subst \
+ -e 's;pkg-config libgda;pkg-config libgda-2.0;g' \
+ configure
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
@@ -84,7 +87,7 @@
chmod 755 depcomp
rm -f libtool
ln -s %{l_prefix}/bin/libtool .
- %{l_make} %{l_mflags -O}
+ %{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
