Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv4346
Modified Files:
texmacs.info texmacs.patch
Log Message:
Version 1.0.7.2 to stable
Index: texmacs.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/texmacs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- texmacs.patch 9 Apr 2007 09:06:29 -0000 1.2
+++ texmacs.patch 29 Nov 2009 10:40:25 -0000 1.3
@@ -1,80 +1,127 @@
-diff -ur TeXmacs-1.0.6.9-src/src/makefile.in
TeXmacs-1.0.6.9-src.corr/src/makefile.in
---- TeXmacs-1.0.6.9-src/src/makefile.in 2007-02-11 16:39:53.000000000
+0100
-+++ TeXmacs-1.0.6.9-src.corr/src/makefile.in 2007-04-09 09:59:55.000000000
+0200
-@@ -120,7 +120,7 @@
- deps_incl = $(call incl_flags,System System/Boot System/Classes System/Files
System/Link System/Misc Classes/Abstract Classes/Atomic Classes/Compound
Classes/Mathematics Data/Drd Data/String Data/Tree Data/Convert Resource
Plugins Window Style/Memorizer Typeset Edit Texmacs Guile)
+--- trunk/src/configure 2009/04/16 22:06:09 2593
++++ trunk/src/configure 2009/05/01 20:06:57 2643
+@@ -696,6 +696,7 @@
+ host_vendor
+ host_os
+ CONFIG_EXPERIMENTAL
++CONFIG_MACOS
+ QMAKE
+ MOC
+ UIC
+@@ -722,7 +723,6 @@
+ CONFIG_CXXDIALECT
+ CONFIG_OS
+ CONFIG_OS_SUFFIX
+-CONFIG_MACOS
+ CONFIG_CXXWARNING
+ CONFIG_CXXTEMPLATE
+ CONFIG_CXXOPTIMIZE
+@@ -1347,6 +1347,7 @@
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --disable-fastalloc omit fast allocator for small objects
+ --enable-experimental support new style rewriting code
++ --enable-macosx-extensions support new style rewriting code
+ --enable-qt replace X11 by Qt interface
+ --enable-cocoa replace X11 by Cocoa interface
+ --enable-debug=ARG install a debugging enable executable -ggdb
+@@ -8247,7 +8248,6 @@
+ *apple*darwin*)
+ echo "$ac_t""final adjustments for a MacOS host" 1>&6
+ CONFIG_OS="MACOS"
+- CONFIG_MACOS="MacOS"
+ CONFIG_CXXFLAGS="-I${prefix}/include"
+ CONFIG_BSHARED=""
+ CONFIG_BFLAGS="-framework Cocoa"
+@@ -8430,6 +8430,41 @@
- deps_flags = $(deps_incl)\
-- $(CPPFLAGS) $(CXXIMLIB2) $(CXXFREETYPE) $(CXXICONV) $(CXXGUILE) \
-+ $(CPPFLAGS) $(CXXFREETYPE) $(CXXIMLIB2) $(CXXICONV) $(CXXGUILE) \
- -I$(tmsrc)/include $(CXXXWINDOW)
- # we should use -I- to separate local includes from system includes, but
- # headers of guile 1.6.0 use includes in quotes with names relative to the
-@@ -174,11 +174,13 @@
- %.o: %.cpp # Disable implicit compilation rule
- cxx_flags = $(strip $(CXX) $(1) -c $< -o $@)
--cxx_incl = $(call cxx_flags,$(1) $(CXXIMLIB2) $(CXXFREETYPE) $(CXXICONV) \
-+cxx_incl = $(call cxx_flags,$(1) $(CXXFREETYPE) $(CXXIMLIB2) $(CXXICONV) \
- $(CXXGUILE) $(CPPFLAGS) $(CXXFLAGS))
-+cxxx_incl = $(call cxx_flags,$(1) $(CXXFREETYPE) $(CXXIMLIB2) $(CXXICONV) \
-+ $(CXXGUILE) $(CPPFLAGS) $(CXXFLAGS) $(CXXXWINDOW))
+ #--------------------------------------------------------------------
++# MacOS X extensions (spellchecker, image loading)
++#--------------------------------------------------------------------
++
++# Check whether --enable-macosx-extensions was given.
++if test "${enable_macosx_extensions+set}" = set; then
++ enableval=$enable_macosx_extensions;
++else
++ enable_macosx_extensions="no"
++fi
++
++case "$enable_macosx_extensions" in
++ yes)
++ { echo "$as_me:$LINENO: result: enabling Mac OSX extensions" >&5
++echo "${ECHO_T}enabling Mac OSX extensions" >&6; }
++
++cat >>confdefs.h <<\_ACEOF
++#define MACOSX_EXTENSIONS 1
++_ACEOF
++
++ CONFIG_MACOS="MacOS"
++ ;;
++ no)
++ { echo "$as_me:$LINENO: result: disabling Mac OSX extensions" >&5
++echo "${ECHO_T}disabling Mac OSX extensions" >&6; }
++ CONFIG_MACOS=""
++ ;;
++ *)
++ { { echo "$as_me:$LINENO: error: bad option
--enable-macosx-extensions=$enable_macosx_extensions" >&5
++echo "$as_me: error: bad option
--enable-macosx-extensions=$enable_macosx_extensions" >&2;}
++ { (exit 1); exit 1; }; }
++ ;;
++esac
++
++
++#--------------------------------------------------------------------
+ # Gui selection
+ #--------------------------------------------------------------------
- $(system_obj): Objects/%.o: %.cpp
-- $(call cxx_incl,$(system_incl) -I$(tmsrc)/include)
-+ $(call cxxx_incl,$(system_incl) -I$(tmsrc)/include)
- $(classes_obj): Objects/%.o: %.cpp
- $(call cxx_incl,$(classes_incl))
- $(data_obj): Objects/%.o: %.cpp
-@@ -190,7 +192,7 @@
- $(resource_obj): Objects/%.o: %.cpp
- $(call cxx_incl,$(resource_incl))
- $(plugins_obj): Objects/%.o: %.cpp
-- $(call cxx_incl,$(plugins_incl) $(CXXXWINDOW))
-+ $(call cxxx_incl,$(plugins_incl))
- $(texmacs_obj): Objects/%.o: %.cpp
- $(call cxx_incl,$(texmacs_incl))
- $(typeset_obj): Objects/%.o: %.cpp
-@@ -200,7 +202,7 @@
- $(window_obj): Objects/%.o: %.cpp
- $(call cxx_incl,$(window_incl))
- $(x_window_obj): Objects/%.o: %.cpp
-- $(call cxx_incl,$(window_incl) $(CXXXWINDOW))
-+ $(call cxxx_incl,$(window_incl))
+@@ -9334,7 +9369,6 @@
-
###############################################################################
- # Make editor
-@@ -257,8 +259,8 @@
- TEXMACS_objects := $(strip $(call uses,system classes data resource plugins\
- window style typeset edit glue texmacs))
--link_options:=-L$(tmsrc)/lib -lm $(LDPATH) $(LDXWINDOW) \
-- $(LDGUILE) $(LDIMLIB2) $(LDFREETYPE) $(LDICONV) $(LDDL)
-+link_options:=-L$(tmsrc)/lib -lm $(LDPATH) $(LDFREETYPE) $(LDXWINDOW) \
-+ $(LDGUILE) $(LDIMLIB2) $(LDICONV) $(LDDL)
- $(tmsrc)/bin/texmacs.bin: Objects/texmacs-$(link).bin
- $(CP) $^ $@
---- TeXmacs-1.0.6-src/plugins/shell/src/tm_shell.cpp 2005-12-02
19:08:07.000000000 +0100
-+++ TeXmacs-1.0.6-src.corr/plugins/shell/src/tm_shell.cpp 2005-12-23
19:04:18.000000000 +0100
-@@ -19,6 +19,7 @@
- #include <unistd.h>
- #include <sys/time.h>
- #include <sys/wait.h>
-+#include <sys/socket.h>
- using namespace std;
+-
+ #--------------------------------------------------------------------
+ # Default paths for installation
+ #--------------------------------------------------------------------
+@@ -10167,6 +10201,7 @@
+ host_vendor!$host_vendor$ac_delim
+ host_os!$host_os$ac_delim
+ CONFIG_EXPERIMENTAL!$CONFIG_EXPERIMENTAL$ac_delim
++CONFIG_MACOS!$CONFIG_MACOS$ac_delim
+ QMAKE!$QMAKE$ac_delim
+ MOC!$MOC$ac_delim
+ UIC!$UIC$ac_delim
+@@ -10179,7 +10214,6 @@
+ QT_CXXFLAGS!$QT_CXXFLAGS$ac_delim
+ QT_INCPATH!$QT_INCPATH$ac_delim
+ QT_CPPFLAGS!$QT_CPPFLAGS$ac_delim
+-QT_LFLAGS!$QT_LFLAGS$ac_delim
+ _ACEOF
- typedef char* charp;
-@@ -158,8 +159,10 @@
- setenv ("PS1", "tmshell$ ", true);
- cout << DATA_BEGIN << "verbatim:";
- cout << "Shell session inside TeXmacs";
-- pipe (tochild);
-- pipe (fromchild);
-+// pipe (tochild);
-+// pipe (fromchild);
-+ socketpair (AF_UNIX, SOCK_STREAM, PF_UNSPEC, tochild);
-+ socketpair (AF_UNIX, SOCK_STREAM, PF_UNSPEC, fromchild);
- pid= fork ();
- if (pid==0) { // the child
- dup2 (tochild [IN], STDIN);
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -10221,6 +10255,7 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++QT_LFLAGS!$QT_LFLAGS$ac_delim
+ QT_LDFLAGS!$QT_LDFLAGS$ac_delim
+ QT_LIBS!$QT_LIBS$ac_delim
+ X11_CFLAGS!$X11_CFLAGS$ac_delim
+@@ -10234,7 +10269,6 @@
+ CONFIG_CXXDIALECT!$CONFIG_CXXDIALECT$ac_delim
+ CONFIG_OS!$CONFIG_OS$ac_delim
+ CONFIG_OS_SUFFIX!$CONFIG_OS_SUFFIX$ac_delim
+-CONFIG_MACOS!$CONFIG_MACOS$ac_delim
+ CONFIG_CXXWARNING!$CONFIG_CXXWARNING$ac_delim
+ CONFIG_CXXTEMPLATE!$CONFIG_CXXTEMPLATE$ac_delim
+ CONFIG_CXXOPTIMIZE!$CONFIG_CXXOPTIMIZE$ac_delim
+--- trunk/src/src/Edit/Replace/edit_spell.cpp 2009/04/17 07:30:31 2595
++++ trunk/src/src/Edit/Replace/edit_spell.cpp 2009/05/01 20:06:57 2643
+@@ -13,7 +13,7 @@
+ #include "Replace/edit_replace.hpp"
+ #include "Interface/edit_interface.hpp"
+
+-#ifdef OS_MACOS
++#ifdef MACOSX_EXTENSIONS
+ #include "MacOS/mac_spellservice.h"
+ #define ispell_start mac_spell_start
+ #define ispell_check mac_spell_check
Index: texmacs.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/texmacs.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- texmacs.info 26 Aug 2009 07:14:21 -0000 1.6
+++ texmacs.info 29 Nov 2009 10:40:25 -0000 1.7
@@ -1,50 +1,50 @@
Package: texmacs
-Version: 1.0.6.9
-Revision: 1002
-Distribution: 10.4, 10.5
+Version: 1.0.7.2
+Revision: 2
GCC: 4.0
Source: mirror:custom:TeXmacs-%v-src.tar.gz
CustomMirror: <<
Primary: http://www.texmacs.org/Download/ftp/targz/
Secondary: ftp://ftp.texmacs.org/pub/TeXmacs/targz/
<<
-Source-MD5: fde50d2c6a543e63be22534d77de474d
+Source-MD5: 4f40bededefc44e8927455efe0358780
License: GPL
-Depends: x11-shlibs, tetex-base, guile16 (>= 1.6.7-1010), ispell | aspell,
wget, imlib2-shlibs, libiconv, freetype219-shlibs
-BuildDepends: x11, guile16-dev (>= 1.6.7-1010), x11-dev, imlib2, libiconv-dev,
freetype219, fink (>= 0.24.12)
-Replaces: texmacs-extra-fonts, texmacs-type1-fonts
+Depends: x11-shlibs, tetex-base, guile18, ispell | aspell, wget,
imlib2-shlibs, libiconv, freetype219-shlibs, gmp-shlibs, libtool14-shlibs,
libgettext3-shlibs
+BuildDepends: x11, guile18-dev, x11-dev, imlib2, libiconv-dev, freetype219,
gmp, libtool14, gettext
+Replaces: texmacs-extra-fonts, texmacs-type1-fonts, texmacs, texmacs-qt
+Conflicts: texmacs, texmacs-qt
BuildConflicts: freetype
Recommends: ghostscript, netpbm, xfig, macaulay2, maxima, pari-gp, scilab
Suggests: texmacs-extra-fonts
-ConfigureParams: --libexecdir=%p/lib --mandir=%p/share/man --with-iconv=/usr
--with-freetype=linked --with-imlib2
-PatchFile: %n.patch
-PatchFile-MD5: 1a5e03e29f0f843c5be07e1885cb2c50
+ConfigureParams: --libexecdir=%p/lib --mandir=%p/share/man --with-iconv=/usr
--with-freetype=linked --with-imlib2 --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib
+PatchFile: %N.patch
+PatchFile-MD5: ff01a83b10ec4e71e475672068fdae67
PatchScript: <<
#!/bin/sh -ev
- %{default_script}
# change hardwired paths for ispell and aspell
- perl -pi -e 's|/usr/lib/ispell/|%p/lib/|g' src/Plugins/Ispell/ispell.cpp
- perl -pi -e 's|/usr/lib/aspell/|%p/share/aspell/|g'
src/Plugins/Ispell/ispell.cpp
+ perl -pi.bak -e 's|/usr/lib/ispell/|%p/lib/|g' src/Plugins/Ispell/ispell.cpp
+ perl -pi.bar -e 's|/usr/lib/aspell/|%p/share/aspell/|g'
src/Plugins/Ispell/ispell.cpp
# make place for Apple's resize brick in quartz-wm
- perl -pi -e 's|(set_right_footer )\(s\)|$1 (s * " ")|g'
src/Edit/Interface/edit_footer.cpp
+ perl -pi.bak -e 's|(set_right_footer )\(s\)|$1 (s * " ")|g'
src/Edit/Interface/edit_footer.cpp
# make the R plugin compile
- perl -pi -e 's|\-lutil||g' plugins/r/Makefile
- perl -pi -e 's|pty.h|util.h|g' plugins/r/src/tm_r.c
+ perl -pi.bak -e 's|\-lutil||g' plugins/r/Makefile
+ perl -pi.bak -e 's|pty.h|util.h|g' plugins/r/src/tm_r.c
# temporary hack to make the graphviz plugin work:
# Instead of allocating successive pieces of 1kB, we allocate one chunk
# of 1MB which should be sufficient for most postscript figures from graphviz
- perl -pi -e '
+ perl -pi.bak -e '
s,malloc\(1025\),malloc\(1024\*1000\+1\),g ;
s,(fread.*) 1024,$1 1024\*1000,g
' plugins/graphviz/src/tm_graphviz.c
-# allow compiling on intel as well as ppc
- perl -pi -e 's,powerpc-\*-darwin\*\),i\*86-\*-darwin\* |
powerpc-\*-darwin\*\),' configure
+# allow compiling correctly on intel as well as ppc
+ perl -pi.bak -e 's,powerpc-\*-darwin\*\),i\*86-\*-darwin\* |
powerpc-\*-darwin\*\),' configure
+ patch -p2 < %{PatchFile}
<<
CompileScript: <<
#!/bin/sh -ev
- export
PATH=%p/share/guile/1.6/scripts/binoverride:%p/lib/freetype219/bin:$PATH
+ export
PATH=%p/share/guile/1.8/scripts/binoverride:%p/lib/freetype219/bin:$PATH
./configure %c
- export GUILE_LOAD_PATH=%p/share/guile/1.6
+ export GUILE_LOAD_PATH=%p/share/guile/1.8
make
<<
InstallScript: make install DESTDIR=%d
@@ -64,41 +64,34 @@
extension language, so that you may customize the interface and write
your own extensions to the editor.
<<
-DescPort:<<
- TeXmacs uses wget for getting online help files; the package depends
- therefore on wget.
-
- Uses guile-1.6 now. Apparently we need to
- set the PATH for guile-1.6 only at compile time. The runtime is OK,
- even though guile-1.4 may be installed and `which guile` points to it.
+DescUsage:<<
+ There exist now 3 different Fink packages for TeXmacs,
+ corresponding to different graphics libraries:
- The hack to make the graphviz plugin work is still needed.
+ 1. The "texmacs" package uses X11 graphics.
+ This is the traditional interface,
+ and this is the most mature and most stable among the 3 packages.
+ 2. The "texmcs-qt" package uses the qt4-mac graphics library.
+ This has a more Mac-like look and feel, but this version has still
+ some bugs.
+ 3. The "texmacs-aqua" package uses the Mac-native cocoa library.
+ This is a standard Mac app, to be found in
+ /Applications/Fink/, but it is still very rough around the edges.
- The shell plugin is now patched to use socketpair() instead of pipe().
- This works around a bug of bash(?) and makes it work on Tiger.
-<<
-DescUsage:<<
- If you get scheme errors starting this version 1.6.0.7,
- try removing the file ~/.TeXmacs/system/setup.scm.
+ TeXmacs provides a unified GUI for clisp, macaulay2, maxima, octave,
+ pari-gp, scilab if they are installed. No configuration necessary,
+ they are auto-detected at program startup.
- Provides a unified GUI for clisp, macaulay2, maxima, octave, pari-gp, scilab
- if they are installed. No configuration necessary, they are auto-detected
- at program startup.
-
- The clisp plugin should work with clisp version 2.32 or later.
+ The octave plugin is currently broken.
+
+ Ghostscript is needed for importing images. Since even the TeXmacs
+ documentation contains images, ghostscript is strongly recommended.
- Ghostscript is needed for importing images. Since even the TeXmacs
- documentation contains images, ghostscript is strongly recommended.
-
For importing non-postscript images, the netpbm package is recommended.
-
- If you want to avoid having to create the standard bitmap fonts
- on the fly, consider installing the texmacs-fonts package.
- From version 1.0.5.10 on, PostScript Type1 fonts are used by default.
- TeXmacs uses the Type1 fonts from tetex, and an additional set of
- fonts is contained in the texmacs-extra-fonts package.
- If you want a complete set of Type1 fonts, consider installing
- the texmacs-type1-fonts package.
+<<
+DeskPackaging:<<
+ Patch from texmacs svn to disable code that doesn't build on
+ MacOSX 10.4. Should be incorporated in next release.
<<
Maintainer: Martin Costabel <costa...@wanadoo.fr>
Homepage: http://www.texmacs.org
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
