prebuild and build makefiles for building full Windows binary install package

diff --git a/windows/prebuild/fontconfig.patch b/windows/prebuild/fontconfig.patch
new file mode 100755 (executable)
index 0000000..cb73eeb
--- /dev/null
+++ b/windows/prebuild/fontconfig.patch
@@ -0,0 +1,44 @@
+diff -ru fontconfig-2.5.91/Makefile.in fontconfig-2.5.91.patched/Makefile.in
+--- fontconfig-2.5.91/Makefile.in      Fri Jan 11 03:59:03 2008
++++ fontconfig-2.5.91.patched/Makefile.in      Wed May 14 10:24:09 2008
+@@ -796,8 +796,8 @@
+         $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
+       fi; fi
+       @(if $(RUN_FC_CACHE_TEST); then \
+-          echo " fc-cache/fc-cache -s -f -v"; \
+-          fc-cache/fc-cache -s -f -v; \
++          echo " $(bindir)/fc-cache -s -f -v"; \
++          $(bindir)/fc-cache -s -f -v; \
+       else \
+           echo "***"; \
+           echo "*** Warning: fonts.cache not built"; \
+diff -ru fontconfig-2.5.91/fontconfig/fontconfig.h fontconfig-2.5.91.patched/fontconfig/fontconfig.h
+--- fontconfig-2.5.91/fontconfig/fontconfig.h  Fri Jan 11 03:58:25 2008
++++ fontconfig-2.5.91.patched/fontconfig/fontconfig.h  Wed May 14 14:13:19 2008
+@@ -513,10 +513,6 @@
+ FcPublic void
+ FcDirCacheUnload (FcCache *cache);
+ 
+-/* fcfreetype.c */
+-FcPublic FcPattern *
+-FcFreeTypeQuery (const FcChar8 *file, int id, FcBlanks *blanks, int *count);
+-
+ /* fcfs.c */
+ 
+ FcPublic FcFontSet *
+diff -ru fontconfig-2.5.91/src/Makefile.in fontconfig-2.5.91.patched/src/Makefile.in
+--- fontconfig-2.5.91/src/Makefile.in  Fri Jan 11 03:59:02 2008
++++ fontconfig-2.5.91.patched/src/Makefile.in  Wed May 14 14:10:59 2008
+@@ -652,10 +652,10 @@
+ fcftalias.h: $(top_srcdir)/src/makealias $(PUBLIC_FT_FILES)
+       sh $(top_srcdir)/src/makealias "$(top_srcdir)/src" fcftalias.h fcftaliastail.h $(PUBLIC_FT_FILES)
+ 
+-fontconfig.def: $(PUBLIC_FILES)
++fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES)
+       echo Generating $@
+       (echo EXPORTS; \
+-      (cat $(PUBLIC_FILES) || echo 'FcERROR ()' ) | \
++      (cat $(PUBLIC_FILES) $(PUBLIC_FT_FILES) || echo 'FcERROR ()' ) | \
+       grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$$//' -e 's/^/      /' | \
+       sort; \
+       echo LIBRARY libfontconfig-@LT_CURRENT_MINUS_AGE@.dll; \

diff --git a/windows/prebuild/gd.patch b/windows/prebuild/gd.patch
new file mode 100755 (executable)
index 0000000..18245c7
--- /dev/null
+++ b/windows/prebuild/gd.patch
@@ -0,0 +1,12 @@
+diff -ru gd-2.0.35/Makefile.in gd-2.0.35.patched/Makefile.in
+--- gd-2.0.35/Makefile.in      Mon Apr 23 22:57:51 2007
++++ gd-2.0.35.patched/Makefile.in      Mon May 12 23:13:51 2008
+@@ -345,7 +345,7 @@
+ include_HEADERS = gd.h gdfx.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h gdfonts.h gdfontt.h entities.h
+ lib_LTLIBRARIES = libgd.la
+ libgd_la_SOURCES = gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h
+-libgd_la_LDFLAGS = -version-info 2:0:0 $(XTRA_LDFLAGS)
++libgd_la_LDFLAGS = -version-info 2:0:0 $(XTRA_LDFLAGS) -no-undefined
+ libgd_la_LIBADD = $(LTLIBICONV)
+ LDADD = ./libgd.la $(LIBICONV)
+ all: config.h

diff --git a/windows/prebuild/iconv.patch b/windows/prebuild/iconv.patch
new file mode 100755 (executable)
index 0000000..4e1d9fa
--- /dev/null
+++ b/windows/prebuild/iconv.patch
@@ -0,0 +1,42 @@
+diff -ru win_iconv/src/Makefile win_iconv.patched/src/Makefile
+--- win_iconv/src/Makefile     Wed Mar 19 23:43:38 2008
++++ win_iconv.patched/src/Makefile     Sun May 11 17:32:22 2008
+@@ -10,7 +10,7 @@
+ \r
+ iconv.dll: win_iconv.c\r
+       gcc $(CFLAGS) -c win_iconv.c -DMAKE_DLL\r
+-      dllwrap --dllname iconv.dll --def iconv.def win_iconv.o\r
++      dllwrap --dllname iconv.dll --implib libiconv.dll.a --def iconv.def win_iconv.o\r
+       strip iconv.dll\r
+ \r
+ libiconv.a: win_iconv.c\r
+@@ -32,6 +32,7 @@
+       rm -f win_iconv.exe\r
+       rm -f win_iconv.o\r
+       rm -f iconv.dll\r
++      rm -f libiconv.dll.a\r
+       rm -f libiconv.a\r
+       rm -f win_iconv_test.exe\r
+       rm -f libmlang.a\r
+diff -ru win_iconv/src/iconv.h win_iconv.patched/src/iconv.h
+--- win_iconv/src/iconv.h      Wed Mar 19 23:43:38 2008
++++ win_iconv.patched/src/iconv.h      Sun May 11 17:30:23 2008
+@@ -1,5 +1,18 @@
++#ifndef WIN_ICONV_H\r
++#define WIN_ICONV_H\r
++\r
++#ifdef __cplusplus\r
++extern "C" {\r
++#endif\r
++\r
+ #include <stddef.h>\r
+ typedef void* iconv_t;\r
+ iconv_t iconv_open(const char *tocode, const char *fromcode);\r
+ int iconv_close(iconv_t cd);\r
+ size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);\r
++\r
++#ifdef __cplusplus\r
++}\r
++#endif\r
++\r
++#endif\r

diff --git a/windows/prebuild/pango.patch b/windows/prebuild/pango.patch
new file mode 100755 (executable)
index 0000000..fbec7b8
--- /dev/null
+++ b/windows/prebuild/pango.patch
@@ -0,0 +1,37 @@
+diff -ru pango-1.20.2/modules/Makefile.in pango-1.20.2.patched/modules/Makefile.in
+--- pango-1.20.2/modules/Makefile.in   Thu Apr 10 03:04:14 2008
++++ pango-1.20.2.patched/modules/Makefile.in   Wed May 14 00:20:14 2008
+@@ -556,10 +556,10 @@
+ install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
+       @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then    \
+         echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\&      \
+-        $(top_builddir)/pango/pango-querymodules$(EXEEXT)             \
++        $(bindir)/pango-querymodules$(EXEEXT)                 \
+               \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ;        \
+         $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango &&             \
+-        $(top_builddir)/pango/pango-querymodules$(EXEEXT)             \
++        $(bindir)/pango-querymodules$(EXEEXT)                 \
+               > $(DESTDIR)$(sysconfdir)/pango/pango.modules ;         \
+       else                                                            \
+         echo "***" ;                                                  \
+diff -ru pango-1.20.2/pango/Makefile.in pango-1.20.2.patched/pango/Makefile.in
+--- pango-1.20.2/pango/Makefile.in     Thu Apr 10 03:04:19 2008
++++ pango-1.20.2.patched/pango/Makefile.in     Wed May 14 08:19:59 2008
+@@ -1391,7 +1391,7 @@
+ pango-enum-types.h: s-enum-types-h
+       @true
+ s-enum-types-h: @REBUILD@ $(pango_headers) Makefile
+-      ( cd $(srcdir) && glib-mkenums \
++      ( cd $(srcdir) && $(bindir)/glib-mkenums \
+                       --fhead "#ifndef __PANGO_ENUM_TYPES_H__\n#define __PANGO_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+                       --fprod "/* enumerations from \"@filename@\" */\n" \
+                       --vhead "GType @enum_name@_get_type (void);\n#define PANGO_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
+@@ -1404,7 +1404,7 @@
+ pango-enum-types.c: s-enum-types-c
+       @true
+ s-enum-types-c: @REBUILD@ $(pango_headers) Makefile
+-      ( cd $(srcdir) && glib-mkenums \
++      ( cd $(srcdir) && $(bindir)/glib-mkenums \
+                       --fhead "#include <pango.h>" \
+                       --fprod "\n/* enumerations from \"@filename@\" */" \
+                       --vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"     \

diff --git a/windows/prebuild/pixman.patch b/windows/prebuild/pixman.patch
new file mode 100755 (executable)
index 0000000..0854d5b
--- /dev/null
+++ b/windows/prebuild/pixman.patch
@@ -0,0 +1,12 @@
+diff -ru pixman-0.10.0/pixman/Makefile.in pixman-0.10.0.patched/pixman/Makefile.in
+--- pixman-0.10.0/pixman/Makefile.in   Thu Mar 27 23:02:10 2008
++++ pixman-0.10.0.patched/pixman/Makefile.in   Sun May 11 21:47:37 2008
+@@ -232,7 +232,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ lib_LTLIBRARIES = libpixman-1.la
+-libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
++libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined
+ libpixman_1_la_LIBADD = @DEP_LIBS@ -lm $(am__append_2) $(am__append_4)
+ libpixman_1_la_SOURCES = \
+       pixman.h                        \

diff --git a/windows/prebuild/zlib.patch b/windows/prebuild/zlib.patch
new file mode 100755 (executable)
index 0000000..67c3cdc
--- /dev/null
+++ b/windows/prebuild/zlib.patch
@@ -0,0 +1,61 @@
+diff -u3pr zlib-1.2.3/win32/Makefile.gcc zlib-1.2.3-mingwPORT/win32/Makefile.gcc
+--- zlib-1.2.3/win32/Makefile.gcc      Fri Aug  1 23:49:00 2003
++++ zlib-1.2.3-mingwPORT/win32/Makefile.gcc    Wed Feb  1 11:48:04 2006
+@@ -25,7 +25,8 @@
+ 
+ STATICLIB = libz.a
+ SHAREDLIB = zlib1.dll
+-IMPLIB    = libzdll.a
++IMPLIB    = libz.dll.a
++ALTIMPLIB = libzdll.a
+ 
+ #LOC = -DASMV
+ #LOC = -DDEBUG -g
+@@ -53,6 +54,10 @@ RM = rm -f
+ prefix = /usr/local
+ exec_prefix = $(prefix)
+ 
++INCLUDE_PATH = $(prefix)/include
++LIBRARY_PATH = $(prefix)/lib
++BINARY_PATH  = $(prefix)/bin
++
+ OBJS = adler32.o compress.o crc32.o deflate.o gzio.o infback.o \
+        inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
+ OBJA =
+@@ -99,28 +104,31 @@ zlibrc.o: win32/zlib1.rc
+       $(RC) $(RCFLAGS) -o $@ win32/zlib1.rc
+ 
+ 
+-# INCLUDE_PATH and LIBRARY_PATH must be set.
+-
+ .PHONY: install uninstall clean
+ 
+-install: zlib.h zconf.h $(LIB)
+-      -@if not exist $(INCLUDE_PATH)/nul mkdir $(INCLUDE_PATH)
+-      -@if not exist $(LIBRARY_PATH)/nul mkdir $(LIBRARY_PATH)
++install: zlib.h zconf.h $(STATICLIB) $(SHAREDLIB)
++      @if [ ! -d $(BINARY_PATH) ] ; then mkdir -p $(BINARY_PATH) ; fi
++      @if [ ! -d $(INCLUDE_PATH) ] ; then mkdir -p $(INCLUDE_PATH) ; fi
++      @if [ ! -d $(LIBRARY_PATH) ] ; then mkdir -p $(LIBRARY_PATH) ; fi
++      -$(INSTALL) $(SHAREDLIB) $(BINARY_PATH)
+       -$(INSTALL) zlib.h $(INCLUDE_PATH)
+       -$(INSTALL) zconf.h $(INCLUDE_PATH)
+       -$(INSTALL) $(STATICLIB) $(LIBRARY_PATH)
+       -$(INSTALL) $(IMPLIB) $(LIBRARY_PATH)
++      -$(INSTALL) $(IMPLIB) $(LIBRARY_PATH)/$(ALTIMPLIB)
+ 
+ uninstall:
+       -$(RM) $(INCLUDE_PATH)/zlib.h
+       -$(RM) $(INCLUDE_PATH)/zconf.h
+       -$(RM) $(LIBRARY_PATH)/$(STATICLIB)
+       -$(RM) $(LIBRARY_PATH)/$(IMPLIB)
++      -$(RM) $(LIBRARY_PATH)/$(ALTIMPLIB)
+ 
+ clean:
+       -$(RM) $(STATICLIB)
+       -$(RM) $(SHAREDLIB)
+       -$(RM) $(IMPLIB)
++      -$(RM) $(ALTIMPLIB)
+       -$(RM) *.o
+       -$(RM) *.exe
+       -$(RM) foo.gz