- updated for 1.0.3

Changed files:
    wv-magick.patch -> 1.7

diff --git a/wv-magick.patch b/wv-magick.patch
index 940d4c35480ae29c91f2e073892ee40242ab1401..a22945d7a24a1999b0663a62fff359cb2979c63f 100644 (file)
--- a/wv-magick.patch
+++ b/wv-magick.patch
@@ -1,6 +1,5 @@
-diff -Nur wv-0.7.1.orig/GNUmakefile.am wv-0.7.1/GNUmakefile.am
---- wv-0.7.1.orig/GNUmakefile.am       Tue Jan 15 10:58:17 2002
-+++ wv-0.7.1/GNUmakefile.am    Thu Feb 21 22:55:58 2002
+--- wv-1.0.3.orig/GNUmakefile.am       Tue Jan 15 10:58:17 2002
++++ wv-1.0.3/GNUmakefile.am    Thu Feb 21 22:55:58 2002
 @@ -26,20 +26,30 @@
  LIBEXPORTER = 
  endif
@@ -15,16 +14,16 @@ diff -Nur wv-0.7.1.orig/GNUmakefile.am wv-0.7.1/GNUmakefile.am
 +LIBMAGICK =
 +endif
 +
- DIST_SUBDIRS = xml help wingdingfont patterns glib-wv libole2 oledecod magick expat exporter .
+ DIST_SUBDIRS = xml help wingdingfont patterns glib-wv libole2 magick expat exporter .
  
--SUBDIRS = xml help wingdingfont patterns $(DIRGLIB) libole2 oledecod magick $(DIREXPAT) $(DIREXPORTER) .
-+SUBDIRS = xml help wingdingfont patterns $(DIRGLIB) libole2 oledecod $(DIRMAGICK) $(DIREXPAT) $(DIREXPORTER) .
+-SUBDIRS = xml help wingdingfont patterns $(DIRGLIB) libole2 magick $(DIREXPAT) $(DIREXPORTER) .
++SUBDIRS = xml help wingdingfont patterns $(DIRGLIB) libole2 $(DIRMAGICK) $(DIREXPAT) $(DIREXPORTER) .
  
  DEFS = @DEFS@ -DVERSION=\"@VERSION@\" -DXMLCONFIG=\"$(pkgdatadir)/wvConfig.xml\" -DHTMLCONFIG=\"$(pkgdatadir)/wvHtml.xml\" -DWVDATADIR=\"$(datadir)/wv\"
  
  INCLUDES = -I. -I$(top_builddir) -I$(srcdir) \
--      -I$(srcdir)/magick -I$(srcdir)/libole2 -I$(srcdir)/oledecod $(INCGLIB) $(INCEXPAT)
-+      $(INCMAGICK) -I$(srcdir)/libole2 -I$(srcdir)/oledecod $(INCGLIB) $(INCEXPAT)
+-      -I$(srcdir)/magick -I$(srcdir)/libole2 $(INCGLIB) $(INCEXPAT)
++      $(INCMAGICK) -I$(srcdir)/libole2 $(INCGLIB) $(INCEXPAT)
  
  CFLAGS = @CFLAGS@ @ANSI_CFLAGS@
  
@@ -40,8 +39,8 @@ diff -Nur wv-0.7.1.orig/GNUmakefile.am wv-0.7.1/GNUmakefile.am
  wvConvert_LDADD = libwv.la $(GETOPT)
  wvVersion_LDADD = libwv.la $(GETOPT)
  
--libwv_la_LIBADD = magick/libmagick.la libole2/libole2.la oledecod/liboledecod.la $(LIBGLIB) $(LIBEXPAT) $(LIBEXPORTER) $(WVLIBS)
-+libwv_la_LIBADD = $(LIBMAGICK) libole2/libole2.la oledecod/liboledecod.la $(LIBGLIB) $(LIBEXPAT) $(LIBEXPORTER) $(WVLIBS)
+-libwv_la_LIBADD = magick/libmagick.la libole2/libole2.la $(LIBGLIB) $(LIBEXPAT) $(LIBEXPORTER) $(WVLIBS)
++libwv_la_LIBADD = $(LIBMAGICK) libole2/libole2.la $(LIBGLIB) $(LIBEXPAT) $(LIBEXPORTER) $(WVLIBS)
  libwv_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic
  libwv_la_SOURCES = \
        support.c \