rpms/TeXmacs/devel TeXmacs-gcc41.patch, NONE, 1.1 TeXmacs.spec, 1.31, 1.32

Gérard Milmeister (gemi) fedora-extras-commits at redhat.com
Mon Mar 20 11:32:58 UTC 2006


Author: gemi

Update of /cvs/extras/rpms/TeXmacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23304

Modified Files:
	TeXmacs.spec 
Added Files:
	TeXmacs-gcc41.patch 
Log Message:


TeXmacs-gcc41.patch:

--- NEW FILE TeXmacs-gcc41.patch ---
--- TeXmacs-1.0.6-src/src/Classes/Atomic/parse_string.hpp.gcc41	2006-03-20 11:50:54.000000000 +0100
+++ TeXmacs-1.0.6-src/src/Classes/Atomic/parse_string.hpp	2006-03-20 11:51:11.000000000 +0100
@@ -48,4 +48,7 @@
 };
 CONCRETE_CODE(parse_string);
 
+ostream& operator << (ostream& out, parse_string s);
+bool test (parse_string s, string what);
+
 #endif // defined PARSE_STRING_H
--- TeXmacs-1.0.6-src/src/Typeset/Bridge/bridge.hpp.gcc41	2006-03-20 11:06:55.000000000 +0100
+++ TeXmacs-1.0.6-src/src/Typeset/Bridge/bridge.hpp	2006-03-20 11:12:06.000000000 +0100
@@ -76,6 +76,7 @@
 ostream& operator << (ostream& out, bridge br);
 extern bridge nil_bridge;
 tree substitute (tree t, path p, tree u);
+bridge make_bridge (typesetter ttt, tree st, path ip);
 
 #include "impl_typesetter.hpp"
 
--- TeXmacs-1.0.6-src/src/Typeset/Concat/concater.hpp.gcc41	2006-03-20 11:15:45.000000000 +0100
+++ TeXmacs-1.0.6-src/src/Typeset/Concat/concater.hpp	2006-03-20 11:16:02.000000000 +0100
@@ -171,4 +171,10 @@
 
 typedef concater_rep* concater;
 
+box              typeset_as_box (edit_env env, tree t, path ip);
+array<line_item> typeset_concat (edit_env env, tree t, path ip);
+array<line_item> typeset_concat_range (edit_env env, tree t, path ip,
+						int i1, int i2);
+array<line_item> typeset_marker (edit_env env, path ip);
+
 #endif // defined CONCATER_H
--- TeXmacs-1.0.6-src/src/Typeset/env.hpp.gcc41	2006-03-20 11:46:28.000000000 +0100
+++ TeXmacs-1.0.6-src/src/Typeset/env.hpp	2006-03-20 11:46:41.000000000 +0100
@@ -434,4 +434,6 @@
 void extract_format (tree fm, tree* r, int n);
 tree load_inclusion (url u); // implemented in tm_file.cpp
 
+ostream& operator << (ostream& out, edit_env env);
+
 #endif // defined ENV_H
--- TeXmacs-1.0.6-src/src/Typeset/boxes.hpp.gcc41	2006-03-20 11:47:20.000000000 +0100
+++ TeXmacs-1.0.6-src/src/Typeset/boxes.hpp	2006-03-20 11:47:51.000000000 +0100
@@ -314,4 +314,6 @@
   attach_dip(t,decorate_middle(ip)),decorate_middle(ip)
 #define attach_right(t,ip) attach_dip(t,decorate_right(ip)),decorate_right(ip)
 
+void make_eps (url dest, ::display dis, box b, int dpi);
+
 #endif // defined BOXES_H
--- TeXmacs-1.0.6-src/src/Window/ps_device.hpp.gcc41	2006-03-20 11:18:08.000000000 +0100
+++ TeXmacs-1.0.6-src/src/Window/ps_device.hpp	2006-03-20 11:18:24.000000000 +0100
@@ -102,4 +102,9 @@
   virtual void apply_shadow (SI x1, SI y1, SI x2, SI y2) = 0;
 };
 
+ void abs_round (SI& l);
+ void abs_round (SI& x, SI& y);
+ void abs_inner_round (SI& x1, SI& y1, SI& x2, SI& y2);
+ void abs_outer_round (SI& x1, SI& y1, SI& x2, SI& y2);
+
 #endif // defined PS_DEVICE_H


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- TeXmacs.spec	17 Feb 2006 23:47:44 -0000	1.31
+++ TeXmacs.spec	20 Mar 2006 11:32:58 -0000	1.32
@@ -1,6 +1,6 @@
 Name:		TeXmacs
 Version:	1.0.6
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
@@ -10,6 +10,7 @@
 Patch0:		TeXmacs-maxima.patch
 Patch1:		TeXmacs-inline.patch
 Patch2:		TeXmacs-event.patch
+Patch3:		TeXmacs-gcc41.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tetex, tetex-fonts, ghostscript
 Buildrequires:	guile-devel, desktop-file-utils, tetex
@@ -51,6 +52,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in
 
 
@@ -151,8 +153,11 @@
 
 
 %changelog
+* Mon Mar 20 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6-6
+- fix problems with gcc41 (TeXmacs-gcc41.patch)
+
 * Sat Feb 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6-4
-- Temporary fix for compiling problem
+- Temporary fix for compiling problem (TeXmacs-event.patch)
 
 * Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6-3
 - Rebuild for Fedora Extras 5




More information about the fedora-extras-commits mailing list