Tue Jan 15 10:13:04 UTC 2008

Author: jgu

Update of /cvs/extras/rpms/xdvik/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11254/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pxdvik-22.84.13-use-system-libs.patch pxdvik-22.84.13.patch 
	texlive-2007-xdvi-keepflag.patch texlive-2007-xprint.patch 
	texlive-source-xdvi-numlock.patch texlive-xdvi-maxchar.patch 
	vfontmap xdvi48x48.png xdvik-22.84.13-uint32_t-fix.patch 
	xdvik-22.84.13-use-system-libs.patch 
	xdvik-22.84.13-xdgopen.patch xdvik.spec 
Log Message:
Initial CVS import of package. Review BZ #427667.


pxdvik-22.84.13-use-system-libs.patch:

--- NEW FILE pxdvik-22.84.13-use-system-libs.patch ---
diff -ru xdvik-22.84.13-orig/texk/pxdvik/Makefile.in xdvik-22.84.13/texk/pxdvik/Makefile.in
--- xdvik-22.84.13-orig/texk/pxdvik/Makefile.in	2008-01-12 12:37:10.000000000 -0500
+++ xdvik-22.84.13/texk/pxdvik/Makefile.in	2008-01-12 18:35:39.000000000 -0500
@@ -59,7 +59,7 @@
 vflib_def = -DDEFAULT_FONTMAP=\"$(VFONTMAP)\"
 freetype_cflags = @FT2_CFLAGS@
 prog_cflags = @XTRA_WARN_CFLAGS@ $(LIBT1CPPFLAGS) $(ps_def) $(freetype_cflags) \
--I$(srcdir)/gui -I../../libs/t1lib/lib/t1lib -I../kpathsea $(x_cppflags) $(vflib_def)
+-I$(srcdir)/gui $(x_cppflags) $(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')
@@ -131,7 +131,7 @@
 test_verbose:
 	cd tests; $(MAKE) $(makeargs) test_verbose
 
- at final_exec_name@: $(kpathsea) $(objects) $(LIBT1DEP) $(LIBGUIDEP)
+ at final_exec_name@: $(objects) $(LIBT1DEP) $(LIBGUIDEP)
 	$(kpathsea_link) $(objects) $(LIBGUI) $(x_link) $(LOADLIBES)
 
 squeeze.o: squeeze.c


pxdvik-22.84.13.patch:

--- NEW FILE pxdvik-22.84.13.patch ---
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 @@
 PKGS='
   bibtex8 cjkutils detex devnag dtl dvi2tty dvidvi dviljk dvipdfm dvipsk gsftopk 
   lacheck makeindexk musixflx odvipsk ps2pkm seetexk tetex tex4htk
-  texlive ttf2pk tth xdvik
+  texlive ttf2pk tth xdvik pxdvik
 '
 
 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 @@
 
 all_subdirs = gui tests
 
+dvipsdir = $(texmf)/pdvips
+psheaderdir = $(dvipsdir)
+
 CPP = @CPP@
 
 # Make `#include <X11/...>' and `-lX...' work.
@@ -156,8 +159,8 @@
 	rm -f $(scriptdir)/o at wrapper_script@
 	ln -s @wrapper_script@ $(scriptdir)/o at 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 @@
 
 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
 	$(INSTALL_DATA) $(manpage).1 $(man1dir)/$(manpage).$(manext)
 	rm -f $(man1dir)/o$(manpage).$(manext)
 	ln -s $(manpage).$(manext) $(man1dir)/o$(manpage).$(manext)
-	$(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/xdvi/XDvi
-	$(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/xdvi/pixmaps
+	$(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/pxdvi/XDvi
+	$(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/pxdvi/pixmaps
 	if \
-	    grep 'original xdvi.cfg --' $(texmf)/xdvi/xdvi.cfg >/dev/null 2>&1 \
-	    || test ! -r $(texmf)/xdvi/xdvi.cfg; \
+	    grep 'original xdvi.cfg --' $(texmf)/pxdvi/xdvi.cfg >/dev/null 2>&1 \
+	    || test ! -r $(texmf)/pxdvi/xdvi.cfg; \
 	then \
-	    $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg $(texmf)/xdvi/xdvi.cfg; \
+	    $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg $(texmf)/pxdvi/xdvi.cfg; \
 	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); \
 	fi
 
 uninstall-data:
 	rm -f $(man1dir)/$(manpage).$(manext) $(man1dir)/xdvizilla.$(manext) \
-		$(scriptdir)/xdvizilla \
-		$(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 \
-	    head -n 1 $(texmf)/xdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \
-	    || test ! -r $(texmf)/xdvi/xdvi.cfg; \
+	    head -n 1 $(texmf)/pxdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \
+	    || test ! -r $(texmf)/pxdvi/xdvi.cfg; \
 	then \
-	    rm -f $(texmf)/xdvi/xdvi.cfg; \
+	    rm -f $(texmf)/pxdvi/xdvi.cfg; \
 		else \
 	    true; \
 	fi
-	rmdir $(texmf)/xdvi/pixmaps
+	rmdir $(texmf)/pxdvi/pixmaps
 
-distname = xdvik
+distname = pxdvik
 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 @@
 !!!------------------------------------------------------------------------------
 !!! note: when i18n'ed, *font and *fontSet should have same size of font
 *international: true
-*inputMethod: kinput2
+*inputMethod: SCIM
 *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 @@
     NAMEOPT="-name $BASE_NAME";;
 esac
 
-xdviappfile=`kpsewhich -progname=xdvi --format='other text files' XDvi`
+xdviappfile=`kpsewhich -progname=pxdvi --format='other text files' XDvi`
 if test -n "$xdviappfile"; then
   xdviappdir=`dirname "$xdviappfile"`
   xdviapppath="${xdviappdir}/%l_%t/%N:${xdviappdir}/%N"

texlive-2007-xdvi-keepflag.patch:

--- NEW FILE texlive-2007-xdvi-keepflag.patch ---
--- tetex-src-3.0/texk/xdvik/events.c.xdvi-keepflag	2004-11-29 17:45:11.000000000 -0700
+++ tetex-src-3.0/texk/xdvik/events.c	2005-11-02 17:02:19.000000000 -0700
@@ -696,10 +696,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)
@@ -745,10 +747,12 @@ 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));
     }

texlive-2007-xprint.patch:

--- NEW FILE texlive-2007-xprint.patch ---
--- 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:

--- NEW FILE texlive-source-xdvi-numlock.patch ---
--- 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:

--- NEW FILE texlive-xdvi-maxchar.patch ---
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;


--- NEW FILE vfontmap ---
%
% Sample "vfontmap"
%

% [single style]
% "tfm" "enc" "font"

% [multi style]
% "/font/file/name"
%    "tfm1" "enc"
%    "tfm2" "enc"

% "enc" is one of following.
% "JIS-H" "Unicode-H" "Identity-H"
% "JIS-V" "Unicode-V" "Identity-V"

rml		JIS-H		/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
rmlv		JIS-V		/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
gbm		JIS-H		/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
gbmv		JIS-V		/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
fmin		JIS-H		/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
fgoth		JIS-H		/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
maru		JIS-H		/usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf


% UTF package
unijmin-h	Unicode-H	/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf	% \UTF font
unijmin-v	Unicode-V	/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf	% \UTF font
cidmin-h	Identity-H	/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf	% \CID font
cidmin-v	Identity-V	/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf	% \CID font
hmr		JIS-H		/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
hmrv		JIS-V		/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf

unijgoth-h	Unicode-H	/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf	% \UTF font
unijgoth-v	Unicode-V	/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf	% \UTF font
cidgoth-h	Identity-H	/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf	% \CID font
cidgoth-v	Identity-V	/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf	% \CID font
hkb		JIS-H		/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
hkbv		JIS-V		/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf


% OTF package
otf-ujmr-h	Unicode-H	/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
otf-ujmr-v	Unicode-V	/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
otf-cjmr-h	Identity-H	/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
otf-cjmr-v	Identity-V	/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
hminr-h		JIS-H		/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
hminr-v		JIS-V		/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf

otf-ujgr-h	Unicode-H	/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
otf-ujgr-v	Unicode-V	/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
otf-cjgr-h	Identity-H	/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
otf-cjgr-v	Identity-V	/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
hgothr-h	JIS-H		/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
hgothr-v	JIS-V		/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf

otf-ujmb-h	Unicode-H	/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
otf-ujmb-v	Unicode-V	/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
otf-cjmb-h	Identity-H	/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
otf-cjmb-v	Identity-V	/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
hminb-h		JIS-H		/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
hminb-v		JIS-V		/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf

otf-ujgb-h	Unicode-H	/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
otf-ujgb-v	Unicode-V	/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
otf-cjgb-h	Identity-H	/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
otf-cjgb-v	Identity-V	/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
hgothb-h	JIS-H		/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
hgothb-v	JIS-V		/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf

otf-ujmgr-h	Unicode-H	/usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf
otf-ujmgr-v	Unicode-V	/usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf
otf-cjmgr-h	Identity-H	/usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf
otf-cjmgr-v	Identity-V	/usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf
hmgothr-h	JIS-H		/usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf
hmgothr-v	JIS-V		/usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf

otf-utmr-h	Unicode-H	/usr/share/fonts/cjkunifonts-uming/uming.ttf
otf-utmr-v	Unicode-V	/usr/share/fonts/cjkunifonts-uming/uming.ttf

otf-utgr-h	Unicode-H	/usr/share/fonts/cjkunifonts-ukai/ukai.ttf
otf-utgr-v	Unicode-V	/usr/share/fonts/cjkunifonts-ukai/ukai.ttf

otf-ucmr-h	Unicode-H	/usr/share/fonts/cjkunifonts-uming/uming.ttf
otf-ucmr-v	Unicode-V	/usr/share/fonts/cjkunifonts-uming/uming.ttf

otf-ucgr-h	Unicode-H	/usr/share/fonts/cjkunifonts-ukai/ukai.ttf
otf-ucgr-v	Unicode-V	/usr/share/fonts/cjkunifonts-ukai/ukai.ttf

otf-ukmr-h	Unicode-H	/usr/share/fonts/baekmuk-ttf-batang/batang.ttf
otf-ukmr-v	Unicode-V	/usr/share/fonts/baekmuk-ttf-batang/batang.ttf

otf-ukgr-h	Unicode-H	/usr/share/fonts/baekmuk-ttf-dotum/dotum.ttf
otf-ukgr-v	Unicode-V	/usr/share/fonts/baekmuk-ttf-dotum/dotum.ttf

xdvik-22.84.13-uint32_t-fix.patch:

--- NEW FILE xdvik-22.84.13-uint32_t-fix.patch ---
--- texk/xdvik/c-auto.in.orig	2008-01-05 21:32:24.000000000 +0000
+++ texk/xdvik/c-auto.in	2008-01-05 21:32:58.000000000 +0000
@@ -316,7 +316,11 @@
 #undef vfork
 
 /* Define to `unsigned long' if <sys/types.h> does not define. */
+#ifndef HAVE_STDINT_H
+#ifndef HAVE_INTTYPES_H
 #undef uint32_t
+#endif
+#endif
 
 /* Define if the vsnprintf function works.  */
 #undef HAVE_GOOD_VSNPRINTF

xdvik-22.84.13-use-system-libs.patch:

--- NEW FILE xdvik-22.84.13-use-system-libs.patch ---
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 at ifeq ($(CC), gcc)
 @MAINT at 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
 
- at final_exec_name@: $(kpathsea) $(objects) $(LIBT1DEP) $(LIBGUIDEP)
+ at final_exec_name@: $(objects) $(LIBT1DEP) $(LIBGUIDEP)
 	$(kpathsea_link) $(objects) $(LIBGUI) $(x_link) $(LOADLIBES)
 
 squeeze.o: squeeze.c

xdvik-22.84.13-xdgopen.patch:

--- NEW FILE xdvik-22.84.13-xdgopen.patch ---
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" \


--- NEW FILE xdvik.spec ---
%bcond_without japanese
%define desktop_file_utils_version 0.9
%{!?_texmf_main: %define _texmf_main %{_datadir}/texmf}

Summary:        An X viewer for DVI files
Name:           xdvik
Version:        22.84.13
Release:        4%{?dist}
Url:            http://xdvi.sourceforge.net/
# encodings.c is GPLv2+ and LGPL and MIT
# read-mapfile.c tfmload.c are from dvips
# remaining is MIT
License:        GPLv2+
Group:          Applications/Publishing
Obsoletes:      tetex-xdvi < 3.0-99
Provides:       tetex-xdvi = 3.0-99
Provides:       xdvi = %{version}-%{release}
Obsoletes:     xdvi = 22.84.12
Requires:       texlive-dvips texlive-texmf
Requires(post): desktop-file-utils >= %{desktop_file_utils_version}

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  t1lib-devel >= 5.0.2
BuildRequires:  Xaw3d-devel
BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
BuildRequires:  autoconf213
BuildRequires:  libtool
BuildRequires:  kpathsea-devel
%if %{with japanese}
BuildRequires:  freetype-devel >= 2.1.10
%endif

Source0:        http://kent.dl.sourceforge.net/sourceforge/xdvi/%{name}-%{version}.tar.gz
# Source30 is http://xdvi.sourceforge.net/xdvi48x48.gif converted to png
Source30:       xdvi48x48.png
%if %{with japanese}
Source100:      vfontmap
%endif

Patch1:         texlive-2007-xprint.patch
Patch2:         texlive-2007-xdvi-keepflag.patch
Patch3:         texlive-xdvi-maxchar.patch
Patch4:         texlive-source-xdvi-numlock.patch
Patch5:         xdvik-22.84.13-xdgopen.patch

%if %{with japanese}
# Japanese patch for xdvi from http://sourceforge.jp/projects/xdvi/
Patch1000:      http://globalbase.dl.sourceforge.jp/xdvi/28452/%{name}-%{version}-j1.34.patch.gz
Patch1001:      pxdvik-22.84.13.patch
Patch1002:      pxdvik-22.84.13-use-system-libs.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

%description
Xdvik, the kpathsea version of xdvi, is a previewer for DVI files
produced e.g. by the TeX or troff typesetting systems.

If you are installing texlive and you use PlainTeX or you are using DVI files,
you will also need to install xdvi which allows you to view DVI files.
Consider installing texlive-dvips (for converting .dvi files to PostScript
format for printing on PostScript printers), and texlive-latex (a higher level
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 (RH bug #168124)
%patch2 -p1

%patch3 -p1
%patch4 -p0
%patch5 -p1 -b .xdgopen

# 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 -a texk/xdvik texk/pxdvik

pushd texk/pxdvik
# This is the Japanese xdvi patch
%patch1000 -p3
popd

# Build both the normal and the Japanese xdvi at the same time
%patch1001 -p0

# Build pxdvik against system libs
%patch1002 -p1

# XXX Is this really necessary?
mv texk/pxdvik/vfontmap.sample texk/pxdvik/vfontmap.sample.orig
install -p -m 644 %{SOURCE100} texk/pxdvik/vfontmap.sample

%endif

# Build xdvik against system libs
%patch2000 -p1 -b .use-system-libs

# Fix unin32_t problem for xdvik (pxdvik is already fixed by Patch1000)
%patch2001 -p0

# 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}
( cd texk/pxdvik ; autoconf-2.13 -m $RPM_BUILD_DIR/%{name}-%{version}/texk/etc/autoconf )
%endif
( cd texk ; autoconf-2.13 -m $RPM_BUILD_DIR/%{name}-%{version}/texk/etc/autoconf )

%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

mv texk/kpathsea texk/kpathsea-keep

cp -p texk/make/rdepend.mk texk/make/rdepend.mk.maint
sed -i -e 's/@MAINT@//' texk/make/rdepend.mk

%if %{with japanese}
# configure pxdvi with more options
pushd texk/pxdvik
sh `grep "# ./con" config.status |sed -e s/^#\ //` --program-prefix=p --with-default-dvips-path=pdvips
popd

make -C texk/pxdvik/ depend
%endif

make -C texk/xdvik/ depend

mv texk/kpathsea-keep texk/kpathsea

%configure --with-system-t1lib --with-xdvi-x-toolkit=xaw3d

%if %{with japanese}
# configure pxdvi with more options
pushd texk/pxdvik
sh `grep "# ./con" config.status |sed -e s/^#\ //` --program-prefix=p --with-default-dvips-path=pdvips
popd
%endif

rm -rf libs texk/contrib/ texk/kpathsea

make %{?_smp_mflags}

# Doc files (the full list of changes is in the texk/xdvik/CHANGES file)
iconv -f ISO-8859-1 -t UTF8 texk/xdvik/CHANGES -o CHANGES
touch -r texk/xdvik/CHANGES CHANGES
cp -p texk/xdvik/README.t1* .

%install
rm -rf $RPM_BUILD_ROOT

%if %{with japanese}
install_dirs='INSTDIRS=texk/xdvik texk/pxdvik'
%endif

# make install DESTDIR=$RPM_BUILD_ROOT doesn't work here
%makeinstall \
        texmf=$RPM_BUILD_ROOT%{_texmf_main} \
        texmfmain=$RPM_BUILD_ROOT%{_texmf_main} \
        "$install_dirs" \
        INSTALL='install -p'

# desktop file
cat > xdvi.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=DVI Viewer
Type=Application
Comment=DVI viewer for TeX DVI files
Icon=xdvi
MiniIcon=mini-doc1.xpm
Exec=xdvi
MimeType=application/x-dvi;
NoDisplay=true
EOF

mkdir -p $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/

install -p  -m644 %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
install -p  -m644 %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xdvi.png
desktop-file-install --vendor "fedora" \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category Graphics \
  xdvi.desktop

# Remove uneeded file
rm $RPM_BUILD_ROOT%{_texmf_main}/release-tetex-src.txt

%if %{with japanese}
mkdir -p pxdvik/READMEs
pushd texk/pxdvik
for i in CHANGES.xdvik-jp README.xdvik-jp READMEs/* ; do
  iconv -f EUC-JP -t UTF-8 ${i} \
        -o  ../../pxdvik/${i}
  touch -r ${i} ../../pxdvik/${i}
done
popd
install -p -m 644 texk/pxdvik/vfontmap.sample.orig pxdvik/vfontmap.sample
%endif

%post
%{_bindir}/texconfig-sys rehash 2> /dev/null || :
update-desktop-database &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun
%{_bindir}/texconfig-sys rehash 2> /dev/null || :
update-desktop-database &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,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

%if %{with japanese}
%doc pxdvik/
%{_bindir}/opxdvi
%{_bindir}/pxdvi
%{_bindir}/pxdvizilla
%{_bindir}/pxdvi-xaw3d
%{_texmf_main}/pxdvi/
%endif

%changelog
* Mon Jan  14 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-4
- Use bcond for Japanese conditional stuff (Patrice Dumas)
- Fix license (Patrice Dumas)
- Make desktop file scriplets conform to packaging guidelines (Patrice Dumas)
- Remove unneeded Requires (Patrice Dumas)
- Adjust Provides and Obsoletes of xdvi

* Sun Jan  13 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-3
- Added xdg-open patch (Patrice Dumas)
- Avoid dependency generation implicating the bundled kpathsea files (Patrice Dumas)
- Added Requires for Xaw3d

* Sun Jan  13 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-2
- Add patch to build against system kpathsea rather than the one in the tarball
- Same patch also removes all includes to the t1lib headers shipped in the tarball to 
  prevent conflicts with system t1lib-devel
- Spefile cleanups

* Sun Jan  6 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-1
- Initial package based on the texlive.spec by Jindrich Novy
- Updated to latest upstream xdvik and Japanese xdvik 
- Reviewed all patches relating to xdvi in texlive.spec and cherry picked
  those that are still needed
- Reworked the patch to allow building of xdvik and pxdvik


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2008 02:07:07 -0000	1.1
+++ .cvsignore	15 Jan 2008 10:12:28 -0000	1.2
@@ -0,0 +1,2 @@
+xdvik-22.84.13-j1.34.patch.gz
+xdvik-22.84.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2008 02:07:07 -0000	1.1
+++ sources	15 Jan 2008 10:12:28 -0000	1.2
@@ -0,0 +1,2 @@
+23f7b6d2cd7d42a483efb4872a6c00a1  xdvik-22.84.13-j1.34.patch.gz
+4d3d92381be42d7163e0f815f9cfb346  xdvik-22.84.13.tar.gz


