rpms/TeXmacs/devel TeXmacs-1.0.6.1-guile18.patch, NONE, 1.1 TeXmacs.spec, 1.36, 1.37
Gérard Milmeister (gemi)
fedora-extras-commits at redhat.com
Tue May 16 23:03:13 UTC 2006
Author: gemi
Update of /cvs/extras/rpms/TeXmacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18206
Modified Files:
TeXmacs.spec
Added Files:
TeXmacs-1.0.6.1-guile18.patch
Log Message:
TeXmacs-1.0.6.1-guile18.patch:
--- NEW FILE TeXmacs-1.0.6.1-guile18.patch ---
--- TeXmacs-1.0.6.1-src/src/Guile/Glue/glue.hpp.guile18 2006-05-16 21:16:49.000000000 +0200
+++ TeXmacs-1.0.6.1-src/src/Guile/Glue/glue.hpp 2006-05-16 22:11:06.000000000 +0200
@@ -32,7 +32,6 @@
SCM path_to_scm (path p);
SCM url_to_scm (url u);
SCM scheme_tree_to_scm (scheme_tree t);
-bool scm_to_bool (SCM obj);
int scm_to_int (SCM obj);
string scm_to_string (SCM obj);
string scm_to_symbol (SCM obj);
--- TeXmacs-1.0.6.1-src/src/Guile/Glue/glue.cpp.guile18 2006-05-16 21:37:04.000000000 +0200
+++ TeXmacs-1.0.6.1-src/src/Guile/Glue/glue.cpp 2006-05-16 22:58:35.000000000 +0200
@@ -110,11 +110,6 @@
return scm_bool2scm (flag);
}
-bool
-scm_to_bool (SCM flag) {
- return scm_scm2bool (flag);
-}
-
/******************************************************************************
* Integers
******************************************************************************/
@@ -144,11 +139,6 @@
return scm_double2scm (i);
}
-static double
-scm_to_double (SCM i) {
- return scm_scm2double (i);
-}
-
/******************************************************************************
* Strings
******************************************************************************/
@@ -246,7 +236,7 @@
SCM tree_smob;
SCM_NEWCELL (tree_smob);
SCM_SETCDR (tree_smob, (SCM) ((void*) (new tree (t))));
- SCM_SETCAR (tree_smob, tree_tag);
+ SCM_SETCAR (tree_smob, (SCM)tree_tag);
return tree_smob;
}
@@ -434,7 +424,7 @@
SCM observer_smob;
SCM_NEWCELL (observer_smob);
SCM_SETCDR (observer_smob, (SCM) ((void*) (new observer (o))));
- SCM_SETCAR (observer_smob, observer_tag);
+ SCM_SETCAR (observer_smob, (SCM)observer_tag);
return observer_smob;
}
@@ -485,7 +475,7 @@
SCM display_smob;
SCM_NEWCELL (display_smob);
SCM_SETCDR (display_smob, (SCM) ((void*) (new display (dis))));
- SCM_SETCAR (display_smob, display_tag);
+ SCM_SETCAR (display_smob, (SCM) display_tag);
return display_smob;
}
@@ -541,7 +531,7 @@
SCM widget_smob;
SCM_NEWCELL (widget_smob);
SCM_SETCDR (widget_smob, (SCM) ((void*) (new widget (wid))));
- SCM_SETCAR (widget_smob, widget_tag);
+ SCM_SETCAR (widget_smob, (SCM) widget_tag);
return widget_smob;
}
@@ -593,7 +583,7 @@
SCM make_widget_smob;
SCM_NEWCELL (make_widget_smob);
SCM_SETCDR (make_widget_smob, (SCM) ((void*) (new make_widget (mw))));
- SCM_SETCAR (make_widget_smob, make_widget_tag);
+ SCM_SETCAR (make_widget_smob, (SCM) make_widget_tag);
return make_widget_smob;
}
@@ -645,7 +635,7 @@
SCM command_smob;
SCM_NEWCELL (command_smob);
SCM_SETCDR (command_smob, (SCM) ((void*) (new command (cmd))));
- SCM_SETCAR (command_smob, command_tag);
+ SCM_SETCAR (command_smob, (SCM) command_tag);
return command_smob;
}
@@ -701,7 +691,7 @@
SCM url_smob;
SCM_NEWCELL (url_smob);
SCM_SETCDR (url_smob, (SCM) ((void*) (new url (u))));
- SCM_SETCAR (url_smob, url_tag);
+ SCM_SETCAR (url_smob, (SCM) url_tag);
return url_smob;
}
--- TeXmacs-1.0.6.1-src/src/Guile/guile.hpp.guile18 2006-05-16 20:52:03.000000000 +0200
+++ TeXmacs-1.0.6.1-src/src/Guile/guile.hpp 2006-05-16 22:09:58.000000000 +0200
@@ -21,8 +21,6 @@
#ifdef GUILE_A
#define scm_is_bool gh_boolean_p
#define scm_is_int SCM_INUMP
-#define scm_is_string gh_string_p
-#define scm_is_symbol gh_symbol_p
#define scm_is_null gh_null_p
#define scm_is_pair gh_pair_p
#define scm_is_list gh_list_p
@@ -51,12 +49,7 @@
#endif
#ifdef GUILE_B
-#define scm_is_bool(x) SCM_NFALSEP(scm_boolean_p(x))
#define scm_is_int SCM_INUMP
-#define scm_is_string(x) SCM_NFALSEP(scm_string_p(x))
-#define scm_is_symbol(x) SCM_NFALSEP(scm_symbol_p(x))
-#define scm_is_null(x) SCM_NFALSEP(scm_null_p(x))
-#define scm_is_pair(x) SCM_NFALSEP(scm_pair_p(x))
#define scm_is_list(x) SCM_NFALSEP(scm_list_p(x))
#define scm_bool2scm SCM_BOOL
Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- TeXmacs.spec 12 May 2006 17:42:37 -0000 1.36
+++ TeXmacs.spec 16 May 2006 23:03:10 -0000 1.37
@@ -1,6 +1,6 @@
Name: TeXmacs
Version: 1.0.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Structured wysiwyg scientific text editor
Group: Applications/Editors
@@ -11,6 +11,7 @@
Patch2: TeXmacs-event.patch
Patch3: TeXmacs-gcc41.patch
Patch4: TeXmacs-1.0.6.1-gcc41.patch
+Patch5: TeXmacs-1.0.6.1-guile18.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: tetex
Requires: tetex-fonts
@@ -29,6 +30,7 @@
BuildRequires: libXmu-devel
BuildRequires: libXrender-devel
BuildRequires: libXt-devel
+BuildRequires: libtool-ltdl-devel
Requires: fig2ps
Requires(post): shared-mime-info, desktop-file-utils
Requires(postun): shared-mime-info, desktop-file-utils
@@ -58,6 +60,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in
@@ -70,9 +73,8 @@
rm -fr $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
export GUILE_DATA_PATH=`guile-config info pkgdatadir`
-export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d | grep ice-9`
+export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d -name ice-9`
cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs
-chmod -f 644 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9/*
chmod -f 755 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9
mkdir -p $RPM_BUILD_ROOT%{_datadir}/application-registry
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info
@@ -158,6 +160,11 @@
%changelog
+* Tue May 16 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6.1-4
+- added patch for new guile-1.8
+- added buildreq for libtool-ltdl-devel
+- fixed command to find ice-9 directory
+
* Fri May 12 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6.1-1
- new version 1.0.6.1
More information about the fedora-extras-commits
mailing list