Attachment #92722 for bug #130434

View | Details | Raw Unified | Return to bug 130434
Collapse All | Expand All

Lines 7-13 Link Here

(-)math/GiNaC/Makefile (-2 / +2 lines)
7	#	7	#
8		8
9	PORTNAME= GiNaC	9	PORTNAME= GiNaC
10	PORTVERSION= 1.4.3	10	PORTVERSION= 1.4.4
11	CATEGORIES= math	11	CATEGORIES= math
12	MASTER_SITES= ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ \	12	MASTER_SITES= ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ \
13	http://www.ginac.de/	13	http://www.ginac.de/
Lines 19-25 Link Here
19	LIB_DEPENDS= cln.5:${PORTSDIR}/math/cln	19	LIB_DEPENDS= cln.5:${PORTSDIR}/math/cln
20		20
21	USE_BZIP2= yes	21	USE_BZIP2= yes
22	USE_GNOME= gnomehack gnometarget pkgconfig	22	USE_GNOME= gnomehack pkgconfig
23	USE_GMAKE= yes	23	USE_GMAKE= yes
24	USE_AUTOTOOLS= libtool:15	24	USE_AUTOTOOLS= libtool:15
25	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	25	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"

Lines 1-3 Link Here

(-)math/GiNaC/distinfo (-3 / +3 lines)
1	MD5 (ginac-1.4.3.tar.bz2) = abad55c4ae27d5d65f525fabefaddd05	1	MD5 (ginac-1.4.4.tar.bz2) = 60d38b352258473e3cc4de75c0d6f88e
2	SHA256 (ginac-1.4.3.tar.bz2) = dcd6991abae6df2fa247b57d754b8cbd9cc8119268c15d3470b3286132f7708f	2	SHA256 (ginac-1.4.4.tar.bz2) = 4d50f43b6fb489345d31cb1e30899f7cb999aa200acbf6b342a73379f24312d3
3	SIZE (ginac-1.4.3.tar.bz2) = 847869	3	SIZE (ginac-1.4.4.tar.bz2) = 864678




--- ginac/matrix.h.orig	Wed Oct  1 01:00:24 2003
+++ ginac/matrix.h	Thu Nov  6 13:30:18 2003
@@ -100,6 +100,7 @@
 	matrix(unsigned r, unsigned c, const exvector & m2);
 	matrix(unsigned r, unsigned c, const lst & l);
 
+#if 0
 	// First step of initialization of matrix with a comma-separated seqeuence
 	// of expressions. Subsequent steps are handled by matrix_init<>::operator,().
 	matrix_init<ex, exvector::iterator> operator=(const ex & x)
@@ -107,6 +108,7 @@
 		m[0] = x;
 		return matrix_init<ex, exvector::iterator>(++m.begin());
 	}
+#endif
 	
 	// functions overriding virtual functions from base classes
 public:

Lines 1-11 Link Here

(-)math/GiNaC/files/patch-ginac::numeric.cpp (-11 lines)
1	--- ginac/numeric.cpp.orig Mon Nov 26 20:59:49 2001
2	+++ ginac/numeric.cpp Mon Nov 26 21:00:12 2001
3	@@ -249,7 +249,7 @@
4	// Read number as string
5	std::string str;
6	if (n.find_string("number", str)) {
7	- std::istringstream s(str);
8	+ std::istringstream s(str.c_str());
9	cln::cl_idecoded_float re, im;
10	char c;
11	s.get(c);

Lines 1-11 Link Here

(-)math/GiNaC/files/patch-ginsh::ginsh_lexer.ll (-11 lines)
1	--- ginsh/ginsh_lexer.ll.orig Tue Mar 6 18:18:07 2001
2	+++ ginsh/ginsh_lexer.ll Tue Mar 6 18:22:06 2001
3	@@ -32,6 +32,8 @@
4	#include "ginsh.h"
5	#include "ginsh_parser.h"
6
7	+extern YYSTYPE yylval;
8	+
9	#define YY_INPUT(buf, result, max_size) (result = ginsh_input(buf, max_size))
10
11	// Table of all used symbols




--- ginsh/ginsh_parser.yy.orig	Mon Feb  5 22:08:16 2007
+++ ginsh/ginsh_parser.yy	Sat Oct 20 16:46:13 2007
@@ -28,6 +28,8 @@
 
 %{
 #include "config.h"
+#include <sys/time.h>
+
 #ifdef HAVE_RUSAGE
 #include <sys/resource.h>
 #else
@@ -859,7 +861,7 @@
 		// For shell commands, revert back to filename completion
 		rl_completion_append_character = orig_completion_append_character;
 		rl_basic_word_break_characters = orig_basic_word_break_characters;
-		rl_completer_word_break_characters = GINAC_RL_COMPLETER_CAST(rl_basic_word_break_characters);
+		rl_completer_word_break_characters = GINAC_RL_COMPLETER_CAST((char*)rl_basic_word_break_characters);
 #if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)
 		return completion_matches(const_cast<char *>(text), (CPFunction *)filename_completion_function);
 #else
@@ -869,7 +871,7 @@
 		// Otherwise, complete function names
 		rl_completion_append_character = '(';
 		rl_basic_word_break_characters = " \t\n\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~";
-		rl_completer_word_break_characters = GINAC_RL_COMPLETER_CAST(rl_basic_word_break_characters);
+		rl_completer_word_break_characters = GINAC_RL_COMPLETER_CAST((char*)rl_basic_word_break_characters);
 #if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)
 		return completion_matches(const_cast<char *>(text), (CPFunction *)fcn_generator);
 #else
@@ -892,6 +894,8 @@
 /*
  *  Main program
  */
+
+int yyparse();
 
 int main(int argc, char **argv)
 {

Return to bug 130434

Lines 1-18 Link Here

(-)math/GiNaC/files/patch-ginac::matrix.h (-18 lines)
1	--- ginac/matrix.h.orig Wed Oct 1 01:00:24 2003
2	+++ ginac/matrix.h Thu Nov 6 13:30:18 2003
3	@@ -100,6 +100,7 @@
4	matrix(unsigned r, unsigned c, const exvector & m2);
5	matrix(unsigned r, unsigned c, const lst & l);
6
7	+#if 0
8	// First step of initialization of matrix with a comma-separated seqeuence
9	// of expressions. Subsequent steps are handled by matrix_init<>::operator,().
10	matrix_init<ex, exvector::iterator> operator=(const ex & x)
11	@@ -107,6 +108,7 @@
12	m[0] = x;
13	return matrix_init<ex, exvector::iterator>(++m.begin());
14	}
15	+#endif
16
17	// functions overriding virtual functions from base classes
18	public:

Lines 1-38 Link Here

(-)math/GiNaC/files/patch-ginsh::ginsh_parser.yy (-38 lines)
1	--- ginsh/ginsh_parser.yy.orig Mon Feb 5 22:08:16 2007
2	+++ ginsh/ginsh_parser.yy Sat Oct 20 16:46:13 2007
3	@@ -28,6 +28,8 @@
4
5	%{
6	#include "config.h"
7	+#include <sys/time.h>
8	+
9	#ifdef HAVE_RUSAGE
10	#include <sys/resource.h>
11	#else
12	@@ -859,7 +861,7 @@
13	// For shell commands, revert back to filename completion
14	rl_completion_append_character = orig_completion_append_character;
15	rl_basic_word_break_characters = orig_basic_word_break_characters;
16	- rl_completer_word_break_characters = GINAC_RL_COMPLETER_CAST(rl_basic_word_break_characters);
17	+ rl_completer_word_break_characters = GINAC_RL_COMPLETER_CAST((char*)rl_basic_word_break_characters);
18	#if (GINAC_RL_VERSION_MAJOR < 4) \|\| (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)
19	return completion_matches(const_cast<char >(text), (CPFunction )filename_completion_function);
20	#else
21	@@ -869,7 +871,7 @@
22	// Otherwise, complete function names
23	rl_completion_append_character = '(';
24	rl_basic_word_break_characters = " \t\n\"#$%&'()*+,-./:;<=>?@[\\]^`{\|}~";
25	- rl_completer_word_break_characters = GINAC_RL_COMPLETER_CAST(rl_basic_word_break_characters);
26	+ rl_completer_word_break_characters = GINAC_RL_COMPLETER_CAST((char*)rl_basic_word_break_characters);
27	#if (GINAC_RL_VERSION_MAJOR < 4) \|\| (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)
28	return completion_matches(const_cast<char >(text), (CPFunction )fcn_generator);
29	#else
30	@@ -892,6 +894,8 @@
31	/*
32	* Main program
33	*/
34	+
35	+int yyparse();
36
37	int main(int argc, char **argv)
38	{