diff --git a/.cvsignore b/.cvsignore index 957db7f..a44601c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -TeXmacs-1.0.6.6-src.tar.gz +TeXmacs-1.0.6.7-src.tar.gz diff --git a/TeXmacs-1.0.6.1-gcc41.patch b/TeXmacs-1.0.6.1-gcc41.patch deleted file mode 100644 index 293f9fd..0000000 --- a/TeXmacs-1.0.6.1-gcc41.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- TeXmacs-1.0.6.1-src/src/Typeset/Boxes/Modifier/change_boxes.cpp.gcc41 2006-05-12 17:43:03.000000000 +0200 -+++ TeXmacs-1.0.6.1-src/src/Typeset/Boxes/Modifier/change_boxes.cpp 2006-05-12 17:43:27.000000000 +0200 -@@ -326,7 +326,7 @@ - struct textat_box_rep: public move_box_rep { - textat_box_rep (path ip, box b, SI x, SI y): - move_box_rep (ip, b, x, y, false, false) {} -- gr_selections textat_box_rep::graphical_select (SI x, SI y, SI dist); -+ gr_selections graphical_select (SI x, SI y, SI dist); - operator tree () { return tree (TUPLE, "textat", (tree) bs[0]); } - }; - diff --git a/TeXmacs-1.6.0.7-rdelim.patch b/TeXmacs-1.6.0.7-rdelim.patch new file mode 100644 index 0000000..6b67116 --- /dev/null +++ b/TeXmacs-1.6.0.7-rdelim.patch @@ -0,0 +1,11 @@ +--- TeXmacs-1.0.6.7-src/TeXmacs/progs/init-texmacs.scm.rdelim 2006-12-12 14:44:39.000000000 +0100 ++++ TeXmacs-1.0.6.7-src/TeXmacs/progs/init-texmacs.scm 2006-12-12 14:45:18.000000000 +0100 +@@ -14,6 +14,8 @@ + + (define boot-start (texmacs-time)) + ++(use-modules (ice-9 rdelim)) ++ + ;; TODO: scheme file caching using (set! primitive-load ...) and + ;; (set! %search-load-path) + diff --git a/TeXmacs-gcc41.patch b/TeXmacs-gcc41.patch deleted file mode 100644 index 469bfbd..0000000 --- a/TeXmacs-gcc41.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- 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 typeset_concat (edit_env env, tree t, path ip); -+array typeset_concat_range (edit_env env, tree t, path ip, -+ int i1, int i2); -+array 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 diff --git a/TeXmacs-inline.patch b/TeXmacs-inline.patch deleted file mode 100644 index 7c6e625..0000000 --- a/TeXmacs-inline.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- TeXmacs-1.0.6-src/src/System/Classes/url.hpp.inline 2005-12-31 20:11:32.000000000 +0100 -+++ TeXmacs-1.0.6-src/src/System/Classes/url.hpp 2005-12-31 20:11:54.000000000 +0100 -@@ -38,10 +38,13 @@ - inline bool operator == (url u) { return rep->t == u->t; } - inline bool operator != (url u) { return rep->t != u->t; } - inline url operator [] (int i) { return url (rep->t[i]); } -- inline friend url as_url (tree t) { return url (t); } -+ friend url as_url (tree t); - }; - CONCRETE_CODE(url); - -+inline url as_url (tree t) { return url (t); } -+ -+ - ostream& operator << (ostream& out, url u); - string as_string (url u, int type= URL_SYSTEM); - diff --git a/TeXmacs-maxima.patch b/TeXmacs-maxima.patch deleted file mode 100644 index c18024d..0000000 --- a/TeXmacs-maxima.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- TeXmacs-1.0.5.10-src/plugins/maxima/bin/tm_maxima.version 2005-10-11 21:30:59.000000000 +0200 -+++ TeXmacs-1.0.5.10-src/plugins/maxima/bin/tm_maxima 2005-10-11 21:31:59.000000000 +0200 -@@ -14,6 +14,6 @@ - 5.9.0) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.0.lisp" \ - | maxima_filter;; - 5.9.1) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.1.lisp";; -- 5.9.1.1* | 5.9.2*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.2.lisp";; -+ 5.9.1.1* | 5.9.1.9* | 5.9.2*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.2.lisp";; - *) echo -e "\2latex:\\red Unsupported version of maxima: $1\5" - esac diff --git a/TeXmacs.spec b/TeXmacs.spec index d7e4299..4df1db2 100644 --- a/TeXmacs.spec +++ b/TeXmacs.spec @@ -1,21 +1,19 @@ Name: TeXmacs -Version: 1.0.6.6 +Version: 1.0.6.7 Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.6-src.tar.gz -Patch1: TeXmacs-inline.patch +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.7-src.tar.gz Patch2: TeXmacs-event.patch -Patch3: TeXmacs-gcc41.patch -Patch4: TeXmacs-1.0.6.1-gcc41.patch +Patch5: TeXmacs-1.6.0.7-rdelim.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex Requires: tetex-fonts Requires: ghostscript -BuildRequires: compat-libguile-devel +BuildRequires: guile-devel BuildRequires: desktop-file-utils BuildRequires: tetex BuildRequires: freetype-devel @@ -55,10 +53,8 @@ drawing editor and a presentation mode. %prep %setup -q -n TeXmacs-%{version}-src %patch2 -p1 +%patch5 -p1 sed -i "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in -sed -i "s|guile-config|guile-config-1.6|" configure* -sed -i "s|guile --version|guile-1.6 --version|" configure* - %build @@ -70,7 +66,7 @@ make %{?_smp_mflags} rm -fr $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install export GUILE_DATA_PATH=%{_datadir}/guile -export GUILE_LOAD_PATH=$GUILE_DATA_PATH/1.6/ice-9 +export GUILE_LOAD_PATH=$GUILE_DATA_PATH/1.8/ice-9 cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs chmod -f 755 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9 mkdir -p $RPM_BUILD_ROOT%{_datadir}/application-registry @@ -157,6 +153,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Dec 12 2006 Gerard Milmeister - 1.0.6.7-1 +- new version 1.0.6.7 + * Mon Aug 21 2006 Gerard Milmeister - 1.0.6.6-1 - new version 1.0.6.6 diff --git a/sources b/sources index 6845ef7..17cb7a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53e21e5cb1a536a60cd6fb28dcb598d9 TeXmacs-1.0.6.6-src.tar.gz +64c355905e294f9c6bc3520ec2d212b7 TeXmacs-1.0.6.7-src.tar.gz