dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xdvik
-# $Id$
-NAME := xdvik
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

pxdvik-22.84.13-use-system-libs.patch

@@ -1,21 +0,0 @@
-diff -ru --exclude='*.orig' texk-orig/pxdvik/Makefile.in texk/pxdvik/Makefile.in
---- texk-orig/pxdvik/Makefile.in	2008-02-02 14:48:22.000000000 +0000
-+++ texk/pxdvik/Makefile.in	2008-02-02 14:50:09.000000000 +0000
-@@ -70,7 +70,7 @@
- ps_def = @PS_DEF@
- vflib_def = -DDEFAULT_FONTMAP=\"$(VFONTMAP)\"
- prog_cflags = @XTRA_WARN_CFLAGS@ $(LIBT1CPPFLAGS) $(FREETYPE2CPPFLAGS) $(ZLIBCPPFLAGS) $(ps_def) \
---I$(srcdir)/gui -I../../libs/t1lib/lib/t1lib -I../kpathsea $(x_cppflags) $(vflib_def)
-+-I$(srcdir)/gui $(vflib_def)
- 
- # Note: to be able to use one depend.mk file for both Motif/Xaw (which
- # is needed since only maintainers are supposed to invoke `make depend')
-@@ -142,7 +142,7 @@
- test_verbose:
- 	cd tests; $(MAKE) $(makeargs) test_verbose
- 
--@final_exec_name@: $(kpathsea) $(objects) $(LIBT1DEP) $(FREETYPE2DEP) $(ZLIBDEP) $(LIBGUIDEP)
-+@final_exec_name@: $(objects) $(LIBT1DEP) $(FREETYPE2DEP) $(ZLIBDEP) $(LIBGUIDEP)
- 	$(kpathsea_link) $(objects) $(LIBGUI) $(x_link) $(LOADLIBES)
- 
- squeeze.o: squeeze.c

sources

@@ -1,2 +1 @@
-4d3d92381be42d7163e0f815f9cfb346  xdvik-22.84.13.tar.gz
-d4c68a340a81dc6cce353081476abb56  xdvik-22.84.13-j1.36.patch.gz
+0e0c3d49b8c0cbc934894757780e098f  xdvik-22.84.14.tar.gz

texlive-2007-xprint.patch

@@ -1,13 +0,0 @@
---- tetex-src-3.0/texk/xdvik/configure.in.xprint	2006-05-05 16:31:52.000000000 -0400
-+++ tetex-src-3.0/texk/xdvik/configure.in	2006-05-05 16:32:07.000000000 -0400
-@@ -105,8 +105,8 @@
-   else
-     XLFLAG=
-   fi
--  AC_CHECK_LIB(Xp, XpQueryVersion,
--               x_ext_lib="-lXp -lXext", :, -lXext -lX11 $X_EXTRA_LIBS $XLFLAG)
-+#  AC_CHECK_LIB(Xp, XpQueryVersion,
-+#               x_ext_lib="-lXp -lXext", :, -lXext -lX11 $X_EXTRA_LIBS $XLFLAG)
- fi
- dnl
- dnl If libXp not found, try libXext only:

texlive-source-xdvi-numlock.patch

@@ -1,38 +0,0 @@
---- texk/xdvik/translations.h
-+++ texk/xdvik/translations.h	2005-02-07 14:07:44.000000000 +0100
-@@ -119,15 +119,26 @@
-     "<Key>Escape:	discard-number()\n"
- #endif
- #ifdef XK_KP_Left
--    "<Key>KP_Home:	home()\n"
--    "<Key>KP_Left:	left()\n"
--    "<Key>KP_Up:	up()\n"
--    "<Key>KP_Right:	right()\n"
--    "<Key>KP_Down:	down()\n"
--    "<Key>KP_Prior:	back-page()\n"
--    "<Key>KP_Next:	forward-page()\n"
--    "<Key>KP_Delete:	up-or-previous()\n"
--    "<Key>KP_Enter:	forward-page()\n"
-+    "~@Num_Lock<Key>KP_Home:home()\n"
-+    "~@Num_Lock<Key>KP_Left:left(0.015)\n"
-+    "~@Num_Lock<Key>KP_Begin:center()\n"
-+    "~@Num_Lock<Key>KP_Up:up(0.015)\n"
-+    "~@Num_Lock<Key>KP_Right:right(0.015)\n"
-+    "~@Num_Lock<Key>KP_Down:down(0.015)\n"
-+    "~@Num_Lock<Key>KP_Prior:back-page()\n"
-+    "~@Num_Lock<Key>KP_Next:forward-page()\n"
-+    "<Key>KP_Enter:forward-page()\n"
-+    "<Key>KP_Delete:up-or-previous()\n"
-+    "<Key>KP_1:digit(1)\n"
-+    "<Key>KP_2:digit(2)\n"
-+    "<Key>KP_3:digit(3)\n"
-+    "<Key>KP_4:digit(4)\n"
-+    "<Key>KP_5:digit(5)\n"
-+    "<Key>KP_6:digit(6)\n"
-+    "<Key>KP_7:digit(7)\n"
-+    "<Key>KP_8:digit(8)\n"
-+    "<Key>KP_9:digit(9)\n"
-+    "<Key>KP_0:digit(0)\n"
- #endif
-     "";
- 

texlive-xdvi-maxchar.patch

@@ -1,12 +0,0 @@
-diff -up texlive-2007/texk/xdvik/dvi-draw.c.maxchar texlive-2007/texk/xdvik/dvi-draw.c
---- texlive-2007/texk/xdvik/dvi-draw.c.maxchar	2007-11-20 15:21:35.000000000 +0100
-+++ texlive-2007/texk/xdvik/dvi-draw.c	2007-11-22 15:31:06.000000000 +0100
-@@ -5911,6 +5911,8 @@ get_t1_glyph(
- 	      t1libid, currinf.fontp->scale,
- 	      size, currwin.shrinkfactor));
- 
-+    if (ch > maxchar)
-+    	return NULL;
-     /* Check if the glyph already has been rendered */
-     if ((g = &currinf.fontp->glyph[ch])->bitmap.bits == NULL) {
- 	int bitmapbytes;

xdvik-22.84.13-bad_bar.patch

@@ -1,11 +0,0 @@
---- xdvik-22.84.13/texk/xdvik/events.c~	2008-01-20 16:15:02.000000000 -0700
-+++ xdvik-22.84.13/texk/xdvik/events.c	2008-01-20 16:18:05.000000000 -0700
-@@ -2599,7 +2599,7 @@ Act_fullscreen(Widget w, XEvent *event,
- 	XtVaGetValues(globals.widgets.clip_widget, XtNy, &get_y, NULL);
- 	curr_y = -(get_y - window_y);
- 	if (curr_y - orig_y > 0)
--	    XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc, (XtPointer)(curr_y - orig_y));
-+	    XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc, (XtPointer)(curr_y - orig_y));
- #endif /* MOTIF */
-     }
-     handle_x_scroll(NULL, NULL, NULL, NULL);

xdvik-22.84.13-keepflag-scrollfix.patch

@@ -1,69 +0,0 @@
---- xdvik-22.84.13/texk/xdvik/events.c.orig	2007-08-06 13:33:20.000000000 -0600
-+++ xdvik-22.84.13/texk/xdvik/events.c	2008-01-18 13:30:19.000000000 -0700
-@@ -700,10 +700,12 @@ home(wide_bool scrl)
-     {
- 	int value;
- 
--	value = (globals.page.w - mane.width) / 2;
--	if (value > resource.sidemargin_int / mane.shrinkfactor)
--	    value = resource.sidemargin_int / mane.shrinkfactor;
--	(void)set_bar_value(globals.widgets.x_bar, value, (int)(globals.page.w - mane.width));
-+	if (!resource.keep_flag) {
-+	    value = (globals.page.w - mane.width) / 2;
-+	    if (value > resource.sidemargin_int / mane.shrinkfactor)
-+		value = resource.sidemargin_int / mane.shrinkfactor;
-+	    (void)set_bar_value(globals.widgets.x_bar, value, (int)(globals.page.w - mane.width));
-+	}
- 
- 	value = (globals.page.h - mane.height) / 2;
- 	if (value > resource.topmargin_int / mane.shrinkfactor)
-@@ -712,7 +714,7 @@ home(wide_bool scrl)
-     }
- # else
-     get_xy();
--    if (globals.widgets.x_bar != NULL) {
-+    if (!resource.keep_flag && globals.widgets.x_bar != NULL) {
- 	int coord = (globals.page.w - mane.width) / 2;
- 
- 	if (coord > resource.sidemargin_int / mane.shrinkfactor)
-@@ -749,16 +751,18 @@ home_bottom(wide_bool scrl)
-     {
- 	int value;
- 
--	value = (globals.page.w - mane.width) / 2;
--	if (value > resource.sidemargin_int / mane.shrinkfactor)
--	    value = resource.sidemargin_int / mane.shrinkfactor;
--	(void)set_bar_value(globals.widgets.x_bar, value, (int)(globals.page.w - mane.width));
-+	if (!resource.keep_flag) {
-+	    value = (globals.page.w - mane.width) / 2;
-+	    if (value > resource.sidemargin_int / mane.shrinkfactor)
-+		value = resource.sidemargin_int / mane.shrinkfactor;
-+	    (void)set_bar_value(globals.widgets.x_bar, value, (int)(globals.page.w - mane.width));
-+	}
- 
- 	(void)set_bar_value(globals.widgets.y_bar, (int)(globals.page.h - mane.height), (int)(globals.page.h - mane.height));
-     }
- #else /* MOTIF */
-     get_xy();
--    if (globals.widgets.x_bar != NULL) {
-+    if (!resource.keep_flag && globals.widgets.x_bar != NULL) {
- 	int coord = (globals.page.w - mane.width) / 2;
- 
- 	if (coord > resource.sidemargin_int / mane.shrinkfactor)
---- xdvik-22.84.13/texk/xdvik/xdvi.1.in.orig	2008-01-18 13:55:01.000000000 -0700
-+++ xdvik-22.84.13/texk/xdvik/xdvi.1.in	2008-01-18 13:55:35.000000000 -0700
-@@ -859,6 +859,14 @@ actions, not by
- .B up-or-previous()
- and
- .BR down-or-next() .
-+(Note: this version of the program is modified to honour this
-+flag for
-+.B up-or-previous()
-+and
-+.BR down-or-next()
-+although only for a horizontal position and not vertical. That allows
-+for a "continuous" scrolling back an forth through a document with
-+a display window narrower than a page width.)
- .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
- .TP
- .B \-l

xdvik-22.84.13-manpage.patch

@@ -1,83 +0,0 @@
---- texk/xdvik/xdvi.1.in.orig	2008-01-19 14:02:41.000000000 +0000
-+++ texk/xdvik/xdvi.1.in	2008-01-19 14:05:08.000000000 +0000
-@@ -507,7 +507,7 @@
- variables).
- .sp
- A new instance of the editor is started each time this command is used;
--therefore it is preferrable to use an editor that can be invoked in
-+therefore it is preferable to use an editor that can be invoked in
- `client' mode to load new files into the same instance. Example
- settings are:
- .RS 7
-@@ -1260,7 +1260,7 @@
- .TP
- .B \-notempfile
- .RB ( .tempFile )
--As mentined in the section
-+As mentioned in the section
- .B DESCRIPTION
- above, xdvi will create a temporary copy of the DVI file so that it
- can be accessed without interruptions even while the file is being
-@@ -1329,7 +1329,7 @@
- .B \eusepackage[dvips]{geometry}
- .sp
- which will be recognized by both dvips and xdvi; in that case the
--use of a `-paper' option should be unneccessary.
-+use of a `-paper' option should be unnecessary.
- .br
- The paper size may be specified in the form
- \fIwidth\fBx\fIheight\fR optionally followed by a unit, where
-@@ -1576,7 +1576,7 @@
- .IR ../test.tex ,
- .IR /my/homedir/tex/test.tex
- or any combination of these), both filenames are expanded to a full path,
--with any occurences of
-+with any occurrences of
- .I ../
- and
- .I ./
-@@ -1806,7 +1806,7 @@
- .br
- When the option
- .BI \-pause " special-string"
--is used and the display is currenlty paused, this key will instead
-+is used and the display is currently paused, this key will instead
- display the next portion of the page until the next
- .I special-string
- or the end of the page is encountered.  See the description of the
-@@ -2293,7 +2293,7 @@
- .RB [ use-tex-pages() ]
- Use logical \*(Te\& pages (the values of the
- .I \ecount0
--register) instead of physical pages for the pagelist labels and
-+register) instead of physical pages for the pagelist tabels and
- when jumping to a page in a document via
- .BR goto-page() .
- See also the
-@@ -3020,7 +3020,7 @@
- jumps to the next match (like pressing the `Find' button in the search window).
- .PP
- By default, the matches are highlighted in inverted color.
--If the display isn't running in TrueColor, or if the X resouce
-+If the display isn't running in TrueColor, or if the X resource
- .B matchHighlightInverted
- is set to false or the command-line option
- .B \-nomatchinverted
-@@ -3229,7 +3229,7 @@
- mechanism, as a single argument after the `!'. Any arguments
- listed in the
- .B Dvips options
--field are segmeted at whitespaces and passed as separate arguments to dvips.
-+field are segmented at whitespaces and passed as separate arguments to dvips.
- If you e.g. want to print the file 2-up, you should enter
- the following string into the
- .B Printer
-@@ -3427,7 +3427,7 @@
- thin cross, and a larger, cross-shaped ruler is drawn in the
- highlight color at the mouse location. The ruler doesn't have
- units attached to it; instead, the current distance between the
--ruler and the mouse cursor is continously printed to the
-+ruler and the mouse cursor is continuously printed to the
- statusline.
- .br
- When activating Ruler Mode, the ruler is at first attached to

xdvik-22.84.13-tempfix.patch

@@ -1,15 +0,0 @@
-diff -up xdvik-22.84.13/texk/xdvik/xdvizilla.orig xdvik-22.84.13/texk/xdvik/xdvizilla
---- xdvik-22.84.13/texk/xdvik/xdvizilla.orig	2006-07-07 23:31:06.000000000 +0200
-+++ xdvik-22.84.13/texk/xdvik/xdvizilla	2008-01-15 12:51:15.000000000 +0100
-@@ -61,9 +61,8 @@ usage()
- trap 'do_cleanup' 1 2 3 7 13 15
- 
- ### create a temporary directory only read/writable by user
--TMP_DIR=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
--
--(umask 077; mkdir "$TMP_DIR") || do_abort "Could not create directory \`$TMP_DIR'"
-+TMP_DIR=${TMPDIR-${TEMP-${TMP-/tmp}}}/${progname}.XXXXXX
-+TMP_DIR=$(mktemp -d "$TMP_DIR") || do_abort "Could not create directory \`$TMP_DIR'"
- 
- ### we hard-wire the magic for DVI files here since some "file" implementations
- ### (e.g. on Solaris 9) don't recognize DVI files (bug #1508963)

xdvik-22.84.13-uint32_t-fix.patch

@@ -1,13 +0,0 @@
-diff -u -r1.1.1.2 -r1.2
---- xdvik-22.84.13.orig/texk/etc/autoconf/acgeneral.m4  19 Oct 2003 12:59:43 -0000      1.1.1.2
-+++ xdvik-22.84.13/texk/etc/autoconf/acgeneral.m4       14 Dec 2007 05:47:37 -0000      1.2
-@@ -2037,6 +2037,9 @@
- #if STDC_HEADERS
- #include <stdlib.h>
- #include <stddef.h>
-+#endif
-+#if HAVE_STDINT_H
-+#include <stdint.h>
- #endif], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
- AC_MSG_RESULT($ac_cv_type_$1)
- if test $ac_cv_type_$1 = no; then

xdvik-22.84.13-use-system-libs.patch

@@ -1,70 +0,0 @@
-diff -ru xdvik-22.84.13-orig/texk/Makefile.in xdvik-22.84.13/texk/Makefile.in
---- xdvik-22.84.13-orig/texk/Makefile.in	2008-01-12 12:37:10.000000000 -0500
-+++ xdvik-22.84.13/texk/Makefile.in	2008-01-12 18:37:49.000000000 -0500
-@@ -5,7 +5,7 @@
- 
- programs = web2c $(ESUBDIRS)
- kpathsea_dir = kpathsea
--all_dirs = $(programs) $(kpathsea_dir)
-+all_dirs = $(programs)
- 
- ac_include make/paths.mk
- ac_include make/makevars.mk
-@@ -31,12 +31,12 @@
- # Make the library before the programs.
- # Use if ... rather than || or && because Ultrix sh exits for
- # no good reason with the latter.
--default all: do-kpathsea
-+default all:
- 	for d in $(programs); do if test -d $$d; then \
- 	  (cd $$d && $(MAKE) $(makeargs) $@) || exit 1; else true; fi; done
- 
- install install-data install-exec:
--	for d in kpathsea $(programs); do if test -d $$d; then \
-+	for d in $(programs); do if test -d $$d; then \
- 	  (cd $$d && $(MAKE) $(installargs) $@) || exit 1; else true; fi; done
- 
- # Other standard targets for everything.
-Only in xdvik-22.84.13/texk: Makefile.in.~1.1.1.1.10.1.~
-diff -ru xdvik-22.84.13-orig/texk/make/common.mk xdvik-22.84.13/texk/make/common.mk
---- xdvik-22.84.13-orig/texk/make/common.mk	2008-01-12 12:37:10.000000000 -0500
-+++ xdvik-22.84.13/texk/make/common.mk	2008-01-12 18:35:39.000000000 -0500
-@@ -12,7 +12,7 @@
- LDFLAGS = @LDFLAGS@ $(XLDFLAGS)
- 
- # Kpathsea needs this for compiling, programs need it for linking.
--LIBTOOL = $(SHELL) $(kpathsea_parent)/libtool
-+LIBTOOL = /usr/bin/libtool
- 
- # You can change [X]CPPFLAGS, [X]CFLAGS, or [X]DEFS, but
- # please don't change ALL_CPPFLAGS or ALL_CFLAGS.
-@@ -43,7 +43,7 @@
- kpathsea_dir = $(kpathsea_parent)/kpathsea
- kpathsea_srcdir_parent = $(top_srcdir)/..
- kpathsea_srcdir = $(kpathsea_srcdir_parent)/kpathsea
--kpathsea = $(kpathsea_dir)/libkpathsea.la
-+kpathsea = -lkpathsea
- 
- @MAINT@ifeq ($(CC), gcc)
- @MAINT@XDEFS = -Wpointer-arith $(warn_more)
-diff -ru xdvik-22.84.13-orig/texk/xdvik/Makefile.in xdvik-22.84.13/texk/xdvik/Makefile.in
---- xdvik-22.84.13-orig/texk/xdvik/Makefile.in	2008-01-12 12:37:10.000000000 -0500
-+++ xdvik-22.84.13/texk/xdvik/Makefile.in	2008-01-12 18:35:39.000000000 -0500
-@@ -53,7 +53,7 @@
- # ps_def = @PS_DEF@ -DRGB_ANTI_ALIASING
- ps_def = @PS_DEF@
- prog_cflags = @XTRA_WARN_CFLAGS@ $(LIBT1CPPFLAGS) $(ps_def) \
---I$(srcdir)/gui -I../../libs/t1lib/lib/t1lib -I../kpathsea $(x_cppflags)
-+-I$(srcdir)/gui $(x_cppflags)
- 
- # Note: to be able to use one depend.mk file for both Motif/Xaw (which
- # is needed since only maintainers are supposed to invoke `make depend')
-@@ -119,7 +119,7 @@
- test_verbose:
- 	cd tests; $(MAKE) $(makeargs) test_verbose
- 
--@final_exec_name@: $(kpathsea) $(objects) $(LIBT1DEP) $(LIBGUIDEP)
-+@final_exec_name@: $(objects) $(LIBT1DEP) $(LIBGUIDEP)
- 	$(kpathsea_link) $(objects) $(LIBGUI) $(x_link) $(LOADLIBES)
- 
- squeeze.o: squeeze.c

xdvik-22.84.13-xdgopen.patch

@@ -1,36 +0,0 @@
-diff -up xdvik-22.84.13/texk/xdvik/xdvi.1.in.xdgopen xdvik-22.84.13/texk/xdvik/xdvi.1.in
---- xdvik-22.84.13/texk/xdvik/xdvi.1.in.xdgopen	2007-07-15 13:58:35.000000000 +0200
-+++ xdvik-22.84.13/texk/xdvik/xdvi.1.in	2008-01-13 16:13:51.000000000 +0100
-@@ -349,7 +349,7 @@ and
- .B WWWBROWSER
- (in that order) are used to determine the browser command. If these are
- not set either, the following default value is used:
--\fBhtmlview %s:firefox -remote -remote "openURL(%s,new-window)":mozilla -remote "openURL(%s,new-window)":netscape -raise -remote "openURL(%s,new-window)":xterm -e w3m %s:xterm -e lynx %s:xterm -e wget %s\fP
-+\fBxdg-open %s:htmlview %s:firefox -remote -remote "openURL(%s,new-window)":mozilla -remote "openURL(%s,new-window)":netscape -raise -remote "openURL(%s,new-window)":xterm -e w3m %s:xterm -e lynx %s:xterm -e wget %s\fP
- .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
- #ifgrey
- .TP
-diff -up xdvik-22.84.13/texk/xdvik/browser.c.xdgopen xdvik-22.84.13/texk/xdvik/browser.c
---- xdvik-22.84.13/texk/xdvik/browser.c.xdgopen	2007-07-14 09:47:43.000000000 +0200
-+++ xdvik-22.84.13/texk/xdvik/browser.c	2008-01-13 16:18:38.000000000 +0100
-@@ -39,7 +39,8 @@
- #include "statusline.h"
- 
- static const char *const default_browser_cmd =
--"htmlview %s"
-+"xdg-open %s"
-+":htmlview %s"
- ":firefox -remote \"openURL(%s,new-window)\""
- ":mozilla -remote \"openURL(%s,new-window)\""
- ":netscape -remote \"openURL(%s,new-window)\""
-diff -up xdvik-22.84.13/texk/xdvik/gui/xm_prefsP.h.xdgopen xdvik-22.84.13/texk/xdvik/gui/xm_prefsP.h
---- xdvik-22.84.13/texk/xdvik/gui/xm_prefsP.h.xdgopen	2007-07-14 01:13:27.000000000 +0200
-+++ xdvik-22.84.13/texk/xdvik/gui/xm_prefsP.h	2008-01-13 16:17:21.000000000 +0100
-@@ -96,6 +96,7 @@
- #define Xdvi_APPLY_STR				"Apply"
- 
- #define Xdvi_PREFS_BROWSER_DEFAULTS \
-+	"xdg-open %s\n" \
- 	"htmlview %s\n" \
- 	"firefox -remote \"openURL(%s,new-window)\"\n" \
- 	"mozilla -remote \"openURL(%s,new-window)\"\n" \

xdvik-22.84.14-pxdvi.patch

@@ -1,7 +1,11 @@
-diff -ru --exclude='*.orig' texk-orig/configure.in texk/configure.in
---- texk-orig/configure.in	2004-03-14 02:06:10.000000000 +0000
-+++ texk/configure.in	2008-01-05 23:50:53.000000000 +0000
-@@ -51,7 +51,7 @@
+diff -up xdvik-22.84.14/texk/configure.in.pxdvi xdvik-22.84.14/texk/configure.in
+diff -up xdvik-22.84.14/texk/configure.in.pxdvi xdvik-22.84.14/texk/configure.in
+diff -up xdvik-22.84.14/texk/configure.in.pxdvi xdvik-22.84.14/texk/configure.in
+diff -up xdvik-22.84.14/texk/configure.in.pxdvi xdvik-22.84.14/texk/configure.in
+diff -up xdvik-22.84.14/texk/configure.in.pxdvi xdvik-22.84.14/texk/configure.in
+--- xdvik-22.84.14/texk/configure.in.pxdvi	2008-05-03 20:45:04.000000000 +0100
++++ xdvik-22.84.14/texk/configure.in	2008-10-12 01:55:37.000000000 +0100
+@@ -52,7 +52,7 @@ fi
  PKGS='
    bibtex8 cjkutils detex devnag dtl dvi2tty dvidvi dviljk dvipdfm dvipsk gsftopk 
    lacheck makeindexk musixflx odvipsk ps2pkm seetexk tetex tex4htk
@@ -10,11 +14,22 @@ diff -ru --exclude='*.orig' texk-orig/configure.in texk/configure.in
  '
  
  ESUBDIRS=
-Only in texk: .emacs.desktop
-diff -ru --exclude='*.orig' texk-orig/pxdvik/Makefile.in texk/pxdvik/Makefile.in
---- texk-orig/pxdvik/Makefile.in	2008-01-05 23:49:04.000000000 +0000
-+++ texk/pxdvik/Makefile.in	2008-01-05 23:49:04.000000000 +0000
-@@ -11,6 +11,9 @@
+diff -up xdvik-22.84.14/texk/pxdvik/main.c.pxdvi xdvik-22.84.14/texk/pxdvik/main.c
+--- xdvik-22.84.14/texk/pxdvik/main.c.pxdvi	2008-10-12 01:55:37.000000000 +0100
++++ xdvik-22.84.14/texk/pxdvik/main.c	2008-10-12 01:55:37.000000000 +0100
+@@ -1177,7 +1177,7 @@ main(int argc, char **argv)
+ 
+     kpse_init_prog("XDVI", resource.pixels_per_inch, resource.mfmode, resource.alt_font);
+     
+-    kpse_set_program_name(argv[0], "xdvi");
++    kpse_set_program_name(argv[0], "pxdvi");
+ 
+     
+     if (globals.debug & DBG_EXPAND) {
+diff -up xdvik-22.84.14/texk/pxdvik/Makefile.in.pxdvi xdvik-22.84.14/texk/pxdvik/Makefile.in
+--- xdvik-22.84.14/texk/pxdvik/Makefile.in.pxdvi	2008-10-12 01:55:37.000000000 +0100
++++ xdvik-22.84.14/texk/pxdvik/Makefile.in	2008-10-12 01:57:46.000000000 +0100
+@@ -10,6 +10,9 @@ ac_include ../make/cross.mk
  
  all_subdirs = gui tests
  
@@ -24,23 +39,13 @@ diff -ru --exclude='*.orig' texk-orig/pxdvik/Makefile.in texk/pxdvik/Makefile.in
  CPP = @CPP@
  
  # Make `#include <X11/...>' and `-lX...' work.
-@@ -156,8 +159,8 @@
- 	rm -f $(scriptdir)/o@wrapper_script@
- 	ln -s @wrapper_script@ $(scriptdir)/o@wrapper_script@
- ### fix wrong CVS permissions for shell script
--	$(INSTALL_SCRIPT) $(srcdir)/xdvizilla $(scriptdir)/xdvizilla
--	chmod +x $(scriptdir)/xdvizilla
-+	$(INSTALL_SCRIPT) $(srcdir)/xdvizilla $(scriptdir)/pxdvizilla
-+	chmod +x $(scriptdir)/pxdvizilla
- 
- uninstall-exec:
- 	for p in @final_exec_name@; do rm -f $(bindir)/$$p; done
-@@ -165,42 +168,42 @@
+@@ -178,40 +181,41 @@ uninstall-exec:
  
  install-data: $(manpage).1 pixmaps/toolbar.xpm pixmaps/toolbar2.xpm
  	$(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) 
 -	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/xdvi/pixmaps
 +	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/pxdvi/pixmaps
++	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/fonts/map/pxdvi
  	$(INSTALL_DATA) $(manpage).1 $(man1dir)/$(manpage).$(manext)
  	rm -f $(man1dir)/o$(manpage).$(manext)
  	ln -s $(manpage).$(manext) $(man1dir)/o$(manpage).$(manext)
@@ -59,19 +64,16 @@ diff -ru --exclude='*.orig' texk-orig/pxdvik/Makefile.in texk/pxdvik/Makefile.in
  	else \
  	    true; \
  	fi
- 	$(INSTALL_DATA) $(srcdir)/xdvizilla.1 $(man1dir)/xdvizilla.$(manext)
--	$(INSTALL_DATA) $(srcdir)/vfontmap.sample $(texmf)/xdvi/
-+	$(INSTALL_DATA) $(srcdir)/vfontmap.sample $(texmf)/pxdvi/
- 	if test ! -f $(VFONTMAP); then \
- 	  $(INSTALL_DATA) $(srcdir)/vfontmap.sample $(VFONTMAP); \
+-	$(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(texmf)/xdvi/
++	$(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(texmf)/fonts/map/pxdvi/xdvi-ptex.map
+ 	if test ! -f $(PTEXMAP); then \
+ 	  $(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(PTEXMAP); \
  	fi
  
  uninstall-data:
- 	rm -f $(man1dir)/$(manpage).$(manext) $(man1dir)/xdvizilla.$(manext) \
--		$(scriptdir)/xdvizilla \
+ 	rm -f $(man1dir)/$(manpage).$(manext) \
 -		$(texmf)/xdvi/pixmaps/toolbar.xpm $(texmf)/xdvi/pixmaps/toolbar2.xpm \
 -		$(texmf)/xdvi/XDvi
-+		$(scriptdir)/pxdvizilla \
 +		$(texmf)/pxdvi/pixmaps/toolbar.xpm $(texmf)/pxdvi/pixmaps/toolbar2.xpm \
 +		$(texmf)/pxdvi/XDvi
  	if \
@@ -93,10 +95,10 @@ diff -ru --exclude='*.orig' texk-orig/pxdvik/Makefile.in texk/pxdvik/Makefile.in
  program_files = *.1.in *.ac xdvi.icon xdvi.FAQ psheader.txt mksedscript \
    MOTIF
  version_files = xdvi.c
-diff -ru --exclude='*.orig' texk-orig/pxdvik/texmf/XDvi texk/pxdvik/texmf/XDvi
---- texk-orig/pxdvik/texmf/XDvi	2008-01-05 23:49:04.000000000 +0000
-+++ texk/pxdvik/texmf/XDvi	2008-01-05 23:49:04.000000000 +0000
-@@ -137,7 +137,7 @@
+diff -up xdvik-22.84.14/texk/pxdvik/texmf/XDvi.pxdvi xdvik-22.84.14/texk/pxdvik/texmf/XDvi
+--- xdvik-22.84.14/texk/pxdvik/texmf/XDvi.pxdvi	2008-10-12 01:55:37.000000000 +0100
++++ xdvik-22.84.14/texk/pxdvik/texmf/XDvi	2008-10-12 01:55:37.000000000 +0100
+@@ -137,7 +137,7 @@ Ctrl<Btn5Down>:set-shrink-factor(-)\n\
  !!!------------------------------------------------------------------------------
  !!! note: when i18n'ed, *font and *fontSet should have same size of font
  *international: true
@@ -105,37 +107,10 @@ diff -ru --exclude='*.orig' texk-orig/pxdvik/texmf/XDvi texk/pxdvik/texmf/XDvi
  *preeditType: OverTheSpot,OffTheSpot,Root
  !!! note: xdviSelFile can not be i18n'ed (bug?)
  xdviSelFile*international: false
-diff -ru --exclude='*.orig' texk-orig/pxdvik/withenable.ac texk/pxdvik/withenable.ac
---- texk-orig/pxdvik/withenable.ac	2008-01-05 23:49:04.000000000 +0000
-+++ texk/pxdvik/withenable.ac	2008-01-05 23:49:04.000000000 +0000
-@@ -106,9 +106,9 @@
- fi],
- AC_DEFINE(A4))
- 
--VFONTMAP='$(texmf)/xdvi/vfontmap'
-+VFONTMAP='$(texmf)/pxdvi/vfontmap'
- AC_ARG_WITH(vfontmap,
--[  --with-vfontmap=FILE    Use FILE as default vfontmap (default ${texmf}/xdvi/vfontmap)],
-+[  --with-vfontmap=FILE    Use FILE as default vfontmap (default ${texmf}/pxdvi/vfontmap)],
- [VFONTMAP="$withval"])
- AC_SUBST(VFONTMAP)
- 
-diff -ru --exclude='*.orig' texk-orig/pxdvik/xdvi-config.h texk/pxdvik/xdvi-config.h
---- texk-orig/pxdvik/xdvi-config.h	2008-01-05 23:49:04.000000000 +0000
-+++ texk/pxdvik/xdvi-config.h	2008-01-05 23:49:04.000000000 +0000
-@@ -35,7 +35,7 @@
- #define DEFAULT_FONTCONF ""
- #define USE_VFONTMAP
- #ifndef DEFAULT_FONTMAP
--#define DEFAULT_FONTMAP "/usr/local/share/texmf/xdvi/vfontmap"
-+#define DEFAULT_FONTMAP "/usr/share/texmf/pxdvi/vfontmap"
- #endif /* DEFAULT_FONTMAP */
- #endif /* KANJI */
- 
-diff -ru --exclude='*.orig' texk-orig/pxdvik/xdvi-sh.in texk/pxdvik/xdvi-sh.in
---- texk-orig/pxdvik/xdvi-sh.in	2007-10-18 17:28:55.000000000 +0100
-+++ texk/pxdvik/xdvi-sh.in	2008-01-05 23:49:04.000000000 +0000
-@@ -35,7 +35,7 @@
+diff -up xdvik-22.84.14/texk/pxdvik/xdvi-sh.in.pxdvi xdvik-22.84.14/texk/pxdvik/xdvi-sh.in
+--- xdvik-22.84.14/texk/pxdvik/xdvi-sh.in.pxdvi	2007-10-18 17:28:55.000000000 +0100
++++ xdvik-22.84.14/texk/pxdvik/xdvi-sh.in	2008-10-12 01:55:37.000000000 +0100
+@@ -35,7 +35,7 @@ case "$#:$1" in
      NAMEOPT="-name $BASE_NAME";;
  esac
  

xdvik-22.84.14-zerofix.patch

@@ -0,0 +1,10 @@
+diff -up xdvik-22.84.14/texk/xdvik/texmf/XDvi.zerofix xdvik-22.84.14/texk/xdvik/texmf/XDvi
+--- xdvik-22.84.14/texk/xdvik/texmf/XDvi.zerofix	2008-11-12 00:09:46.000000000 +0000
++++ xdvik-22.84.14/texk/xdvik/texmf/XDvi	2008-11-12 00:10:02.000000000 +0000
+@@ -368,3 +368,6 @@ Ctrl<Btn5Down>:set-shrink-factor(-)\n\
+ !!!-------------- used for internal checking - DO NOT CHANGE THIS! --------------
+ !!!------------------------------------------------------------------------------
+ *appDefaultsFileVersion: 20030303
++
++*mainTranslations: #override\n\
++	<Key>0: digit(0)

xdvik.spec

@@ -1,14 +1,13 @@
 %bcond_without japanese
 %define desktop_file_utils_version 0.9
 
-# _texmf_main is currently badly defined, so hard code it for now
-#%{!?_texmf_main: %define _texmf_main %{_datadir}/texmf}
-%define _texmf_main %{_datadir}/texmf
+# Set _texmf_main - this is defined in the texlive-texmf package 
+%{!?_texmf_main: %define _texmf_main %{_datadir}/texmf}
 
 Summary:        An X viewer for DVI files
 Name:           xdvik
-Version:        22.84.13
-Release:        17%{?dist}
+Version:        22.84.14
+Release:        4%{?dist}
 Url:            http://xdvi.sourceforge.net/
 # encodings.c is GPLv2+ and LGPL and MIT
 # read-mapfile.c tfmload.c are from dvips
@@ -39,29 +38,28 @@ Source0:        http://kent.dl.sourceforge.net/sourceforge/xdvi/%{name}-%{versio
 # Source30 is http://xdvi.sourceforge.net/xdvi48x48.gif converted to png
 Source30:       xdvi48x48.png
 %if %{with japanese}
-Source100:      vfontmap
+Source100:      xdvi-ptex.map
 %endif
 
-Patch1:         texlive-2007-xprint.patch
-Patch2:         xdvik-22.84.13-keepflag-scrollfix.patch
-Patch3:         texlive-xdvi-maxchar.patch
-Patch4:         texlive-source-xdvi-numlock.patch
-Patch5:         xdvik-22.84.13-xdgopen.patch
-Patch6:         xdvik-22.84.13-tempfix.patch
-Patch7:		xdvik-22.84.13-manpage.patch
-Patch8:		xdvik-22.84.13-bad_bar.patch
+# Fix handling of the 0 key. See:
+# http://sourceforge.net/tracker/index.php?func=detail&aid=2067614&group_id=23164&atid=377580
+# https://bugzilla.redhat.com/show_bug.cgi?id=470942
+# Fixed upstream post 22.84.14 ?
+Patch0:		xdvik-22.84.14-zerofix.patch
 
 %if %{with japanese}
 # Japanese patch for xdvi from http://sourceforge.jp/projects/xdvi/
-Patch1000:      xdvik-22.84.13-j1.36.patch.gz
-Patch1001:      pxdvik-22.84.13.patch
-Patch1002:      pxdvik-22.84.13-use-system-libs.patch
+Patch1000:      xdvik-22.84.14-j1.40.patch.gz
+
+# Patch to allow building of both xdvik and pxdvik.
+# Local to Fedora, not appropriate to push upstream.
+Patch1001:      xdvik-22.84.14-pxdvi.patch
+
 %endif
 
-# These patches would conflict with Patch1000 and friends and so must be applied after the
-# xdvik directory has been copied to pxdvik
-Patch2000:      xdvik-22.84.13-use-system-libs.patch
-Patch2001:      xdvik-22.84.13-uint32_t-fix.patch
+# These patches would conflict with Patch1000 and friends and so must be applied
+# after the xdvik directory has been copied to pxdvik
+# Currently no patches of this type
 
 %description
 Xdvik, the kpathsea version of xdvi, is a previewer for DVI files
@@ -76,27 +74,15 @@ formatting package which provides an easier-to-use interface for TeX).
 %prep
 %setup -q
 
-%patch1 -p1
-
-# Fix for navigation with a spacebar does not keep position
-# BZ #417461, 168124.
-%patch2 -p1
-
-%patch3 -p1
-%patch4 -p0
-%patch5 -p1 -b .xdgopen
-%patch6 -p1 -b .tempfix
-%patch7 -p0
-
-# Fix for a double Ctrl-L segfault (BZ #429429)
-%patch8 -p1
+# Fix handling of zero key
+%patch0 -p1 -b .zerofix
 
 # Allow Xaw3d enabled build of xdvi
 sed -i 's|/Xaw/|/Xaw3d/|' texk/xdvik/gui/*.[ch] texk/xdvik/*.[ch]
 
 %if %{with japanese}
 # set up Japanese xdvi in its own directory
-cp -ar texk/xdvik texk/xdvik-orig
+cp -a texk/xdvik texk/xdvik-orig
 
 # This is the Japanese xdvi patch
 %patch1000 -p1
@@ -104,25 +90,14 @@ mv texk/xdvik texk/pxdvik
 mv texk/xdvik-orig texk/xdvik
 
 # Build both the normal and the Japanese xdvi at the same time
-%patch1001 -p0
-
-# Build pxdvik against system libs
-%patch1002 -p0
+%patch1001 -p1 -b .pxdvi
 
 # XXX Is this really necessary?
-mv texk/pxdvik/vfontmap.sample texk/pxdvik/vfontmap.sample.orig
-install -p -m 644 %{SOURCE100} texk/pxdvik/vfontmap.sample
+mv texk/pxdvik/xdvi-ptex.sample texk/pxdvik/xdvi-ptex.sample.orig
+install -p -m 644 %{SOURCE100} texk/pxdvik/xdvi-ptex.sample
 
 %endif
 
-# Build xdvik against system libs
-%patch2000 -p1 -b .use-system-libs
-
-%if !%{with_japanese}
-# Fix unin32_t problem for xdvik (Patch1000 also contains this hunk)
-%patch2001 -p1
-%endif
-
 # Re-run autoconf against patched Makefile.ins
 ( cd texk/xdvik ; autoconf-2.13 -m $RPM_BUILD_DIR/%{name}-%{version}/texk/etc/autoconf )
 %if %{with japanese}
@@ -133,10 +108,11 @@ install -p -m 644 %{SOURCE100} texk/pxdvik/vfontmap.sample
 %build
 # Here we go to great pains to avoid the automatic dependency generation from pulling in the 
 # bundled kpathsea stuff
-%configure --with-system-t1lib --with-xdvi-x-toolkit=xaw3d
+%configure --with-system-t1lib --with-system-kpathsea --with-xdvi-x-toolkit=xaw3d 
 
 mv texk/kpathsea texk/kpathsea-keep
 
+# Enable maintainer mode (see README_maintainer in tarball)
 cp -p texk/make/rdepend.mk texk/make/rdepend.mk.maint
 sed -i -e 's/@MAINT@//' texk/make/rdepend.mk
 
@@ -153,7 +129,7 @@ make -C texk/xdvik/ depend
 
 mv texk/kpathsea-keep texk/kpathsea
 
-%configure --with-system-t1lib --with-xdvi-x-toolkit=xaw3d
+%configure --with-system-t1lib --with-system-kpathsea --with-xdvi-x-toolkit=xaw3d
 
 %if %{with japanese}
 # configure pxdvi with more options
@@ -177,6 +153,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{with japanese}
 install_dirs='INSTDIRS=texk/xdvik texk/pxdvik'
+%else
+install_dirs='INSTDIRS=texk/xdvik'
 %endif
 
 # make install DESTDIR=$RPM_BUILD_ROOT doesn't work here
@@ -222,7 +200,7 @@ for i in CHANGES.xdvik-jp README.xdvik-jp READMEs/* ; do
   touch -r ${i} ../../pxdvik/${i}
 done
 popd
-install -p -m 644 texk/pxdvik/vfontmap.sample.orig pxdvik/vfontmap.sample
+install -p -m 644 texk/pxdvik/xdvi-ptex.sample.orig pxdvik/xdvi-ptex.sample
 %endif
 
 %post
@@ -249,12 +227,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc README README.t1mapper README.t1fonts CHANGES 
 %{_bindir}/oxdvi
 %{_bindir}/xdvi
-%{_bindir}/xdvizilla
 %{_bindir}/xdvi-xaw3d
 %{_texmf_main}/xdvi/
 %{_mandir}/man1/oxdvi.1*
 %{_mandir}/man1/xdvi.1*
-%{_mandir}/man1/xdvizilla.1*
 %{_datadir}/pixmaps/xdvi48x48.png
 %{_datadir}/icons/hicolor/48x48/apps/xdvi.png
 %{_datadir}/applications/fedora-xdvi.desktop
@@ -263,12 +239,49 @@ rm -rf $RPM_BUILD_ROOT
 %doc pxdvik/
 %{_bindir}/opxdvi
 %{_bindir}/pxdvi
-%{_bindir}/pxdvizilla
 %{_bindir}/pxdvi-xaw3d
 %{_texmf_main}/pxdvi/
+%{_texmf_main}/fonts/map/pxdvi/
 %endif
 
 %changelog
+* Wed Nov 12 2008 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 22.84.14-4
+- Add patch to fix zero key handling (BZ 470942)
+- Remove texlive-2007-xprint.patch which actually hasn't been applied during
+  22.84.14 packaging
+
+* Sun Oct 12 2008 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 22.84.14-3
+- Fix package build breakage
+
+* Sun Oct 12 2008 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 22.84.14-2
+- Fix previous spec file changelog entry
+- Fix Japanese font handling (BZ 465391) by reworking pxdvi patch
+
+* Fri Jul 18 2008 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 22.84.14-1
+- Update to version 22.84.14
+- Update Japanese patch to 22.84.14-j1.40
+- Rework patch allowing both normal and Japanese versions to be built
+- Remove no longer needed patches that have been merged upstream:
+- Various spec file fixups
+
+* Sat May 10  2008 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 22.84.13-20
+- Update Japanese patch to xdvik-22.84.13-j1.40.patch.gz
+- Rework patch to allow simultaneous building of xdvik and pxdvik - now called
+  xdvik-22.84.13-pxdvi.patch
+- Rename vfontmap to xdvi-ptex.map
+- Rework patch to build pxdvik against system installed libraries - now called
+  xdvik-22.84.13-pxdvi-use-system-libs.patch 
+
+* Sun Apr 28  2008 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 22.84.13-19
+- Add more commentary about upstream status of patches
+- No longer apply the texlive-xdvi-maxchar.patch patch
+
+* Sun Apr 28  2008 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 22.84.13-18
+- Remove extraneous -r from cp command
+- Add commentary about upstream status of patches
+- Re-enable _texmf_main macro
+- Add patch to fix window ID detection - BZ 442445
+
 * Sun Feb  3  2008 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 22.84.13-17
 - Fix spec file typo