diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..92719ea --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +xdvik-22.84.13.tar.gz +xdvik-22.84.13-j1.36.patch.gz diff --git a/dead.package b/dead.package deleted file mode 100644 index 9ac887d..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -It is now obsoleted by texlive-xdvi-bin diff --git a/pxdvik-22.84.13-use-system-libs.patch b/pxdvik-22.84.13-use-system-libs.patch new file mode 100644 index 0000000..69b8085 --- /dev/null +++ b/pxdvik-22.84.13-use-system-libs.patch @@ -0,0 +1,21 @@ +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 diff --git a/pxdvik-22.84.13.patch b/pxdvik-22.84.13.patch new file mode 100644 index 0000000..a541f52 --- /dev/null +++ b/pxdvik-22.84.13.patch @@ -0,0 +1,146 @@ +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 ' 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 @@ + + 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" diff --git a/sources b/sources new file mode 100644 index 0000000..dff60bc --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +4d3d92381be42d7163e0f815f9cfb346 xdvik-22.84.13.tar.gz +d4c68a340a81dc6cce353081476abb56 xdvik-22.84.13-j1.36.patch.gz diff --git a/texlive-2007-xprint.patch b/texlive-2007-xprint.patch new file mode 100644 index 0000000..9d28e89 --- /dev/null +++ b/texlive-2007-xprint.patch @@ -0,0 +1,13 @@ +--- 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: diff --git a/texlive-source-xdvi-numlock.patch b/texlive-source-xdvi-numlock.patch new file mode 100644 index 0000000..676a537 --- /dev/null +++ b/texlive-source-xdvi-numlock.patch @@ -0,0 +1,38 @@ +--- texk/xdvik/translations.h ++++ texk/xdvik/translations.h 2005-02-07 14:07:44.000000000 +0100 +@@ -119,15 +119,26 @@ + "Escape: discard-number()\n" + #endif + #ifdef XK_KP_Left +- "KP_Home: home()\n" +- "KP_Left: left()\n" +- "KP_Up: up()\n" +- "KP_Right: right()\n" +- "KP_Down: down()\n" +- "KP_Prior: back-page()\n" +- "KP_Next: forward-page()\n" +- "KP_Delete: up-or-previous()\n" +- "KP_Enter: forward-page()\n" ++ "~@Num_LockKP_Home:home()\n" ++ "~@Num_LockKP_Left:left(0.015)\n" ++ "~@Num_LockKP_Begin:center()\n" ++ "~@Num_LockKP_Up:up(0.015)\n" ++ "~@Num_LockKP_Right:right(0.015)\n" ++ "~@Num_LockKP_Down:down(0.015)\n" ++ "~@Num_LockKP_Prior:back-page()\n" ++ "~@Num_LockKP_Next:forward-page()\n" ++ "KP_Enter:forward-page()\n" ++ "KP_Delete:up-or-previous()\n" ++ "KP_1:digit(1)\n" ++ "KP_2:digit(2)\n" ++ "KP_3:digit(3)\n" ++ "KP_4:digit(4)\n" ++ "KP_5:digit(5)\n" ++ "KP_6:digit(6)\n" ++ "KP_7:digit(7)\n" ++ "KP_8:digit(8)\n" ++ "KP_9:digit(9)\n" ++ "KP_0:digit(0)\n" + #endif + ""; + diff --git a/texlive-xdvi-maxchar.patch b/texlive-xdvi-maxchar.patch new file mode 100644 index 0000000..5452076 --- /dev/null +++ b/texlive-xdvi-maxchar.patch @@ -0,0 +1,12 @@ +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; diff --git a/vfontmap b/vfontmap new file mode 100644 index 0000000..0ed4f5f --- /dev/null +++ b/vfontmap @@ -0,0 +1,94 @@ +% +% 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 diff --git a/xdvi48x48.png b/xdvi48x48.png new file mode 100644 index 0000000..ff180e1 Binary files /dev/null and b/xdvi48x48.png differ diff --git a/xdvik-22.84.13-bad_bar.patch b/xdvik-22.84.13-bad_bar.patch new file mode 100644 index 0000000..f3ecc4e --- /dev/null +++ b/xdvik-22.84.13-bad_bar.patch @@ -0,0 +1,11 @@ +--- 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); diff --git a/xdvik-22.84.13-keepflag-scrollfix.patch b/xdvik-22.84.13-keepflag-scrollfix.patch new file mode 100644 index 0000000..6de4482 --- /dev/null +++ b/xdvik-22.84.13-keepflag-scrollfix.patch @@ -0,0 +1,69 @@ +--- 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 diff --git a/xdvik-22.84.13-manpage.patch b/xdvik-22.84.13-manpage.patch new file mode 100644 index 0000000..84dddf6 --- /dev/null +++ b/xdvik-22.84.13-manpage.patch @@ -0,0 +1,83 @@ +--- 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 diff --git a/xdvik-22.84.13-tempfix.patch b/xdvik-22.84.13-tempfix.patch new file mode 100644 index 0000000..08ff5f0 --- /dev/null +++ b/xdvik-22.84.13-tempfix.patch @@ -0,0 +1,15 @@ +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) diff --git a/xdvik-22.84.13-uint32_t-fix.patch b/xdvik-22.84.13-uint32_t-fix.patch new file mode 100644 index 0000000..fc95005 --- /dev/null +++ b/xdvik-22.84.13-uint32_t-fix.patch @@ -0,0 +1,13 @@ +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 + #include ++#endif ++#if HAVE_STDINT_H ++#include + #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 diff --git a/xdvik-22.84.13-use-system-libs.patch b/xdvik-22.84.13-use-system-libs.patch new file mode 100644 index 0000000..5598c56 --- /dev/null +++ b/xdvik-22.84.13-use-system-libs.patch @@ -0,0 +1,70 @@ +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 diff --git a/xdvik-22.84.13-xdgopen.patch b/xdvik-22.84.13-xdgopen.patch new file mode 100644 index 0000000..852690c --- /dev/null +++ b/xdvik-22.84.13-xdgopen.patch @@ -0,0 +1,36 @@ +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" \ diff --git a/xdvik.spec b/xdvik.spec new file mode 100644 index 0000000..c3f1aa8 --- /dev/null +++ b/xdvik.spec @@ -0,0 +1,347 @@ +%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 + +Summary: An X viewer for DVI files +Name: xdvik +Version: 22.84.13 +Release: 17%{?dist}.1 +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: tetex-dvips +Requires: xdg-utils ghostscript +Requires(post): desktop-file-utils >= %{desktop_file_utils_version} +Requires(postun): 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: tetex +%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: 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 + +%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 +%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 +# 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 + +# 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 + +# This is the Japanese xdvi patch +%patch1000 -p1 +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 + +# 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 + +%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} +( 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 + +# Here we don't use make %{?_smp_mflags} since occasionally it fails +make + +# 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 < /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 +* Fri Mar 14 2008 Jonathan G. Underwood - 22.84.13-17.1 +- Branched for F8 from devel (i.e. branched from rawhide leading to F-9) +- Adjust Requires and BuildRequires for F-8 i.e. tetex instead of texlive + +* Sun Feb 3 2008 Jonathan G. Underwood - 22.84.13-17 +- Fix spec file typo + +* Sun Feb 3 2008 Jonathan G. Underwood - 22.84.13-16 +- Change directory copying logic such that we can use the upstream Japanese + patch without modification + +* Sat Feb 2 2008 Jonathan G. Underwood - 22.84.13-15 +- Fix definition of _texmf_main for now +- Fix previous changelog entry version number + +* Sat Feb 2 2008 Jonathan G. Underwood - 22.84.13-14 +- Rework xdvik-22.84.13-uint32_t-fix.patch so as to be consistent with the + upstream japanese patch and to stop the build barfing +- Remove parallel make since occasionally this fails + +* Sat Feb 2 2008 Jonathan G. Underwood - 22.84.13-13 +- Rework pxdvik-22.84.13-use-system-libs.patch for new japanes patch + +* Sat Feb 2 2008 Jonathan G. Underwood - 22.84.13-12 +- Fix errors in changelog +- Small modifications to xdvik-22.84.13-j1.36.patch.gz so it will apply cleanly + +* Sat Feb 2 2008 Jonathan G. Underwood - 22.84.13-11 +- Update to Japanese patch xdvik-22.84.13-j1.36.patch.gz + +* Wed Jan 23 2008 Patrice Dumas - 22.84.13-10 +- add xdg-utils, ghostscript requires +- use virtual requires for dvips and tex + +* Mon Jan 21 2008 Jonathan G. Underwood - 22.84.13-9 +- Add patch to fix segfault on double full screen toggle BZ 429429 (Michal Jaegermann) + +* Sat Jan 19 2008 Jonathan G. Underwood - 22.84.13-8 +- Add patch to fix spelling errors in manpage, derived from patch by A. Costa + (BZ 429396) + +* Wed Jan 16 2008 Jonathan G. Underwood - 22.84.13-7 +- Replace texlive-2007-xdvi-keepflag.patch with + xdvik-22.84.13-keepflag-fixscroll.patch to fix - BZ 417461 (Michal Jaegermann) + +* Tue Jan 15 2008 Jindrich Novy - 22.84.13-6 +- apply temporary file creation fix for xdvizilla +- better obsolete xdvi + +* Tue Jan 15 2008 Jonathan G. Underwood - 22.84.13-5 +- Added Requires(postun) for desktop-file-utils + +* Mon Jan 14 2008 Jonathan G. Underwood - 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 - 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 - 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 - 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