rpms/tetex/devel tetex-3.0-xdvi-22.84.10.patch,NONE,1.1
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Sep 2 14:00:35 UTC 2006
- Previous message (by thread): rpms/tetex/devel xdvi-22.84.10-j1.33.patch, NONE, 1.1 tetex-3.0-pxdvi.patch, 1.3, 1.4 tetex.spec, 1.98, 1.99 xdvik-22.84.10-j1.31_for_tetex.patch, 1.1, NONE
- Next message (by thread): rpms/kernel/devel linux-2.6-xen-compile-fixes.patch,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jnovy
Update of /cvs/dist/rpms/tetex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2141
Added Files:
tetex-3.0-xdvi-22.84.10.patch
Log Message:
- add yet another xdvi patch
tetex-3.0-xdvi-22.84.10.patch:
CHANGES | 16 +
INSTALL | 132 ------------
aclocal.m4 | 2
configure.in | 15 -
depend.mk | 580 ++++++++++++++++++++++-------------------------------
dvi-draw.c | 26 ++
encodings.c | 36 +--
events.c | 2
gui/depend.mk | 624 ++++++++++++++++++++++++++--------------------------------
gui/mag.c | 1
stamp-auto.in | 2
version.h | 2
withenable.ac | 46 ++--
xdvi.c | 9
14 files changed, 621 insertions(+), 872 deletions(-)
--- NEW FILE tetex-3.0-xdvi-22.84.10.patch ---
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/CHANGES xdvik-22.84.10/texk/xdvik/CHANGES
--- tetex-src-3.0/texk/xdvik/CHANGES 2004-12-03 08:40:37.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/CHANGES 2005-04-29 05:52:33.000000000 +0900
@@ -9,6 +9,22 @@
may contain undetected bugs. Such versions shouldn't be used
by distributors.
+ * 22.84.10 (2005/04/28):
+ + Fixed zero termination bug in t1lib version number check (t1lib.ac).
+ + Render an empty character instead of terminating with failed assertion
+ if T1lib doesn't return a usable glyph (e.g. at very small
+ \magnification factors; #1184087).
+ + Made gs_timeout in psgs.c a resource instead of #define it.
+ + Make file opening work with file descriptors too, as used in
+ Debian's Perl wrapper for xdvi (#1165497).
+
+ * 22.84.9 (teTeX-3.0):
+ + Applied Patch by Nobuyuki Tsuchimura (#1116871) to remove
+ code duplication in encodings.c.
+ + Changed --with-x-toolkit configure option to --with-xdvi-x-toolkit
+ for better interoperability with Metafont.
+ + Added a missing #if HAVE_X11_XMU_XMU_H in gui/selection.c.
+
* 22.84.8 (2004/12/02):
+ Made text selection mode and ruler mode work correctly with
LessTif and Motif 1.2.4 (bugfix for #997073). Special thanks
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/INSTALL xdvik-22.84.10/texk/xdvik/INSTALL
--- tetex-src-3.0/texk/xdvik/INSTALL 2004-06-27 01:31:47.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/INSTALL 1970-01-01 09:00:00.000000000 +0900
@@ -1,132 +0,0 @@
-
-Compiling and Installing Xdvik
-==============================
-
-Xdvik is the kpathsea-enhanced version of xdvi. The program
-invocation name is still `xdvi' for compatibility reasons.
-
-Please submit bug reports, suggestions etc. to the sourceforge
-xdvik project page:
-
- http://sourceforge.net/projects/xdvi/
-
-
-Note for users of older versions of teTeX (<= teTeX-1.0):
-=========================================================
-
- Please consult the README file in the texk/xdvik/texmf-alt/
- directory of the source distribution.
-
-
-Note for users of non-teTeX installations:
-==========================================
-
- Please consult the files texk/xdvik/texmf-alt/README and
- texk/xdvik/README.t1fonts for information on how to configure
- xdvik for direct Type1 font rendering.
-
-
-1. Required Software
-
- - X11R5 or newer and the Xt libraries
-
- and one of:
-
- - Xaw (Athena widgets)
-
- - Motif >= 1.2 or newer
- LessTif has a few bugs and restrictions that will result in limited
- functionality (see the file texk/xdvik/LESSTIF-BUGS for details).
- For best results, use OpenMotif 2.x.
-
- You need both the headers and the runtime libraries to compile and run
- xdvik (note that some Linux distributors put the headers into separate
- `X development' pacakges).
-
-2. Configuring:
-
- In the top-level directory (the directory in which this INSTALL
- file is located), invoke:
-
- ./configure
-
- You can also specify a toolkit via the --with-x-toolkit option
- (the default is to check if Motif is available and use it if it is):
-
- ./configure --with-x-toolkit=xaw [other-options]
-
- will compile with Xaw (Athena widgets) instead. You can set
- the search paths for Motif header/library files with the
- --with-motif-include and --with-motif-libdir options.
-
- If configure gives you errors about the main texmf tree not being
- found, specify its directory via the `--datadir' option.
- On a standard teTeX system, use the output of the command:
-
- kpsewhich --expand-path='$TEXMFMAIN'
-
- *without* the `texmf' component as value for `--datadir'
- (/usr/share or /usr/local/teTeX/share are possible values).
-
- For all configuration options available, see the output of:
- ./configure --help
-
-
-
-3. Compiling:
-
- In the top-level directory, invoke:
-
- make
-
- This should compile the executable texk/xdvik/xdvi-TOOLKIT.bin,
- where TOOLKIT is the value of the `--with-x-toolkit' specified
- in the configure step, e.g. `xaw' or `motif' (the default).
-
- If you set the environment variable XDVIINPUTS to the path
- containing the files xdvi.cfg and ps2pk.map, you should be
- able to test xdvi without actually installing it.
-
-
-
-4. Installation:
-
- Usually, the binary xdvi-TOOLKIT.bin is invoked by a shell wrapper
- `xdvi' which sets XDVIINPUTS and some other variables, like the X
- search path.
-
- If you only want to upgrade an existing version of xdvik, it should
- be sufficient to copy xdvi-TOOLKIT.bin into a directory in your PATH
- and check that the shell wrapper invokes the correct toolkit version.
- (You may also want to update the man page from xdvi.1). These files
- are located in the texk/xdvik subdirectory.
-
- To install a new version from scratch, invoke:
-
- make install
-
- in the top-level directory to install all executable and data files.
- This will not install the files in the texk/kpathsea subdirectory,
- which is not required if you already have a working TeX installation
- (and actually could overwrite your existing setup). If you don't have
- kpathsea installed yet, you'll need to install it manually; basically
- by doing `cd texk/kpathsea; make install'. Please see the file
- texk/kpathsea/INSTALL for more information.
-
-
-
-5. Setup:
-
- Make sure that the XDVIINPUTS variable (set in the system-wide
- texmf.cnf file or in the environment, e.g. in your .profile)
- contains the path to the directory DATADIR/texmf/xdvi, and
- to the file ps2pk.map (usually in DATADIR/texmf/dvips);
- e.g. by setting:
-
- export XDVIINPUTS='.;$TEXMF/{xdvi,dvips}//'
-
- If xdvik is still generating PK versions of fonts that you think
- you have Type1 versions of, please consult texk/xdvik/README.t1fonts
- for more information on how to configure xdvik correctly for Type1
- fonts.
-
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/aclocal.m4 xdvik-22.84.10/texk/xdvik/aclocal.m4
--- tetex-src-3.0/texk/xdvik/aclocal.m4 2005-01-20 17:52:59.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/aclocal.m4 2005-01-19 18:43:52.000000000 +0900
@@ -856,7 +856,7 @@
dnl ### Check for Xaw version
AC_DEFUN(XDVI_OLD_XAW,[
-if test "${with_x_toolkit}XXX" = XXX || test "${with_x_toolkit}" = xaw; then
+if test "${with_xdvi_x_toolkit}" = xaw; then
AC_MSG_CHECKING(for Xaw library)
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/configure.in xdvik-22.84.10/texk/xdvik/configure.in
--- tetex-src-3.0/texk/xdvik/configure.in 2005-01-24 08:42:17.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/configure.in 2004-12-08 08:31:06.000000000 +0900
@@ -83,7 +83,7 @@
dnl For the bitmap size. -- I think this is in XDVI_C_BITMAP_TYPE now -janl
dnl AC_CHECK_SIZEOF(long)
-sinclude(xt.ac)
+sinclude(../kpathsea/xt.ac)
sinclude(withenable.ac)
sinclude(../../libs/t1lib/withenable.ac)
sinclude(../../libs/t1lib/t1lib.ac)
@@ -142,25 +142,22 @@
Specify the location of Motif libraries],
motif_libdir="$withval")
-if test "x$with_xdvi_x_toolkit" = xno; then
- AC_MSG_WARN([xdvi needs at least the Xaw toolkit - ignoring the 'notool' option])
- AC_DEFINE(XAW)
- prog_extension="xaw"
- x_tool_libs="-lXaw"
-elif test "x$with_xdvi_x_toolkit" = xxaw3d; then
+if test "x$with_xdvi_x_toolkit" = xxaw3d; then
prog_extension="xaw3d"
x_tool_libs="-lXaw3d"
[...1763 lines suppressed...]
- xm_menu.h menu.h xaw_menu.h xm_prefsP.h xm_prefs.h xm_prefs_helpers.h
+ $(kpathsea_srcdir)/tex-file.h \
+ ../events.h ../string-utils.h message-window.h \
+ xm_menu.h menu.h xaw_menu.h xm_prefsP.h xm_prefs.h xm_prefs_helpers.h
xm_prefs_page.o: xm_prefs_page.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
- ../xdvi-config.h ../xdvi-debug.h ../xdvi.h ../version.h \
- $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \
- $(kpathsea_srcdir)/c-std.h \
- $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
+ ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
+ $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
+ $(kpathsea_srcdir)/c-unistd.h \
+ $(kpathsea_srcdir)/systypes.h \
$(kpathsea_srcdir)/c-memstr.h \
$(kpathsea_srcdir)/c-errno.h \
$(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h \
$(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
$(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
- $(kpathsea_srcdir)/c-pathmx.h \
$(kpathsea_srcdir)/c-dir.h \
- $(kpathsea_srcdir)/c-vararg.h \
- ../x_util.h xm_colorsel.h topic-window.h ../version.h ../util.h \
+ $(kpathsea_srcdir)/c-vararg.h ../x_util.h \
+ xm_colorsel.h topic-window.h ../util.h \
$(kpathsea_srcdir)/c-stat.h \
$(kpathsea_srcdir)/hash.h \
- $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/c-vararg.h \
- ../events.h \
- ../events.h statusline.h xm_prefsP.h xm_prefs_page.h ../my-snprintf.h
+ $(kpathsea_srcdir)/tex-file.h \
+ ../events.h statusline.h xm_prefsP.h \
+ xm_prefs_page.h ../my-snprintf.h
xm_prefs_scroll.o: xm_prefs_scroll.c ../xdvi-config.h ../c-auto.h \
- ../xdvi.h ../xdvi-config.h ../xdvi-debug.h ../xdvi.h ../version.h \
- $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \
- $(kpathsea_srcdir)/c-std.h \
- $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
+ ../xdvi.h ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
+ $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
+ $(kpathsea_srcdir)/c-unistd.h \
+ $(kpathsea_srcdir)/systypes.h \
$(kpathsea_srcdir)/c-memstr.h \
$(kpathsea_srcdir)/c-errno.h \
$(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h \
$(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
$(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
- $(kpathsea_srcdir)/c-pathmx.h \
$(kpathsea_srcdir)/c-dir.h \
- $(kpathsea_srcdir)/c-vararg.h \
- ../x_util.h xm_colorsel.h topic-window.h ../version.h ../util.h \
+ $(kpathsea_srcdir)/c-vararg.h ../x_util.h \
+ xm_colorsel.h topic-window.h ../util.h \
$(kpathsea_srcdir)/c-stat.h \
$(kpathsea_srcdir)/hash.h \
- $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/c-vararg.h \
- ../events.h \
- ../events.h ../dvi-init.h statusline.h xm_prefsP.h xm_prefs_scroll.h \
- ../my-snprintf.h
+ $(kpathsea_srcdir)/tex-file.h \
+ ../events.h ../dvi-init.h statusline.h \
+ xm_prefsP.h xm_prefs_scroll.h ../my-snprintf.h
xm_toolbar.o: xm_toolbar.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
- ../xdvi-config.h ../xdvi-debug.h ../xdvi.h ../version.h \
- $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \
- $(kpathsea_srcdir)/c-std.h \
- $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
+ ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
+ $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
+ $(kpathsea_srcdir)/c-unistd.h \
+ $(kpathsea_srcdir)/systypes.h \
$(kpathsea_srcdir)/c-memstr.h \
$(kpathsea_srcdir)/c-errno.h \
$(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h \
$(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
$(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
- $(kpathsea_srcdir)/c-pathmx.h \
$(kpathsea_srcdir)/c-dir.h \
- $(kpathsea_srcdir)/c-vararg.h \
- pagesel.h \
+ $(kpathsea_srcdir)/c-vararg.h pagesel.h \
help-window.h message-window.h $(kpathsea_srcdir)/tex-file.h \
- $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/expand.h statusline.h \
- ../dvi-init.h ../events.h ../dvi-draw.h xm_menu.h menu.h xaw_menu.h \
- xm_toolbar.h ../util.h $(kpathsea_srcdir)/c-stat.h \
+ $(kpathsea_srcdir)/expand.h statusline.h ../dvi-init.h ../events.h \
+ ../dvi-draw.h xm_menu.h menu.h xaw_menu.h xm_toolbar.h ../util.h \
+ $(kpathsea_srcdir)/c-stat.h \
$(kpathsea_srcdir)/hash.h \
- $(kpathsea_srcdir)/tex-file.h \
- ../events.h ../x_util.h Tip.h \
- ../c-openmx.h ../pixmaps/toolbar.xpm
+ ../x_util.h \
+ Tip.h ../c-openmx.h
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/gui/mag.c xdvik-22.84.10/texk/xdvik/gui/mag.c
--- tetex-src-3.0/texk/xdvik/gui/mag.c 2005-01-25 04:22:22.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/gui/mag.c 2005-01-25 18:04:14.000000000 +0900
@@ -34,6 +34,7 @@
/* one of the following should define OPEN_MAX: */
#include <limits.h>
#include "c-openmx.h"
+
#include "xdvi.h"
#ifdef MOTIF
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/stamp-auto.in xdvik-22.84.10/texk/xdvik/stamp-auto.in
--- tetex-src-3.0/texk/xdvik/stamp-auto.in 2005-01-30 16:46:32.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/stamp-auto.in 2004-03-09 11:24:34.000000000 +0900
@@ -1 +1 @@
-So Jan 30 08:46:32 CET 2005
+Tue Mar 9 01:16:23 GMT 2004
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/version.h xdvik-22.84.10/texk/xdvik/version.h
--- tetex-src-3.0/texk/xdvik/version.h 2005-01-17 03:39:50.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/version.h 2005-04-29 05:52:36.000000000 +0900
@@ -2,7 +2,7 @@
#ifndef VERSION_H_
#define VERSION_H_
-#define XDVI_VERSION "22.84.9"
+#define XDVI_VERSION "22.84.10"
#ifdef MOTIF
#define XDVI_GUI "(Motif toolkit)"
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/withenable.ac xdvik-22.84.10/texk/xdvik/withenable.ac
--- tetex-src-3.0/texk/xdvik/withenable.ac 2004-12-10 05:22:13.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/withenable.ac 2004-12-14 18:23:04.000000000 +0900
@@ -1,5 +1,28 @@
dnl withenable.ac: --with and --enable options.
+# Check for toolkit options. This used to be --with-x-toolkit, but was changed
+# to remove clashes with metafont which accepts different values.
+# We allow `yes' as synonym for the default toolkit, for easier communication
+# with ../kpathsea/xt.ac.
+AC_ARG_WITH(xdvi-x-toolkit,
+[ --with-xdvi-x-toolkit=KIT
+ Use toolkit KIT for xdvi (KIT=motif/xaw/xaw3d/neXtaw).
+ If no --with-xdvi-x-toolkit option is used, use Motif
+ if available, else Xaw.],
+[ case "${withval}" in
+ next | nextaw | neXtaw ) val=neXtaw ;;
+ xaw3d ) val=xaw3d ;;
+ x | xa | xaw ) val=xaw ;;
+ y | ye | yes ) val=yes ;;
+ m | mo | mot | moti | motif ) val=motif ;;
+ * )
+AC_MSG_WARN([unknown --with-xdvi-x-toolkit argument \`$withval'; using xaw.])
+ val=xaw;;
+ esac
+ with_xdvi_x_toolkit=$val
+])
+
+
# Check if the user wants to use Ghostscript, DPS or NeWS to
# display PostScript.
AC_ARG_WITH(ps,
@@ -124,26 +147,3 @@
fi])
AC_SUBST(LDT1LIB)
-
-dnl This defines --with-x implicitly (which is why we use that package
-dnl name below), so put it here, so it comes first in the --help output.
-dnl This reads best.
-
-dnl Remember to add AC_PATH_XTRA when actually using X.
-
-AC_ARG_WITH(xdvi-x-toolkit,
-[ --with-xdvi-x-toolkit=KIT
- Use toolkit KIT for xdvi (KIT=motif/xaw/xaw3d/neXtaw).
- If no --with-xdvi-x-toolkit option is used, use Motif
- if available, else Xaw.],
-[ case "${withval}" in
- next | nextaw | neXtaw ) val=neXtaw ;;
- xaw3d ) val=xaw3d ;;
- x | xa | xaw ) val=xaw ;;
- m | mo | mot | moti | motif ) val=motif ;;
- * )
-AC_MSG_WARN([unknown --with-xdvi-x-toolkit argument \`$withval'; using xaw.])
- val=xaw;;
- esac
- with_xdvi_x_toolkit=$val
-])
diff -x configure -x CVS -x .cvsignore -Naur tetex-src-3.0/texk/xdvik/xdvi.c xdvik-22.84.10/texk/xdvik/xdvi.c
--- tetex-src-3.0/texk/xdvik/xdvi.c 2005-01-20 17:52:59.000000000 +0900
+++ xdvik-22.84.10/texk/xdvik/xdvi.c 2005-04-18 17:19:36.000000000 +0900
@@ -3964,8 +3964,13 @@
if (real_filename == NULL)
return NULL;
-
- ret = REALPATH(real_filename, canonical_path);
+
+ if ((ret = REALPATH(real_filename, canonical_path)) == NULL) {
+ /* REALPATH failed, use real_filename */
+ strncpy(canonical_path, real_filename, MAXPATHLEN);
+ canonical_path[MAXPATHLEN] = '\0';
+ ret = canonical_path;
+ }
free(real_filename);
/* check for correct DVI files */
- Previous message (by thread): rpms/tetex/devel xdvi-22.84.10-j1.33.patch, NONE, 1.1 tetex-3.0-pxdvi.patch, 1.3, 1.4 tetex.spec, 1.98, 1.99 xdvik-22.84.10-j1.31_for_tetex.patch, 1.1, NONE
- Next message (by thread): rpms/kernel/devel linux-2.6-xen-compile-fixes.patch,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list