summaryrefslogtreecommitdiff
path: root/converters/wv/patches
diff options
context:
space:
mode:
Diffstat (limited to 'converters/wv/patches')
-rw-r--r--converters/wv/patches/patch-aa31
-rw-r--r--converters/wv/patches/patch-ab116
-rw-r--r--converters/wv/patches/patch-ad16
-rw-r--r--converters/wv/patches/patch-ae13
4 files changed, 125 insertions, 51 deletions
diff --git a/converters/wv/patches/patch-aa b/converters/wv/patches/patch-aa
index c792b3c7deb..8c73e40d25d 100644
--- a/converters/wv/patches/patch-aa
+++ b/converters/wv/patches/patch-aa
@@ -1,26 +1,26 @@
-$NetBSD: patch-aa,v 1.2 2000/08/05 02:39:19 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2000/10/16 15:14:23 rh Exp $
---- Makefile.in.orig Thu Dec 16 10:52:20 1999
-+++ Makefile.in Fri Aug 4 21:37:11 2000
+--- Makefile.in.orig Wed Sep 20 20:42:43 2000
++++ Makefile.in
@@ -76,7 +76,7 @@
VPATH = @srcdir@
--CFLAGS = @CFLAGS@ @DEFS@ @ZLIB_CFLAGS@ -I. -I./ -I$(srcdir)/ -I$(srcdir)/iconv/ -I$(srcdir)/magick/ -I$(srcdir)/expat/xmlparse/ -I$(srcdir)/oledecod/ @TTF_CFLAGS@ @WMF_CFLAGS@ -DTTFDIR=\"$(libdir)/wv/ttf\" -DXMLCONFIG=\"$(libdir)/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(libdir)/wv/wvHtml.xml\"
-+CFLAGS = @CFLAGS@ @DEFS@ @ZLIB_CFLAGS@ -I. -I./ -I$(srcdir)/ -I$(srcdir)/iconv/ -I$(srcdir)/magick/ -I$(srcdir)/expat/xmlparse/ -I$(srcdir)/oledecod/ @WMF_CFLAGS@ @TTF_CFLAGS@ -DTTFDIR=\"$(prefix)/share/wv/ttf\" -DXMLCONFIG=\"$(prefix)/share/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(prefix)/share/wv/wvHtml.xml\" @CPPFLAGS@
+-CFLAGS = @CFLAGS@ @DEFS@ @ZLIB_CFLAGS@ -I. -I./ -I$(srcdir)/ -I$(srcdir)/getopt-wv/ -I$(srcdir)/iconv/ -I$(srcdir)/magick/ -I$(srcdir)/expat/xmlparse/ @TTF_CFLAGS@ @WMF_CFLAGS@ -DTTFDIR=\"$(libdir)/wv/ttf\" -DXMLCONFIG=\"$(libdir)/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(libdir)/wv/wvHtml.xml\"
++CFLAGS = @CFLAGS@ @DEFS@ @ZLIB_CFLAGS@ -I. -I./ -I$(srcdir)/ -I$(srcdir)/getopt-wv/ -I$(srcdir)/iconv/ -I$(srcdir)/magick/ -I$(srcdir)/expat/xmlparse/ @WMF_CFLAGS@ @TTF_CFLAGS@ -DTTFDIR=\"$(prefix)/share/wv/ttf\" -DXMLCONFIG=\"$(prefix)/share/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(prefix)/share/wv/wvHtml.xml\"
- MKINSTALLDIRS = $(srcdir)/mkinstalldirs
-
-@@ -223,7 +223,7 @@
+ CFLAGS += \
+ -I$(srcdir)/libole2/ \
+@@ -237,7 +237,7 @@
wv-incconfig: Makefile
- rm -f wv-incconfig
+ $(RM) -f wv-incconfig
echo \#\!/bin/sh > wv-incconfig
- echo echo @ZLIB_CFLAGS@ -I$(includedir) @WMF_CFLAGS@ >> wv-incconfig
+ echo echo @WMF_CFLAGS@ @ZLIB_CFLAGS@ -I$(includedir) >> wv-incconfig
lex.yy.c: parser.lex
$(LEX) parser.lex
-@@ -293,10 +293,11 @@
+@@ -325,10 +325,11 @@
$(mandir) \
$(mandir)/man1 \
$(libdir) \
@@ -36,17 +36,18 @@ $NetBSD: patch-aa,v 1.2 2000/08/05 02:39:19 jlam Exp $
$(includedir)
-@@ -313,13 +314,16 @@
- $(INSTALL_DATA) $(srcdir)/wvHtml.1 $(mandir)/man1/
+@@ -366,15 +367,15 @@
+ $(INSTALL_DATA) $(srcdir)/wvSummary.1 $(mandir)/man1/
$(INSTALL_DATA) wv.h $(includedir)/wv.h
$(INSTALL_DATA) $(srcdir)/libwv.a $(libdir)/libwv.a
- $(INSTALL_DATA) $(srcdir)/wvHtml.xml $(libdir)/wv/wvHtml.xml
+- $(INSTALL_DATA) $(srcdir)/wvLaTeX.xml $(libdir)/wv/wvLaTeX.xml
+- $(INSTALL_DATA) $(srcdir)/wvCleanLaTeX.xml $(libdir)/wv/wvCleanLaTeX.xml
- $(INSTALL_DATA) $(srcdir)/wvConfig.xml $(libdir)/wv/wvConfig.xml
-+ $(INSTALL_DATA) $(srcdir)/lyx.xml $(prefix)/share/wv/lyx.xml
+ $(INSTALL_DATA) $(srcdir)/wvHtml.xml $(prefix)/share/wv/wvHtml.xml
-+ $(INSTALL_DATA) $(srcdir)/wvConfig.xml $(prefix)/share/wv/wvConfig.xml
+ $(INSTALL_DATA) $(srcdir)/wvLaTeX.xml $(prefix)/share/wv/wvLaTeX.xml
-+ $(INSTALL_DATA) $(srcdir)/wvOnline.xml $(prefix)/share/wv/wvOnline.xml
++ $(INSTALL_DATA) $(srcdir)/wvCleanLaTeX.xml $(prefix)/share/wv/wvCleanLaTeX.xml
++ $(INSTALL_DATA) $(srcdir)/wvConfig.xml $(prefix)/share/wv/wvConfig.xml
for filename in wingdingfont/*.gif; do \
- $(INSTALL_DATA) $$filename $(libdir)/wv/wingdingfont; \
+ $(INSTALL_DATA) $$filename $(prefix)/share/wv/wingdingfont; \
diff --git a/converters/wv/patches/patch-ab b/converters/wv/patches/patch-ab
index c4f7696288c..a6eb6f08ab0 100644
--- a/converters/wv/patches/patch-ab
+++ b/converters/wv/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2000/08/05 02:39:19 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2000/10/16 15:14:23 rh Exp $
---- configure.in.orig Thu Dec 16 10:35:16 1999
-+++ configure.in Fri Aug 4 21:37:12 2000
-@@ -305,7 +305,7 @@
+--- configure.orig Tue Sep 19 21:38:01 2000
++++ configure
+@@ -3567,7 +3567,7 @@
_SAVE_LDFLAGS=$LDFLAGS
if test "$TTF_DIR" != "" ; then
@@ -11,18 +11,28 @@ $NetBSD: patch-ab,v 1.2 2000/08/05 02:39:19 jlam Exp $
LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
fi
-@@ -319,20 +319,21 @@
- AC_MSG_RESULT("$result")
+@@ -3602,7 +3602,7 @@
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lttf -lm $LIBS"
++LIBS="-lttf -lintl -lm $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 3608 "configure"
+ #include "confdefs.h"
+@@ -3630,7 +3630,7 @@
fi
- if [ test "$SYSTEM_TTF" = 1 ]; then
-- AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],no_ttf=yes,-lm)
-+ AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],
-+ no_ttf=yes,-lintl)
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- TTF_LIBS="-lttf"
++ TTF_LIBS="-lttf -lintl"
else
- no_ttf=yes
+ echo "$ac_t""no" 1>&6
+ no_ttf=yes
+@@ -3641,14 +3641,14 @@
fi
- if [ test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ]; then
+ if test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
- TTF_CFLAGS="-I${TTF_DIR}/include"
+ TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
@@ -37,27 +47,36 @@ $NetBSD: patch-ab,v 1.2 2000/08/05 02:39:19 jlam Exp $
fi
if test "$TTF_DIR" = no; then
-@@ -345,15 +346,16 @@
- AC_MSG_RESULT("$result")
- fi
- if [ test "$SYSTEM_TTF" = 1 ]; then
-- AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],no_ttf=yes,-lm)
-+ AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],
-+ no_ttf=yes,-lintl)
- else
- no_ttf=yes
- fi
+@@ -3684,7 +3684,7 @@
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lttf -lm $LIBS"
++LIBS="-lttf -lintl -lm $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 3690 "configure"
+ #include "confdefs.h"
+@@ -3712,7 +3712,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- TTF_LIBS="-lttf"
++ TTF_LIBS="-lttf -lintl"
+ else
+ echo "$ac_t""no" 1>&6
+ no_ttf=yes
+@@ -3724,8 +3724,8 @@
- if [ test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ]; then
+ if test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
- TTF_CFLAGS="-I${TTF_DIR}"
- TTF_LIBS="-L${TTF_DIR} ${TTF_LIBS}"
+ TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
-+ TTF_LIBS="-L${TTF_DIR}/include ${TTF_LIBS}"
++ TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
fi
fi
-@@ -374,7 +376,7 @@
+@@ -3747,7 +3747,7 @@
_SAVE_LIBS=$LIBS
if test "$WMF_DIR" != "" ; then
@@ -66,26 +85,37 @@ $NetBSD: patch-ab,v 1.2 2000/08/05 02:39:19 jlam Exp $
LDFLAGS="-L${WMF_DIR}/lib $LDFLAGS"
fi
-@@ -397,13 +399,13 @@
+@@ -3813,7 +3813,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- WMF_LIBS="-lgdwmf -lwmf -lxgd -ldib -lpng"
++ WMF_LIBS="-lgdwmf -lwmf -lttf -lxgd -ldib -lpng"
+ else
+ echo "$ac_t""no" 1>&6
+ no_wmf=yes
+@@ -3824,7 +3824,7 @@
fi
- if [ test -n "${WMF_DIR}" && test -d "${WMF_DIR}" && test "$SYSTEM_WMF" = 1 ]; then
+ if test -n "${WMF_DIR}" && test -d "${WMF_DIR}" && test "$SYSTEM_WMF" = 1 ; then
- WMF_CFLAGS="-I${WMF_DIR}/include"
+ WMF_CFLAGS="-I${WMF_DIR}/include/libwmf"
WMF_LIBS="-L${WMF_DIR}/lib ${WMF_LIBS}"
fi
- if test "x$no_wmf" = xyes; then
- if test "$WMF_DIR" != "" ; then
-- CFLAGS="-I${WMF_DIR}/include $CFLAGS"
-+ CFLAGS="-I${WMF_DIR}/include/libwmf $CFLAGS"
- LDFLAGS="-L${WMF_DIR}/lib $LDFLAGS"
- fi
-
-@@ -427,8 +429,8 @@
+@@ -3869,7 +3869,7 @@
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lgdwmf -lwmf -lxgd -ldib -lpng $TTF_LIBS $XPM_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lm $LIBS"
++LIBS="-lgdwmf -lwmf -lttf -lxgd -ldib -lpng $TTF_LIBS $XPM_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lm $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 3875 "configure"
+ #include "confdefs.h"
+@@ -3909,8 +3909,8 @@
- if [ test -n "${WMF_DIR}" && test -d "${WMF_DIR}" && test "$SYSTEM_WMF" = 1 ]; then
+ if test -n "${WMF_DIR}" && test -d "${WMF_DIR}" && test "$SYSTEM_WMF" = 1 ; then
- WMF_CFLAGS="-I${WMF_DIR}"
- WMF_LIBS="-L${WMF_DIR} ${WMF_LIBS}"
+ WMF_CFLAGS="-I${WMF_DIR}/include/libwmf"
@@ -93,3 +123,17 @@ $NetBSD: patch-ab,v 1.2 2000/08/05 02:39:19 jlam Exp $
fi
fi
+@@ -5425,11 +5425,11 @@
+ echo $ac_n "checking if PNG package is complete""... $ac_c" 1>&6
+ echo "configure:5427: checking if PNG package is complete" >&5
+ if test $passed -gt 0; then
+- if test $failed -gt 0; then
++ if false; then
+ echo "$ac_t""no -- some components failed test" 1>&6
+ have_png='no (failed tests)'
+ else
+- LIB_PNG='-lpng'
++ LIB_PNG='-lpng -lz'
+ cat >> confdefs.h <<\EOF
+ #define HasPNG 1
+ EOF
diff --git a/converters/wv/patches/patch-ad b/converters/wv/patches/patch-ad
new file mode 100644
index 00000000000..c002ef4d90a
--- /dev/null
+++ b/converters/wv/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2000/10/16 15:14:23 rh Exp $
+
+--- wv.h.orig Mon Oct 16 15:35:58 2000
++++ wv.h
+@@ -109,7 +109,11 @@
+ S32 y;
+ }POINT;
+ #else
++#define read_32ubit wmf_read_32ubit
++#define read_16ubit wmf_read_16ubit
+ # include <wmfapi.h>
++#undef read_32ubit
++#undef read_16ubit
+ #endif
+
+
diff --git a/converters/wv/patches/patch-ae b/converters/wv/patches/patch-ae
new file mode 100644
index 00000000000..28614649e04
--- /dev/null
+++ b/converters/wv/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2000/10/16 15:14:23 rh Exp $
+
+--- iconv/Makefile.in.orig Mon Oct 16 16:42:29 2000
++++ iconv/Makefile.in
+@@ -21,7 +21,7 @@
+
+ CFLAGS = @CFLAGS@ @DEFS@ -I$(srcdir)/ -I$(srcdir)/../
+
+-CFLAGS += \
++CFLAGS += ${CPPFLAGS} \
+ -I$(srcdir)/../libole2/ \
+ -I$(srcdir)/../glib-wv/
+