Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8601

Modified Files:
        texmacs.info texmacs-qt.info 
Log Message:
Latest upstream version 1.0.7.7. Work around some of the more blatant bugs.

Index: texmacs-qt.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/texmacs-qt.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- texmacs-qt.info     1 Dec 2009 00:32:07 -0000       1.4
+++ texmacs-qt.info     6 Nov 2010 14:57:01 -0000       1.5
@@ -1,5 +1,5 @@
 Package: texmacs-qt
-Version: 1.0.7.3 
+Version: 1.0.7.7 
 Revision: 1
 GCC: 4.0
 Source: mirror:custom:TeXmacs-%v-src.tar.gz
@@ -7,16 +7,15 @@
  Primary: http://www.texmacs.org/Download/ftp/targz/
  Secondary: ftp://ftp.texmacs.org/pub/TeXmacs/targz/
 <<
-Source-MD5: dd7886153661c39e9dc350afec5050a8
+Source-MD5: 3c575a8ee456caacb4ebb2dbdf6ff9be
 License: GPL
-Depends: x11-shlibs, tetex-base, guile18, ispell | aspell, wget, 
imlib2-shlibs, libiconv, freetype219-shlibs, gmp-shlibs, libtool14-shlibs, 
libgettext3-shlibs, qt4-mac-core-shlibs, qt4-mac-gui-shlibs
-BuildDepends: x11, guile18-dev, x11-dev, imlib2, libiconv-dev, freetype219, 
gmp, libtool14, gettext, qt4-mac
-Conflicts: texmacs, texmacs-qt
-Replaces: texmacs-extra-fonts, texmacs-type1-fonts, texmacs, texmacs-qt
+Depends: x11-shlibs, tetex-base, guile18, ispell | aspell, wget, 
imlib2-shlibs, libiconv, freetype219-shlibs, gmp5-shlibs, libtool14-shlibs, 
libgettext3-shlibs, qt4-mac-core-shlibs, qt4-mac-gui-shlibs
+BuildDepends: x11, guile18-dev, x11-dev, imlib2, libiconv-dev, freetype219, 
gmp5, libtool2, gettext, qt4-mac
 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 --x-includes=/usr/X11R6/include 
--x-libraries=/usr/X11R6/lib --enable-qt --with-qt=%p/lib/qt4-mac/bin
+ConfigureParams: --libexecdir=%p/lib --mandir=%p/share/man --with-iconv=/usr 
--with-freetype=linked --enable-maxosx-extensions 
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib --enable-qt 
--with-qt=%p/lib/qt4-mac/bin
+PatchFile: %n.patch
+PatchFile-MD5: 79edc2204862513f18f242d877066c9c
 PatchScript: <<
 #!/bin/sh -ev
 # change hardwired paths for ispell and aspell 
@@ -34,6 +33,12 @@
     s,malloc\(1025\),malloc\(1024\*1000\+1\),g ;
     s,(fread.*) 1024,$1 1024\*1000,g
  ' plugins/graphviz/src/tm_graphviz.c
+# work around the eternal 'echo -n' problem with Apple's 150% pseudo-POSIX 
/bin/sh
+ perl -pi -e 's|\#\!/bin/sh|#!/bin/bash|' `/usr/bin/grep '\#\!/bin/' -r 
plugins -l`
+# fix tempfile mess in asy and gnuplot plugins
+ perl -pi -e 's|TEMPDIR=.*|TEMP_DIR=/private/var/tmp/|' 
plugins/asymptote/bin/tm_asy plugins/gnuplot/bin/tm_gnuplot
+# patch from SVN for making the qt version of 1.0.7.7 build
+ patch -p1 < %{PatchFile}
 <<
 CompileScript: <<
 #!/bin/sh -ev
@@ -41,9 +46,10 @@
  export QTDIR=%p/lib/qt4-mac
  ./configure %c
  export GUILE_LOAD_PATH=%p/share/guile/1.8
- make
+ make BUNDLE_MAIN
 <<
-InstallScript: make install DESTDIR=%d
+InstallScript: mv ../distr/TeXmacs.app ../distr/TeXmacs-qt.app
+AppBundles: ../distr/TeXmacs-qt.app
 DocFiles: COPYING LICENSE TeXmacs/README TeXmacs/TEX_FONTS
 Description: TeX-based WYSIWYG editor
 DescDetail: <<
@@ -69,7 +75,8 @@
     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.
+    some bugs. It comes now as a standard Mac app "TeXMacs-qt",
+    to be found in /Applications/Fink/.
  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.

Index: texmacs.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/texmacs.info,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- texmacs.info        22 Oct 2010 18:38:24 -0000      1.31
+++ texmacs.info        6 Nov 2010 14:57:01 -0000       1.32
@@ -1,18 +1,17 @@
 Package: texmacs
-Version: 1.0.7.3 
+Version: 1.0.7.7 
 Revision: 1
-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: dd7886153661c39e9dc350afec5050a8
+Source-MD5: 3c575a8ee456caacb4ebb2dbdf6ff9be
 License: GPL
-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
+Depends: x11-shlibs, tetex-base, guile18, ispell | aspell, wget, 
imlib2-shlibs, libiconv, freetype219-shlibs, gmp5-shlibs, libtool2-shlibs, 
libgettext8-shlibs
+BuildDepends: x11, guile18-dev, x11-dev, imlib2, libiconv-dev, freetype219, 
gmp5, libtool2
 Replaces: texmacs-extra-fonts, texmacs-type1-fonts, texmacs, texmacs-qt
-Conflicts: texmacs, texmacs-qt
+Conflicts: texmacs, texmacs-qt (<= 1.0.7.4)
 BuildConflicts: freetype
 Recommends: ghostscript, netpbm, xfig, macaulay2, maxima, pari-gp, scilab
 Suggests: texmacs-extra-fonts
@@ -25,8 +24,8 @@
 # make place for Apple's resize brick in quartz-wm 
  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.bak -e 's|\-lutil||g' plugins/r/Makefile 
- perl -pi.bak -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 
@@ -34,6 +33,10 @@
     s,malloc\(1025\),malloc\(1024\*1000\+1\),g ;
     s,(fread.*) 1024,$1 1024\*1000,g
  ' plugins/graphviz/src/tm_graphviz.c
+# work around the eternal 'echo -n' problem with Apple's 150% pseudo-POSIX 
/bin/sh
+ perl -pi -e 's|\#\!/bin/sh|#!/bin/bash|' `/usr/bin/grep '\#\!/bin/' -r 
plugins -l` 
+# fix tempfile mess in asy and gnuplot plugins
+ perl -pi -e 's|TEMPDIR=.*|TEMP_DIR=/private/var/tmp/|' 
plugins/asymptote/bin/tm_asy plugins/gnuplot/bin/tm_gnuplot
 <<
 CompileScript: <<
 #!/bin/sh -ev


------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a 
Billion" shares his insights and actions to help propel your 
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to