Initial checkin of Pika from heckimp

2023-09-25 15:35:21 -07:00
commit 891e999216
6761 changed files with 5240685 additions and 0 deletions
--- a/build/windows/jhbuild/patches/bzip2-1.0.5-slash.patch
+++ b/build/windows/jhbuild/patches/bzip2-1.0.5-slash.patch
@ -0,0 +1,11 @@
+--- bzip2-1.0.5.orig/bzip2.c	2007-12-09 12:22:06.000000000 +0000
+++ bzip2-1.0.5/bzip2.c	2008-09-25 12:31:02.000000000 +0100
+@@ -128,7 +128,7 @@
+ #if BZ_LCCWIN32
+ #   include <io.h>
+ #   include <fcntl.h>
+-#   include <sys\stat.h>
+#   include <sys/stat.h>
+ 
+ #   define NORETURN       /**/
+ #   define PATH_SEP       '\\'
--- a/build/windows/jhbuild/patches/bzip2-1.0.6-autoconfiscated.patch
+++ b/build/windows/jhbuild/patches/bzip2-1.0.6-autoconfiscated.patch
@ -0,0 +1,287 @@
+diff -urN files/autogen.sh ./autogen.sh
+--- bzip2-1.0.5.orig/autogen.sh	1970-01-01 01:00:00.000000000 +0100
+++ bzip2-1.0.5.autoconfiscated/autogen.sh	2009-11-06 12:10:43.574602171 +0100
+@@ -0,0 +1,9 @@
+mv LICENSE COPYING
+mv CHANGES NEWS
+touch AUTHORS
+touch ChangeLog
+libtoolize --force
+aclocal
+automake --add-missing --gnu
+autoconf
+./configure "$@"
+diff -urN bzip2-1.0.5.orig/README.autotools bzip2-1.0.5.autoconfiscated/README.autotools
+--- bzip2-1.0.5.orig/README.autotools	1970-01-01 01:00:00.000000000 +0100
+++ bzip2-1.0.5.autoconfiscated/README.autotools	2010-11-02 17:04:06.000000000 +0100
+@@ -0,0 +1,39 @@
+bzip2 autoconfiscated
+=====================
+
+Temporarily at http://ftp.suse.com/pub/people/sbrabec/bzip2/ expecting
+that it will become a new upstream version to prevent per-distribution
+shared library patching done by nearly each Linux vendor separately.
+
+Autoconfiscation brings standard ./configure ; make ; make install
+installation, seamless support of DESTDIR, automatic check for supported
+CFLAGS, standard shared library support, automatic large files CFLAGS
+check and all things that are supported by automake.
+
+It makes obsolete Makefile-libbz2_so and README.COMPILATION.PROBLEMS.
+Now configure should automatically detect correct build flags.
+
+In case of any problem or question with autotools support feel free to
+contact me: Stanislav Brabec <sbrabec@suse.cz>
+
+Autoconfiscated version binaries are exactly equal to
+bzip2-1.0.5.tar.gz. There are only few changes. See below.
+
+
+New features:
+
+Trivial link man pages for bzcat and bunzip2 added.
+
+bzip2.pc file for pkg-config. Packages can use it for checks.
+
+
+Incompatible changes:
+
+soname change. Libtool has no support for two parts soname suffix (e. g.
+libbz2.so.1.0). It must be a single number (e. g. libbz2.so.1). That is
+why soname must change. But I see not a big problem with it. Several
+distributions already use the new number instead of the non-standard
+number from Makefile-libbz2_so.
+
+To be super-safe, I incremented minor number of the library file, so
+both instances of the shared library can live together.
+diff -urN bzip2-1.0.5.orig/configure.ac bzip2-1.0.5.autoconfiscated/configure.ac
+--- bzip2-1.0.5.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
+++ bzip2-1.0.5.autoconfiscated/configure.ac	2010-11-02 17:53:47.000000000 +0100
+@@ -0,0 +1,70 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.57])
+AC_INIT([bzip2], [1.0.5], [Julian Seward <jseward@bzip.org>])
+BZIP2_LT_CURRENT=1
+BZIP2_LT_REVISION=6
+BZIP2_LT_AGE=0
+AC_CONFIG_SRCDIR([bzlib.h])
+AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE
+AM_MAINTAINER_MODE
+
+# Checks for programs.
+AC_PROG_AWK
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG
+
+# Checks for libraries.
+
+# Checks for header files.
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Check for system features.
+AC_SYS_LARGEFILE
+
+AC_MSG_CHECKING([whether compiler understands -Wall])
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wall"
+AC_TRY_COMPILE([], [], [
+	AC_MSG_RESULT([yes])
+], [
+	AC_MSG_RESULT([no])
+	CFLAGS="$save_CFLAGS"
+])
+
+AC_MSG_CHECKING([whether compiler understands -Winline])
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Winline"
+AC_TRY_COMPILE([], [], [
+	AC_MSG_RESULT([yes])
+], [
+	AC_MSG_RESULT([no])
+	CFLAGS="$save_CFLAGS"
+])
+
+AC_MSG_CHECKING([whether compiler understands -fno-strength-reduce])
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -fno-strength-reduce"
+AC_TRY_COMPILE([], [], [
+	AC_MSG_RESULT([yes])
+], [
+	AC_MSG_RESULT([no])
+	CFLAGS="$save_CFLAGS"
+])
+
+# Checks for library functions.
+
+# Write the output.
+AC_SUBST([BZIP2_LT_CURRENT])
+AC_SUBST([BZIP2_LT_REVISION])
+AC_SUBST([BZIP2_LT_AGE])
+AC_CONFIG_FILES([Makefile bzip2.pc])
+AC_OUTPUT
+diff -urN bzip2-1.0.5.orig/Makefile.am bzip2-1.0.5.autoconfiscated/Makefile.am
+--- bzip2-1.0.5.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ bzip2-1.0.5.autoconfiscated/Makefile.am	2009-11-05 16:45:11.000000000 +0100
+@@ -0,0 +1,138 @@
+lib_LTLIBRARIES = libbz2.la
+
+libbz2_la_SOURCES = \
+	blocksort.c \
+	huffman.c \
+	crctable.c \
+	randtable.c \
+	compress.c \
+	decompress.c \
+	bzlib.c
+
+libbz2_la_LDFLAGS = \
+	-version-info $(BZIP2_LT_CURRENT):$(BZIP2_LT_REVISION):$(BZIP2_LT_AGE) \
+	-no-undefined
+
+include_HEADERS = bzlib.h
+
+noinst_HEADERS = bzlib_private.h
+
+bin_PROGRAMS = bzip2 bzip2recover
+
+bzip2_SOURCES = bzip2.c
+bzip2_LDADD = libbz2.la
+
+bzip2recover_SOURCES = bzip2recover.c
+bzip2recover_LDADD = libbz2.la
+
+bin_SCRIPTS = bzgrep bzmore bzdiff
+
+man_MANS = bzip2.1 bzgrep.1 bzmore.1 bzdiff.1
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = bzip2.pc
+
+$(pkgconfig_DATA): $(srcdir)/bzip2.pc.in config.status
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(bindir)/`echo "bunzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+	rm -f $(DESTDIR)$(bindir)/`echo "bzcat" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+	rm -f $(DESTDIR)$(bindir)/`echo "bzegrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+	rm -f $(DESTDIR)$(bindir)/`echo "bzfgrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+	rm -f $(DESTDIR)$(bindir)/`echo "bzless" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+	rm -f $(DESTDIR)$(bindir)/`echo "bzcmp" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+	$(LN_S) `echo "bzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bunzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+	$(LN_S) `echo "bzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bzcat" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+	$(LN_S) `echo "bzgrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bzegrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+	$(LN_S) `echo "bzgrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bzfgrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+	$(LN_S) `echo "bzmore" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bzless" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+	$(LN_S) `echo "bzdiff" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bzcmp" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+
+install-data-hook:
+	echo ".so man1/`echo "bzip2" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bunzip2" | sed 's,^.*/,,;$(transform)'`.1
+	echo ".so man1/`echo "bzip2" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzcat" | sed 's,^.*/,,;$(transform)'`.1
+	echo ".so man1/`echo "bzgrep" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzegrep" | sed 's,^.*/,,;$(transform)'`.1
+	echo ".so man1/`echo "bzgrep" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzfgrep" | sed 's,^.*/,,;$(transform)'`.1
+	echo ".so man1/`echo "bzmore" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzless" | sed 's,^.*/,,;$(transform)'`.1
+	echo ".so man1/`echo "bzdiff" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzcmp" | sed 's,^.*/,,;$(transform)'`.1
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(bindir)/`echo "bunzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+	rm -f $(DESTDIR)$(bindir)/`echo "bzcat" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+	rm -f $(DESTDIR)$(bindir)/`echo "bzegrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+	rm -f $(DESTDIR)$(bindir)/`echo "bzfgrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+	rm -f $(DESTDIR)$(bindir)/`echo "bzless" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+	rm -f $(DESTDIR)$(bindir)/`echo "bzcmp" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
+	rm -f $(DESTDIR)$(mandir)/man1/`echo "bunzip2" | sed 's,^.*/,,;$(transform)'`.1
+	rm -f $(DESTDIR)$(mandir)/man1/`echo "bzcat" | sed 's,^.*/,,;$(transform)'`.1
+	rm -f $(DESTDIR)$(mandir)/man1/`echo "bzegrep" | sed 's,^.*/,,;$(transform)'`.1
+	rm -f $(DESTDIR)$(mandir)/man1/`echo "bzfgrep" | sed 's,^.*/,,;$(transform)'`.1
+	rm -f $(DESTDIR)$(mandir)/man1/`echo "bzless" | sed 's,^.*/,,;$(transform)'`.1
+	rm -f $(DESTDIR)$(mandir)/man1/`echo "bzcmp" | sed 's,^.*/,,;$(transform)'`.1
+
+test: bzip2
+	@cat $(srcdir)/words1
+	./bzip2 -1  <$(srcdir)/sample1.ref >sample1.rb2
+	./bzip2 -2  <$(srcdir)/sample2.ref >sample2.rb2
+	./bzip2 -3  <$(srcdir)/sample3.ref >sample3.rb2
+	./bzip2 -d  <$(srcdir)/sample1.bz2 >sample1.tst
+	./bzip2 -d  <$(srcdir)/sample2.bz2 >sample2.tst
+	./bzip2 -ds <$(srcdir)/sample3.bz2 >sample3.tst
+	cmp $(srcdir)/sample1.bz2 sample1.rb2
+	cmp $(srcdir)/sample2.bz2 sample2.rb2
+	cmp $(srcdir)/sample3.bz2 sample3.rb2
+	cmp sample1.tst $(srcdir)/sample1.ref
+	cmp sample2.tst $(srcdir)/sample2.ref
+	cmp sample3.tst $(srcdir)/sample3.ref
+	@cat $(srcdir)/words3
+
+manual: $(srcdir)/manual.html $(srcdir)/manual.ps $(srcdir)/manual.pdf
+
+manual.ps: $(MANUAL_SRCS)
+	cd $(srcdir); ./xmlproc.sh -ps manual.xml
+
+manual.pdf: $(MANUAL_SRCS)
+	cd $(srcdir); ./xmlproc.sh -pdf manual.xml
+
+manual.html: $(MANUAL_SRCS)
+	cd $(srcdir); ./xmlproc.sh -html manual.xml
+
+EXTRA_DIST = \
+	$(bin_SCRIPTS) \
+	$(man_MANS) \
+	README.autotools \
+	README.XML.STUFF \
+	bz-common.xsl \
+	bz-fo.xsl \
+	bz-html.xsl \
+	bzip.css \
+	bzip2.1.preformatted \
+	bzip2.pc.in \
+	bzip2.txt \
+	dlltest.c \
+	dlltest.dsp \
+	entities.xml \
+	format.pl \
+	libbz2.def \
+	libbz2.dsp \
+	makefile.msc \
+	manual.html \
+	manual.pdf \
+	manual.ps \
+	manual.xml \
+	mk251.c \
+	sample1.bz2 \
+	sample1.ref \
+	sample2.bz2 \
+	sample2.ref \
+	sample3.bz2 \
+	sample3.ref \
+	spewG.c \
+	unzcrash.c \
+	words0 \
+	words1 \
+	words2 \
+	words3 \
+	xmlproc.sh
+
+ACLOCAL_AMFLAGS = -I m4
+diff -urN bzip2-1.0.5.orig/bzip2.pc.in bzip2-1.0.5.autoconfiscated/bzip2.pc.in
+--- bzip2-1.0.5.orig/bzip2.pc.in	1970-01-01 01:00:00.000000000 +0100
+++ bzip2-1.0.5.autoconfiscated/bzip2.pc.in	2009-11-03 18:48:28.000000000 +0100
+@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: bzip2
+Description: Lossless, block-sorting data compression
+Version: @VERSION@
+Libs: -L${libdir} -lbz2
+Cflags: -I${includedir}
--- a/build/windows/jhbuild/patches/exiv2-add-wsock32.patch
+++ b/build/windows/jhbuild/patches/exiv2-add-wsock32.patch
@ -0,0 +1,11 @@
+--- a/src/CMakeLists.txt	2016-05-29 00:04:56.925764000 -0400
+++ b/src/CMakeLists.txt	2016-05-29 00:05:16.485877571 -0400
+@@ -288,7 +288,7 @@
+ ENDIF( ICONV_FOUND )
+ 
+ IF (CYGWIN OR MINGW)
+-    TARGET_LINK_LIBRARIES( exiv2lib psapi )
+    TARGET_LINK_LIBRARIES( exiv2lib psapi wsock32 )
+ ENDIF(CYGWIN OR MINGW)
+ 
+ 
--- a/build/windows/jhbuild/patches/gettext_0_18_crossbuild_override_tools_fix.patch
+++ b/build/windows/jhbuild/patches/gettext_0_18_crossbuild_override_tools_fix.patch
@ -0,0 +1,11 @@
+--- Makefile.in.orig	2010-05-09 20:59:19.000000000 +0200
+++ Makefile.in	2010-10-02 00:59:46.000000000 +0200
+@@ -211,7 +211,7 @@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = gnulib-local gettext-runtime gettext-tools
+SUBDIRS = gnulib-local gettext-runtime
+ 
+ # DJGPP port.
+ 
--- a/build/windows/jhbuild/patches/ghostscript-8.71-windows.patch
+++ b/build/windows/jhbuild/patches/ghostscript-8.71-windows.patch
--- a/build/windows/jhbuild/patches/ghostscript-change-install-paths.patch
+++ b/build/windows/jhbuild/patches/ghostscript-change-install-paths.patch
@ -0,0 +1,24 @@
+--- a/base/unix-dll.mak	2013-01-26 13:47:45.112366000 -0500
+++ b/base/unix-dll.mak	2013-01-26 14:03:08.292073462 -0500
+@@ -127,13 +127,14 @@
+ 	-mkdir -p $(DESTDIR)$(bindir)
+ 	-mkdir -p $(DESTDIR)$(libdir)
+ 	-mkdir -p $(DESTDIR)$(gsincludedir)
+-	$(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
+-	$(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
+-	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR)
+-	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME)
+-	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME)
+-	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
+-	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
+	#$(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
+	#$(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
+	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(bindir)/$(GS_SONAME_MAJOR_MINOR)
+	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_BASE).dll.a $(DESTDIR)$(libdir)/$(GS_SONAME_BASE).dll.a
+	#$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME)
+	#ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME)
+	#$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
+	#ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
+ 	$(INSTALL_DATA) $(PSSRC)iapi.h $(DESTDIR)$(gsincludedir)iapi.h
+ 	$(INSTALL_DATA) $(PSSRC)ierrors.h $(DESTDIR)$(gsincludedir)ierrors.h
+ 	$(INSTALL_DATA) $(GLSRC)gdevdsp.h $(DESTDIR)$(gsincludedir)gdevdsp.h
--- a/build/windows/jhbuild/patches/iconv-fix-inline.patch
+++ b/build/windows/jhbuild/patches/iconv-fix-inline.patch
@ -0,0 +1,12 @@
+--- a/lib/iconv.c	2015-06-06 12:37:05.267944000 -0400
+++ b/lib/iconv.c	2015-06-06 12:37:27.311277142 -0400
+@@ -176,9 +176,6 @@
+ #include "aliases2.h"
+ #undef S
+ };
+-#ifdef __GNUC__
+-__inline
+-#endif
+ const struct alias *
+ aliases2_lookup (register const char *str)
+ {
--- a/build/windows/jhbuild/patches/icu-fix-library-names.patch
+++ b/build/windows/jhbuild/patches/icu-fix-library-names.patch
@ -0,0 +1,42 @@
+--- a/source/config/mh-mingw	2012-12-28 16:52:21.141964000 -0500
+++ b/source/config/mh-mingw	2012-12-28 18:24:11.955818449 -0500
+@@ -66,16 +66,8 @@
+ LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
+ A = a
+ 
+-## An import library is needed for z/OS and MSVC
+-IMPORT_LIB_EXT = .lib
+-
+-LIBPREFIX=
+-
+-# Change the stubnames so that poorly working FAT disks and installation programs can work.
+-# This is also for backwards compatibility.
+-DATA_STUBNAME = dt
+-I18N_STUBNAME = in
+-LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
+## import libraries are nice to have under mingw
+IMPORT_LIB_EXT = .dll.a
+ 
+ # The #M# is used to delete lines for icu-config
+ # Current full path directory.
+--- a/source/config/mh-mingw64	2012-12-28 16:52:21.141964000 -0500
+++ b/source/config/mh-mingw64	2012-12-28 18:24:11.955818449 -0500
+@@ -66,16 +66,8 @@
+ LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
+ A = a
+ 
+-## An import library is needed for z/OS and MSVC
+-IMPORT_LIB_EXT = .lib
+-
+-LIBPREFIX=
+-
+-# Change the stubnames so that poorly working FAT disks and installation programs can work.
+-# This is also for backwards compatibility.
+-DATA_STUBNAME = dt
+-I18N_STUBNAME = in
+-LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
+## import libraries are nice to have under mingw
+IMPORT_LIB_EXT = .dll.a
+ 
+ # The #M# is used to delete lines for icu-config
+ # Current full path directory.
--- a/build/windows/jhbuild/patches/icu-unexport-target.patch
+++ b/build/windows/jhbuild/patches/icu-unexport-target.patch
@ -0,0 +1,11 @@
+--- a/source/Makefile.in	2012-12-17 13:17:16.000000000 -0500
+++ b/source/Makefile.in	2012-12-28 14:16:07.628294189 -0500
+@@ -21,6 +21,8 @@
+ docsrchdir = $(docfilesdir)/search
+ docsrchfiles = $(docsrchdir)/*
+ 
+unexport TARGET
+
+ ##
+ 
+ ## Build directory information
--- a/build/windows/jhbuild/patches/jasper-1.900.1-mingw32.patch
+++ b/build/windows/jhbuild/patches/jasper-1.900.1-mingw32.patch
@ -0,0 +1,22 @@
+diff -rup jasper-1.900.1.orig/src/libjasper/Makefile.am jasper-1.900.1.new/src/libjasper/Makefile.am
+--- jasper-1.900.1.orig/src/libjasper/Makefile.am	2007-01-19 16:43:07.000000000 -0500
+++ jasper-1.900.1.new/src/libjasper/Makefile.am	2008-09-09 10:08:53.000000000 -0400
+@@ -85,5 +85,5 @@ libjasper_la_LIBADD = \
+ 
+ # -release $(LT_RELEASE)
+ libjasper_la_LDFLAGS = \
+-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+	-no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+diff -rup jasper-1.900.1.orig/src/libjasper/Makefile.in jasper-1.900.1.new/src/libjasper/Makefile.in
+--- jasper-1.900.1.orig/src/libjasper/Makefile.in	2007-01-19 16:54:45.000000000 -0500
+++ jasper-1.900.1.new/src/libjasper/Makefile.in	2008-09-09 10:08:43.000000000 -0400
+@@ -290,7 +290,7 @@ libjasper_la_LIBADD = \
+ 
+ # -release $(LT_RELEASE)
+ libjasper_la_LDFLAGS = \
+-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+	-no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ all: all-recursive
+ 
--- a/build/windows/jhbuild/patches/jasper-1.900.1-sleep.patch
+++ b/build/windows/jhbuild/patches/jasper-1.900.1-sleep.patch
@ -0,0 +1,18 @@
+diff -rup jasper-1.900.1/src/appl/tmrdemo.c jasper-1.900.1.new/src/appl/tmrdemo.c
+--- jasper-1.900.1/src/appl/tmrdemo.c	2007-01-19 16:43:08.000000000 -0500
+++ jasper-1.900.1.new/src/appl/tmrdemo.c	2008-09-09 09:14:21.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <jasper/jasper.h>
+#include <windows.h>
+ 
+ int main(int argc, char **argv)
+ {
+@@ -43,7 +44,7 @@ int main(int argc, char **argv)
+ 	printf("zero time %.3f us\n", t * 1e6);
+ 
+ 	jas_tmr_start(&tmr);
+-	sleep(1);
+	Sleep(1);
+ 	jas_tmr_stop(&tmr);
+ 	t = jas_tmr_get(&tmr);
+ 	printf("time delay %.8f s\n", t);
--- a/build/windows/jhbuild/patches/json-c-disable-werror.patch
+++ b/build/windows/jhbuild/patches/json-c-disable-werror.patch
@ -0,0 +1,11 @@
+--- a/Makefile.in	2015-03-30 20:34:35.930327000 -0400
+++ b/Makefile.in	2015-03-30 20:34:49.070330097 -0400
+@@ -378,7 +378,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CFLAGS = -Wall -Werror -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
+AM_CFLAGS = -Wall -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
+ EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj
+ SUBDIRS = . tests
+ lib_LTLIBRARIES = libjson-c.la 
--- a/build/windows/jhbuild/patches/libjpeg-turbo-boolean.patch
+++ b/build/windows/jhbuild/patches/libjpeg-turbo-boolean.patch
@ -0,0 +1,11 @@
+--- a/jmorecfg.h	2013-07-23 22:01:08.303919000 -0400
+++ b/jmorecfg.h	2013-07-23 22:48:46.230315172 -0400
+@@ -235,7 +235,7 @@
+  */
+ 
+ #ifndef HAVE_BOOLEAN
+-typedef int boolean;
+typedef unsigned char boolean;
+ #endif
+ #ifndef FALSE			/* in case these macros already exist */
+ #define FALSE	0		/* values of boolean */
--- a/build/windows/jhbuild/patches/libjpeg-turbo-int32.patch
+++ b/build/windows/jhbuild/patches/libjpeg-turbo-int32.patch
@ -0,0 +1,17 @@
+--- a/jmorecfg.h	2013-01-06 12:59:42.000000000 -0500
+++ b/jmorecfg.h	2013-07-23 21:55:22.913095787 -0400
+@@ -160,8 +160,14 @@
+ /* INT32 must hold at least signed 32-bit values. */
+ 
+ #ifndef XMD_H			/* X11/xmd.h correctly defines INT32 */
+#ifndef _BASETSD_H_		/* Microsoft defines it in basetsd.h */
+#ifndef _BASETSD_H		/* MinGW is slightly different */
+#ifndef QGLOBAL_H		/* Qt defines it in qglobal.h */
+ typedef long INT32;
+ #endif
+#endif
+#endif
+#endif
+ 
+ /* Datatype used for image dimensions.  The JPEG standard only supports
+  * images up to 64K*64K due to 16-bit fields in SOF markers.  Therefore
--- a/build/windows/jhbuild/patches/libmng-no-undefined-makefile-in.patch
+++ b/build/windows/jhbuild/patches/libmng-no-undefined-makefile-in.patch
@ -0,0 +1,11 @@
+--- a/Makefile.in	2015-04-03 13:27:40.555911000 -0400
+++ b/Makefile.in	2015-04-03 13:27:56.295616631 -0400
+@@ -369,7 +369,7 @@
+ 
+ # libmng release @VERSION@
+ libmng_la_LDFLAGS = \
+-	-version-number @MNG_MAJOR_NR@:@MNG_MINOR_NR@:@MNG_RELEASE_NR@
+	-version-number @MNG_MAJOR_NR@:@MNG_MINOR_NR@:@MNG_RELEASE_NR@ -no-undefined
+ 
+ lib_LTLIBRARIES = libmng.la
+ include_HEADERS = libmng.h libmng_conf.h libmng_types.h
--- a/build/windows/jhbuild/patches/libmng-no-undefined.diff
+++ b/build/windows/jhbuild/patches/libmng-no-undefined.diff
@ -0,0 +1,11 @@
+--- a/Makefile.am	2013-03-05 06:59:27.000000000 -0500
+++ b/Makefile.am	2013-11-06 19:11:28.139007712 -0500
+@@ -9,7 +9,7 @@
+ 
+ # libmng release @VERSION@
+ libmng_la_LDFLAGS = \
+-	-version-number @MNG_MAJOR_NR@:@MNG_MINOR_NR@:@MNG_RELEASE_NR@
+	-version-number @MNG_MAJOR_NR@:@MNG_MINOR_NR@:@MNG_RELEASE_NR@ -no-undefined
+ 
+ lib_LTLIBRARIES = libmng.la
+ 
--- a/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.3-nodocs.patch
+++ b/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.3-nodocs.patch
@ -0,0 +1,29 @@
+diff -ru libwmf-0.2.8.3.orig/Makefile.am libwmf-0.2.8.3/Makefile.am
+--- libwmf-0.2.8.3.orig/Makefile.am	2002-12-05 17:09:53.000000000 +0000
+++ libwmf-0.2.8.3/Makefile.am	2004-06-11 13:28:56.149819830 +0100
+@@ -1,10 +1,10 @@
+ if LIBWMF_BUILD_ALL
+-DIRHEAVY = . src include fonts doc
+DIRHEAVY = . src include fonts
+ else
+ DIRHEAVY = . src include
+ endif
+ 
+-DIST_SUBDIRS = . src include fonts doc
+DIST_SUBDIRS = . src include fonts
+ 
+ SUBDIRS = $(DIRHEAVY)
+
+--- libwmf-0.2.8.4.orig/Makefile.in	2005-07-28 09:46:20.000000000 +0100
+++ libwmf-0.2.8.4/Makefile.in	2005-07-28 09:46:29.000000000 +0100
+@@ -231,8 +231,8 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ @LIBWMF_BUILD_ALL_FALSE@DIRHEAVY = . src include
+-@LIBWMF_BUILD_ALL_TRUE@DIRHEAVY = . src include fonts doc
+-DIST_SUBDIRS = . src include fonts doc
+@LIBWMF_BUILD_ALL_TRUE@DIRHEAVY = . src include fonts
+DIST_SUBDIRS = . src include fonts
+ SUBDIRS = $(DIRHEAVY)
+ bin_SCRIPTS = libwmf-config
+ WMFEXAMPLES = \
--- a/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.3-relocatablefonts.patch
+++ b/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.3-relocatablefonts.patch
@ -0,0 +1,36 @@
+diff -r -u libwmf-0.2.8.3.old/configure.in libwmf-0.2.8.3/configure.in
+--- libwmf-0.2.8.3.old/configure.in	2004-02-10 12:47:44.000000000 +0000
+++ libwmf-0.2.8.3/configure.in	2004-05-20 14:16:15.804198513 +0100
+@@ -764,14 +764,15 @@
+ 	fi
+ ])
+ 
+-AC_ARG_WITH(fontdir,[  --with-fontdir=DIR      install Type1 fonts in DIR],[
+-	WMF_FONTDIR=$withval
+-],[	if test "x$prefix" = "xNONE"; then
+-		WMF_FONTDIR=$ac_default_prefix/share/$PACKAGE/fonts
+-	else
+-		WMF_FONTDIR=$prefix/share/$PACKAGE/fonts
+-	fi
+-])
+#AC_ARG_WITH(fontdir,[  --with-fontdir=DIR      install Type1 fonts in DIR],[
+#	WMF_FONTDIR=$withval
+#],[	if test "x$prefix" = "xNONE"; then
+#		WMF_FONTDIR=$ac_default_prefix/share/$PACKAGE/fonts
+#	else
+#		WMF_FONTDIR=$prefix/share/$PACKAGE/fonts
+#	fi
+#])
+WMF_FONTDIR=$datadir/$PACKAGE/fonts
+ 
+ AC_ARG_WITH(sysfontmap,[  --with-sysfontmap=FILE  [default is /usr/share/fonts/fontmap]],[
+ 	WMF_SYS_FONTMAP=$withval
+diff -r -u libwmf-0.2.8.3.old/fonts/Makefile.am libwmf-0.2.8.3/fonts/Makefile.am
+--- libwmf-0.2.8.3.old/fonts/Makefile.am	2001-08-11 15:49:27.000000000 +0100
+++ libwmf-0.2.8.3/fonts/Makefile.am	2004-05-20 14:17:22.970701362 +0100
+@@ -1,4 +1,4 @@
+-fontdir = @WMF_FONTDIR@
+fontdir = $(datadir)/libwmf/fonts/
+ 
+ bin_SCRIPTS = libwmf-fontmap
+ 
--- a/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.4-deps.patch
+++ b/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.4-deps.patch
@ -0,0 +1,27 @@
+--- libwmf-0.2.8.3/libwmf-config.in.noextras-2	2004-02-10 06:41:26.000000000 -0600
+++ libwmf-0.2.8.3/libwmf-config.in	2005-07-06 15:18:26.000000000 -0500
+@@ -105,7 +105,7 @@
+ 
+ libwmf_buildstyle=@LIBWMF_BUILDSTYLE@
+ if test $libwmf_buildstyle = heavy; then
+-	wmf_libs="-lwmf -lwmflite $wmf_liblflags"
+	wmf_libs="-lwmf -lwmflite"
+ else
+ 	wmf_libs="-lwmflite"
+ fi
+@@ -116,7 +116,7 @@
+ 		includes="$includes -I@includedir@/libwmf/gd"
+ 	fi
+ 	if test "$lib_wmf" = "yes"; then
+-		includes="$includes -I@includedir@"
+		includes="$includes"
+ 	fi
+ 	echo $includes
+ fi
+@@ -134,5 +134,5 @@
+ 		fi
+ 	done
+ 
+-	echo $libdirs $my_wmf_libs
+	echo $my_wmf_libs
+ fi      
--- a/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.4-fallbackfont.patch
+++ b/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.4-fallbackfont.patch
@ -0,0 +1,18 @@
+diff -ru libwmf-0.2.8.4.orig/src/font.c libwmf-0.2.8.4/src/font.c
+--- libwmf-0.2.8.4.orig/src/font.c	2005-07-27 21:35:06.000000000 +0100
+++ libwmf-0.2.8.4/src/font.c	2006-01-03 12:53:38.000000000 +0000
+@@ -1429,11 +1429,9 @@
+ 	if (GS->len == 0) return (0);
+ 
+ 	name = font->lfFaceName;
+-	if (name == 0)
+-	{	WMF_DEBUG (API,"No font name?");
+-		API->err = wmf_E_Glitch;
+-		return (0);
+-	}
+
+	if (name == 0 || name[0] == 0)
+		name = "Times";
+ 
+ 	/* Find first white-space character or eol
+ 	 */
--- a/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.4-intoverflow.patch
+++ b/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.4-intoverflow.patch
@ -0,0 +1,27 @@
+--- libwmf-0.2.8.4.orig/src/player.c	2002-12-10 19:30:26.000000000 +0000
+++ libwmf-0.2.8.4/src/player.c	2006-07-12 15:12:52.000000000 +0100
+@@ -42,6 +42,7 @@
+ #include "player/defaults.h" /* Provides: default settings               */
+ #include "player/record.h"   /* Provides: parameter mechanism            */
+ #include "player/meta.h"     /* Provides: record interpreters            */
+#include <stdint.h>
+ 
+ /**
+  * @internal
+@@ -132,8 +134,14 @@
+ 		}
+ 	}
+ 
+-/*	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char));
+- */	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
+	if (MAX_REC_SIZE(API) > UINT32_MAX / 2)
+	{
+		API->err = wmf_E_InsMem;
+		WMF_DEBUG (API,"bailing...");
+		return (API->err);
+	}
+	
+ 	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
+ 
+ 	if (ERR (API))
+ 	{	WMF_DEBUG (API,"bailing...");
--- a/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.4-libpng-1.5.patch
+++ b/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.4-libpng-1.5.patch
@ -0,0 +1,12 @@
+diff -urN libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h libwmf-0.2.8.4/src/ipa/ipa/bmp.h
+--- libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h	2011-05-23 19:14:23.000000000 +0200
+++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h	2011-05-23 19:15:11.000000000 +0200
+@@ -66,7 +66,7 @@
+		return;
+	}
+
+-	if (setjmp (png_ptr->jmpbuf))
+	if (setjmp(png_jmpbuf(png_ptr)))
+	{	WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp failed)");
+		png_destroy_write_struct (&png_ptr,&info_ptr);
+		wmf_free (API,buffer);
--- a/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.4-multiarchdevel.patch
+++ b/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.4-multiarchdevel.patch
@ -0,0 +1,130 @@
+--- libwmf-0.2.8.4.orig/configure.in	2006-05-02 09:08:35.000000000 +0100
+++ libwmf-0.2.8.4/configure.in	2006-05-02 09:21:10.000000000 +0100
+@@ -884,7 +884,7 @@
+ src/extra/gd/Makefile
+ src/ipa/Makefile
+ src/convert/Makefile
+-libwmf-config
+libwmf.pc
+ libwmf.spec
+ ])
+ 
+--- /dev/null	2006-04-29 13:38:37.035974750 +0100
+++ libwmf-0.2.8.4/libwmf-config	2006-05-02 09:20:49.000000000 +0100
+@@ -0,0 +1,91 @@
+#!/bin/sh
+
+exec_prefix_set=no
+
+prefix=`pkg-config --variable=prefix libwmf`
+exec_prefix=`pkg-config --variable=exec_prefix libwmf`
+
+usage()
+{
+	cat <<EOF
+Usage: libwmf-config [OPTIONS] [LIBRARIES]
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--version]
+	[--libs]
+	[--cflags]
+Libraries/Headers:
+	gd
+	wmf
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+lib_gd=no
+lib_wmf=yes
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      if test $exec_prefix_set = no ; then
+        exec_prefix=$optarg
+      fi
+      ;;
+    --prefix)
+      echo_prefix=yes
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      exec_prefix_set=yes
+      ;;
+    --exec-prefix)
+      echo_exec_prefix=yes
+      ;;
+    --version)
+      pkg-config --modversion libwmf
+      ;;
+    --cflags)
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    gd)
+      lib_gd=yes
+      ;;
+    wmf)
+      lib_wmf=yes
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+if test "$echo_prefix" = "yes"; then
+	echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+	echo $exec_prefix
+fi
+
+if test "$echo_cflags" = "yes"; then
+    pkg-config --cflags libwmf
+fi
+
+if test "$echo_libs" = "yes"; then
+    pkg-config --libs libwmf
+fi      
+--- /dev/null	2006-04-29 13:38:37.035974750 +0100
+++ libwmf-0.2.8.4/libwmf.pc.in	2006-05-02 09:21:24.000000000 +0100
+@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libwmf
+Description: A library for reading and converting Windows MetaFile vector graphics (WMF)
+Version: @LIBWMF_VERSION@
+Libs: -lwmf -lwmflite @WMF_LIBFLAGS@
+Cflags: @WMF_CONFIG_CFLAGS@
+--- libwmf-0.2.8.4.orig/Makefile.am	2006-05-02 09:08:35.000000000 +0100
+++ libwmf-0.2.8.4/Makefile.am	2006-05-02 09:28:34.000000000 +0100
+@@ -10,6 +10,9 @@
+ 
+ bin_SCRIPTS = libwmf-config
+ 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libwmf.pc
+
+ WMFEXAMPLES = \
+ 	examples/2doorvan.wmf \
+ 	examples/Eg.wmf \
--- a/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.4-reducesymbols.patch
+++ b/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.4-reducesymbols.patch
@ -0,0 +1,520 @@
+diff -ru libwmf-0.2.8.4/src/extra/gd/gd.c libwmf-0.2.8.4.symbols/src/extra/gd/gd.c
+--- libwmf-0.2.8.4/src/extra/gd/gd.c	2005-07-27 21:35:05.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gd.c	2006-11-16 12:27:05.000000000 +0000
+@@ -249,6 +249,7 @@
+   }
+ HWBType;
+ 
+#if 0
+ static HWBType *
+ RGB_to_HWB (RGBType RGB, HWBType * HWB)
+ {
+@@ -308,7 +309,6 @@
+   return diff;
+ }
+ 
+-#if 0
+ /*
+  * This is not actually used, but is here for completeness, in case someone wants to
+  * use the HWB stuff for anything else...
+@@ -355,6 +355,7 @@
+ }
+ #endif
+ 
+#if 0
+ int
+ gdImageColorClosestHWB (gdImagePtr im, int r, int g, int b)
+ {
+@@ -384,6 +385,7 @@
+     }
+   return ct;
+ }
+#endif
+ 
+ int
+ gdImageColorExact (gdImagePtr im, int r, int g, int b)
+@@ -677,7 +679,7 @@
+     }
+ }
+ 
+-int
+static int
+ gdImageGetTrueColorPixel (gdImagePtr im, int x, int y)
+ {
+   int p = gdImageGetPixel (im, x, y);
+@@ -1286,11 +1288,11 @@
+   return len;
+ }
+ 
+-#ifndef HAVE_LSQRT
+#if 0
+ /* If you don't have a nice square root function for longs, you can use
+    ** this hack
+  */
+-long
+static long
+ lsqrt (long n)
+ {
+   long result = (long) sqrt ((double) n);
+@@ -2250,7 +2252,7 @@
+     }
+ }
+ 
+-int gdCompareInt (const void *a, const void *b);
+static int gdCompareInt (const void *a, const void *b);
+ 
+ /* THANKS to Kirsten Schulz for the polygon fixes! */
+ 
+diff -ru libwmf-0.2.8.4/src/extra/gd/gdcache.h libwmf-0.2.8.4.symbols/src/extra/gd/gdcache.h
+--- libwmf-0.2.8.4/src/extra/gd/gdcache.h	2001-08-21 15:40:33.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gdcache.h	2006-11-16 12:13:40.000000000 +0000
+@@ -41,6 +41,9 @@
+ /*********************************************************/
+ 
+ /* #include <malloc.h> */
+
+#pragma GCC visibility push(hidden)
+
+ #ifndef NULL
+ #define NULL (void *)0
+ #endif
+@@ -81,3 +84,5 @@
+ 
+ void *
+ gdCacheGet( gdCache_head_t *head, void *keydata );
+
+#pragma GCC visibility pop
+diff -ru libwmf-0.2.8.4/src/extra/gd/gd_clip.h libwmf-0.2.8.4.symbols/src/extra/gd/gd_clip.h
+--- libwmf-0.2.8.4/src/extra/gd/gd_clip.h	2001-03-28 10:37:30.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gd_clip.h	2006-11-16 12:11:49.000000000 +0000
+@@ -1,6 +1,8 @@
+ #ifndef GD_CLIP_H
+ #define GD_CLIP_H 1
+ 
+#pragma GCC visibility push(hidden)
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -23,4 +25,6 @@
+ }
+ #endif
+ 
+#pragma GCC visibility pop
+
+ #endif /* GD_CLIP_H */
+diff -ru libwmf-0.2.8.4/src/extra/gd/gdfontg.h libwmf-0.2.8.4.symbols/src/extra/gd/gdfontg.h
+--- libwmf-0.2.8.4/src/extra/gd/gdfontg.h	2001-03-28 10:37:30.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gdfontg.h	2006-11-16 12:12:03.000000000 +0000
+@@ -2,6 +2,8 @@
+ #ifndef _GDFONTG_H_
+ #define _GDFONTG_H_ 1
+ 
+#pragma GCC visibility push(hidden)
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -25,5 +27,7 @@
+ }
+ #endif
+ 
+#pragma GCC visibility pop
+
+ #endif
+ 
+diff -ru libwmf-0.2.8.4/src/extra/gd/gdfontl.h libwmf-0.2.8.4.symbols/src/extra/gd/gdfontl.h
+--- libwmf-0.2.8.4/src/extra/gd/gdfontl.h	2001-03-28 10:37:30.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gdfontl.h	2006-11-16 12:12:11.000000000 +0000
+@@ -2,6 +2,8 @@
+ #ifndef _GDFONTL_H_
+ #define _GDFONTL_H_ 1
+ 
+#pragma GCC visibility push(hidden)
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -26,5 +28,7 @@
+ }
+ #endif
+ 
+#pragma GCC visibility pop
+
+ #endif
+ 
+diff -ru libwmf-0.2.8.4/src/extra/gd/gdfontmb.h libwmf-0.2.8.4.symbols/src/extra/gd/gdfontmb.h
+--- libwmf-0.2.8.4/src/extra/gd/gdfontmb.h	2001-03-28 10:37:30.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gdfontmb.h	2006-11-16 12:12:19.000000000 +0000
+@@ -2,6 +2,8 @@
+ #ifndef _GDFONTMB_H_
+ #define _GDFONTMB_H_ 1
+ 
+#pragma GCC visibility push(hidden)
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -24,5 +26,7 @@
+ }
+ #endif
+ 
+#pragma GCC visibility pop
+
+ #endif
+ 
+diff -ru libwmf-0.2.8.4/src/extra/gd/gdfonts.h libwmf-0.2.8.4.symbols/src/extra/gd/gdfonts.h
+--- libwmf-0.2.8.4/src/extra/gd/gdfonts.h	2001-03-28 10:37:30.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gdfonts.h	2006-11-16 12:12:28.000000000 +0000
+@@ -2,6 +2,8 @@
+ #ifndef _GDFONTS_H_
+ #define _GDFONTS_H_ 1
+ 
+#pragma GCC visibility push(hidden)
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -24,5 +26,7 @@
+ }
+ #endif
+ 
+#pragma GCC visibility pop
+
+ #endif
+ 
+diff -ru libwmf-0.2.8.4/src/extra/gd/gdfontt.h libwmf-0.2.8.4.symbols/src/extra/gd/gdfontt.h
+--- libwmf-0.2.8.4/src/extra/gd/gdfontt.h	2001-03-28 10:37:30.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gdfontt.h	2006-11-16 12:12:36.000000000 +0000
+@@ -2,6 +2,8 @@
+ #ifndef _GDFONTT_H_
+ #define _GDFONTT_H_ 1
+ 
+#pragma GCC visibility push(hidden)
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -25,5 +27,7 @@
+ }
+ #endif
+ 
+#pragma GCC visibility pop
+
+ #endif
+ 
+diff -ru libwmf-0.2.8.4/src/extra/gd/gdft.c libwmf-0.2.8.4.symbols/src/extra/gd/gdft.c
+--- libwmf-0.2.8.4/src/extra/gd/gdft.c	2005-07-27 21:35:05.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gdft.c	2006-11-16 12:24:50.000000000 +0000
+@@ -533,7 +533,7 @@
+ }
+ 
+ /* draw_bitmap - transfers glyph bitmap to GD image */
+-/* static */ char *
+static char *
+ gdft_draw_bitmap (gdImage * im, int fg, FT_Bitmap bitmap, int pen_x, int pen_y)
+ {
+   unsigned char *pixel = 0;
+@@ -643,7 +643,7 @@
+   return (char *) NULL;
+ }
+ 
+-int
+static int
+ gdroundupdown (FT_F26Dot6 v1, int updown)
+ {
+   return (!updown)
+@@ -651,7 +651,9 @@
+     : (v1 > 0 ? ((v1 + 63) >> 6) : v1 >> 6);
+ }
+ 
+#pragma GCC visibility push(hidden)
+ extern int any2eucjp (char *, char *, unsigned int);
+#pragma GCC visibility pop
+ 
+ /********************************************************************/
+ /* gdImageStringFT -  render a utf8 string onto a gd image          */
+diff -ru libwmf-0.2.8.4/src/extra/gd/gd_gd2.c libwmf-0.2.8.4.symbols/src/extra/gd/gd_gd2.c
+--- libwmf-0.2.8.4/src/extra/gd/gd_gd2.c	2005-07-27 21:35:05.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gd_gd2.c	2006-11-16 12:21:28.000000000 +0000
+@@ -34,8 +34,10 @@
+   }
+ t_chunk_info;
+ 
+#pragma GCC visibility push(hidden)
+ extern int _gdGetColors (gdIOCtx * in, gdImagePtr im, int gd2xFlag);
+ extern void _gdPutColors (gdImagePtr im, gdIOCtx * out);
+#pragma GCC visibility pop
+ 
+ /* */
+ /* Read the extra info in the gd2 header. */
+diff -ru libwmf-0.2.8.4/src/extra/gd/gd_gd.c libwmf-0.2.8.4.symbols/src/extra/gd/gd_gd.c
+--- libwmf-0.2.8.4/src/extra/gd/gd_gd.c	2005-07-27 21:35:05.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gd_gd.c	2006-11-16 12:21:43.000000000 +0000
+@@ -11,6 +11,11 @@
+ /* Exported functions: */
+ extern void gdImageGd (gdImagePtr im, FILE * out);
+ 
+#pragma GCC visibility push(hidden)
+int _gdGetColors (gdIOCtx * in, gdImagePtr im, int gd2xFlag);
+void _gdPutColors (gdImagePtr im, gdIOCtx * out);
+#pragma GCC visibility pop
+
+ 
+ /* Use this for commenting out debug-print statements. */
+ /* Just use the first '#define' to allow all the prints... */
+diff -ru libwmf-0.2.8.4/src/extra/gd/gd.h libwmf-0.2.8.4.symbols/src/extra/gd/gd.h
+--- libwmf-0.2.8.4/src/extra/gd/gd.h	2002-12-05 20:09:11.000000000 +0000
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gd.h	2006-11-16 12:14:11.000000000 +0000
+@@ -25,6 +25,8 @@
+ #include <gd_io.h>
+ #include <gd_clip.h>
+ 
+#pragma GCC visibility push(hidden)
+
+ /* The maximum number of palette entries in palette-based images.
+ 	In the wonderful new world of gd 2.0, you can of course have
+ 	many more colors when using truecolor mode. */
+@@ -497,6 +499,8 @@
+ /* resolution affects ttf font rendering, particularly hinting */
+ #define GD_RESOLUTION           96      /* pixels per inch */
+ 
+#pragma GCC visibility pop
+
+ #ifdef __cplusplus
+ }
+ #endif
+diff -ru libwmf-0.2.8.4/src/extra/gd/gdhelpers.h libwmf-0.2.8.4.symbols/src/extra/gd/gdhelpers.h
+--- libwmf-0.2.8.4/src/extra/gd/gdhelpers.h	2001-03-28 10:37:31.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gdhelpers.h	2006-11-16 12:12:55.000000000 +0000
+@@ -1,6 +1,8 @@
+ #ifndef GDHELPERS_H 
+ #define GDHELPERS_H 1
+ 
+#pragma GCC visibility push(hidden)
+
+ /* TBB: strtok_r is not universal; provide an implementation of it. */
+ 
+ extern char *gd_strtok_r(char *s, char *sep, char **state);
+@@ -13,5 +15,7 @@
+ void *gdMalloc(size_t size);
+ void *gdRealloc(void *ptr, size_t size);
+ 
+#pragma GCC visibility pop
+
+ #endif /* GDHELPERS_H */
+ 
+diff -ru libwmf-0.2.8.4/src/extra/gd/gd_io.h libwmf-0.2.8.4.symbols/src/extra/gd/gd_io.h
+--- libwmf-0.2.8.4/src/extra/gd/gd_io.h	2001-03-28 10:37:30.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gd_io.h	2006-11-16 12:13:08.000000000 +0000
+@@ -2,6 +2,8 @@
+ #define GD_IO_H 1
+ 
+ #include <stdio.h>
+
+#pragma GCC visibility push(hidden)
+  
+ typedef struct gdIOCtx {
+ 	int	(*getC)(struct gdIOCtx*);
+@@ -36,4 +38,6 @@
+ int gdSeek(gdIOCtx *ctx, const int);
+ long gdTell(gdIOCtx *ctx);
+ 
+#pragma GCC visibility pop
+
+ #endif
+diff -ru libwmf-0.2.8.4/src/extra/gd/gd_jpeg.c libwmf-0.2.8.4.symbols/src/extra/gd/gd_jpeg.c
+--- libwmf-0.2.8.4/src/extra/gd/gd_jpeg.c	2005-07-27 21:35:06.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gd_jpeg.c	2006-11-16 12:28:13.000000000 +0000
+@@ -99,7 +99,7 @@
+   return rv;
+ }
+ 
+-void jpeg_gdIOCtx_dest (j_compress_ptr cinfo, gdIOCtx * outfile);
+static void jpeg_gdIOCtx_dest (j_compress_ptr cinfo, gdIOCtx * outfile);
+ 
+ void
+ gdImageJpegCtx (gdImagePtr im, gdIOCtx * outfile, int quality)
+@@ -266,7 +266,7 @@
+   return im;
+ }
+ 
+-void
+static void
+   jpeg_gdIOCtx_src (j_decompress_ptr cinfo,
+ 		    gdIOCtx * infile);
+ 
+@@ -511,7 +511,7 @@
+  * before any data is actually read.
+  */
+ 
+-void
+static void
+ init_source (j_decompress_ptr cinfo)
+ {
+   my_src_ptr src = (my_src_ptr) cinfo->src;
+@@ -559,7 +559,7 @@
+ 
+ #define END_JPEG_SEQUENCE "\r\n[*]--:END JPEG:--[*]\r\n"
+ 
+-safeboolean
+static safeboolean
+ fill_input_buffer (j_decompress_ptr cinfo)
+ {
+   my_src_ptr src = (my_src_ptr) cinfo->src;
+@@ -627,7 +627,7 @@
+  * buffer is the application writer's problem.
+  */
+ 
+-void
+static void
+ skip_input_data (j_decompress_ptr cinfo, long num_bytes)
+ {
+   my_src_ptr src = (my_src_ptr) cinfo->src;
+@@ -669,7 +669,7 @@
+  * for error exit.
+  */
+ 
+-void
+static void
+ term_source (j_decompress_ptr cinfo)
+ {
+   
+@@ -742,7 +742,7 @@
+  * before any data is actually written.
+  */
+ 
+-void
+static void
+ init_destination (j_compress_ptr cinfo)
+ {
+   my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
+@@ -780,7 +780,7 @@
+  * write it out when emptying the buffer externally.
+  */
+ 
+-safeboolean
+static safeboolean
+ empty_output_buffer (j_compress_ptr cinfo)
+ {
+   my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
+@@ -805,7 +805,7 @@
+  * for error exit.
+  */
+ 
+-void
+static void
+ term_destination (j_compress_ptr cinfo)
+ {
+   my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
+diff -ru libwmf-0.2.8.4/src/extra/gd/gdkanji.c libwmf-0.2.8.4.symbols/src/extra/gd/gdkanji.c
+--- libwmf-0.2.8.4/src/extra/gd/gdkanji.c	2001-05-19 14:09:34.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gdkanji.c	2006-11-16 12:29:42.000000000 +0000
+@@ -555,6 +555,11 @@
+   return kanji;
+ }
+ 
+#pragma GCC visibility push(hidden)
+int
+any2eucjp (unsigned char *dest, unsigned char *src, unsigned int dest_max);
+#pragma GCC visibility pop
+
+ int
+ any2eucjp (unsigned char *dest, unsigned char *src, unsigned int dest_max)
+ {
+diff -ru libwmf-0.2.8.4/src/extra/gd/gd_topal.c libwmf-0.2.8.4.symbols/src/extra/gd/gd_topal.c
+--- libwmf-0.2.8.4/src/extra/gd/gd_topal.c	2005-07-27 21:35:06.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gd_topal.c	2006-11-16 12:25:45.000000000 +0000
+@@ -1129,7 +1129,7 @@
+  * Map some rows of pixels to the output colormapped representation.
+  */
+ 
+-void
+static void
+ pass2_no_dither (gdImagePtr im, my_cquantize_ptr cquantize)
+ /* This version performs no dithering */
+ {
+@@ -1217,7 +1217,7 @@
+ #endif
+ 
+ 
+-void
+static void
+ pass2_fs_dither (gdImagePtr im, my_cquantize_ptr cquantize)
+ 
+ /* This version performs Floyd-Steinberg dithering */
+diff -ru libwmf-0.2.8.4/src/extra/gd/gd_wbmp.c libwmf-0.2.8.4.symbols/src/extra/gd/gd_wbmp.c
+--- libwmf-0.2.8.4/src/extra/gd/gd_wbmp.c	2001-05-19 14:09:34.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gd_wbmp.c	2006-11-16 12:28:33.000000000 +0000
+@@ -67,7 +67,7 @@
+    ** Wrapper around gdPutC for use with writewbmp
+    **
+  */
+-void
+static void
+ gd_putout (int i, void *out)
+ {
+   gdPutC (i, (gdIOCtx *) out);
+@@ -79,7 +79,7 @@
+    ** Wrapper around gdGetC for use with readwbmp
+    **
+  */
+-int
+static int
+ gd_getin (void *in)
+ {
+   return (gdGetC ((gdIOCtx *) in));
+diff -ru libwmf-0.2.8.4/src/extra/gd/gdxpm.c libwmf-0.2.8.4.symbols/src/extra/gd/gdxpm.c
+--- libwmf-0.2.8.4/src/extra/gd/gdxpm.c	2001-05-19 14:09:34.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/gdxpm.c	2006-11-16 12:18:29.000000000 +0000
+@@ -10,6 +10,7 @@
+ #include "gd.h"
+ #include "gdhelpers.h"
+ 
+#if 0
+ #ifndef HAVE_XPM
+ gdImagePtr
+ gdImageCreateFromXpm (char *filename)
+@@ -146,3 +147,4 @@
+   return (im);
+ }
+ #endif
+#endif
+diff -ru libwmf-0.2.8.4/src/extra/gd/jisx0208.h libwmf-0.2.8.4.symbols/src/extra/gd/jisx0208.h
+--- libwmf-0.2.8.4/src/extra/gd/jisx0208.h	2001-03-28 10:37:35.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/jisx0208.h	2006-11-16 12:13:19.000000000 +0000
+@@ -1,5 +1,8 @@
+ #ifndef JISX0208_H
+ #define JISX0208_H
+
+#pragma GCC visibility push(hidden)
+
+ /* This file was derived from "src/VF_Ftype.c" in VFlib2-2.24.2
+    by Dr. Kakugawa */
+ 
+@@ -1202,4 +1205,6 @@
+ 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176, 0x2177,
+ 0x2178, 0x2179, 0xFFE2, 0xFFE4, 0xFF07, 0xFF02}};
+ 
+#pragma GCC visibility pop
+
+ #endif /* JISX0208_H */
+diff -ru libwmf-0.2.8.4/src/extra/gd/wbmp.h libwmf-0.2.8.4.symbols/src/extra/gd/wbmp.h
+--- libwmf-0.2.8.4/src/extra/gd/wbmp.h	2001-03-28 10:37:37.000000000 +0100
+++ libwmf-0.2.8.4.symbols/src/extra/gd/wbmp.h	2006-11-16 12:14:19.000000000 +0000
+@@ -12,6 +12,8 @@
+ #ifndef __WBMP_H
+ #define __WBMP_H	1
+ 
+#pragma GCC visibility push(hidden)
+
+ 
+ /* WBMP struct
+ ** -----------
+@@ -44,4 +46,6 @@
+ void    freewbmp( Wbmp *wbmp );
+ void    printwbmp( Wbmp *wbmp );  
+ 
+#pragma GCC visibility pop
+
+ #endif
--- a/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.4-useafterfree.patch
+++ b/build/windows/jhbuild/patches/libwmf/libwmf-0.2.8.4-useafterfree.patch
@ -0,0 +1,10 @@
+--- libwmf-0.2.8.4/src/extra/gd/gd_clip.c.CVE-2009-1364-im-clip-list	2009-04-24 04:06:44.000000000 -0400
+++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c	2009-04-24 04:08:30.000000000 -0400
+@@ -70,6 +70,7 @@ void gdClipSetAdd(gdImagePtr im,gdClipRe
+ 	{	more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle));
+ 		if (more == 0) return;
+ 		im->clip->max += 8;
+                im->clip->list = more;
+ 	}
+ 	im->clip->list[im->clip->count] = (*rect);
+ 	im->clip->count++;
--- a/build/windows/jhbuild/patches/libxslt-1.1.26-w64.patch
+++ b/build/windows/jhbuild/patches/libxslt-1.1.26-w64.patch
@ -0,0 +1,24 @@
+diff -ur libxslt-1.1.26/configure.in libxslt-1.1.26/configure.in
+--- libxslt-1.1.26/configure.in	2009-09-24 16:27:30.000000000 +0200
+++ libxslt-1.1.26/configure.in	2009-11-11 17:51:06.000000000 +0100
+@@ -627,7 +627,7 @@
+  WIN32_EXTRA_LDFLAGS="-no-undefined"
+  ;;
+  *-*-mingw*)
+- WIN32_EXTRA_LIBADD="-lwsock32"
+ WIN32_EXTRA_LIBADD="-lws2_32 -lmswsock"
+  WIN32_EXTRA_LDFLAGS="-no-undefined"
+  AC_DEFINE([_WINSOCKAPI_],1,[Using the Win32 Socket implementation])
+  AC_DEFINE([snprintf],[_snprintf],[Win32 Std C name mangling work-around])
+Only in libxslt-1.1.26: configure.in.orig
+diff -ur libxslt-1.1.26/libxslt/security.c libxslt-1.1.26/libxslt/security.c
+--- libxslt-1.1.26/libxslt/security.c	2009-08-13 15:04:24.000000000 +0200
+++ libxslt-1.1.26/libxslt/security.c	2009-11-11 17:51:06.000000000 +0100
+@@ -39,6 +39,7 @@
+ #ifndef INVALID_FILE_ATTRIBUTES
+ #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
+ #endif
+#define mkdir(d,m) _mkdir(d)
+ #endif
+ 
+ #ifndef HAVE_STAT
--- a/build/windows/jhbuild/patches/poppler-windows-h.patch
+++ b/build/windows/jhbuild/patches/poppler-windows-h.patch
@ -0,0 +1,10 @@
+--- a/poppler/GlobalParams.cc	2015-07-18 10:25:03.773578000 -0400
+++ b/poppler/GlobalParams.cc	2015-07-18 10:41:42.326920754 -0400
+@@ -56,6 +56,7 @@
+ #  endif
+ #endif
+ #ifdef _WIN32
+#  include <windows.h>
+ #  include <shlobj.h>
+ #  include <mbstring.h>
+ #endif
--- a/build/windows/jhbuild/patches/pthreads-add-install-mk.patch
+++ b/build/windows/jhbuild/patches/pthreads-add-install-mk.patch
@ -0,0 +1,8 @@
+--- a/install.mk	2012-12-30 01:59:23.989187337 -0500
+++ b/install.mk	2012-12-30 15:13:26.126841253 -0500
+@@ -0,0 +1,5 @@
+install:
+	mkdir -p $(DESTDIR)/$(PREFIX)/bin
+	mkdir -p $(DESTDIR)/$(PREFIX)/lib
+	$(INSTALL) pthreadGC2.dll $(DESTDIR)/$(PREFIX)/bin/pthreadGC2.dll
+	$(INSTALL) libpthreadGC2.a $(DESTDIR)/$(PREFIX)/lib/libpthread.a
--- a/build/windows/jhbuild/patches/webkit-2.0-disable-tests.patch
+++ b/build/windows/jhbuild/patches/webkit-2.0-disable-tests.patch
@ -0,0 +1,15 @@
+--- a/Tools/GNUmakefile.am	2013-06-28 11:37:12.433956926 -0400
+++ b/Tools/GNUmakefile.am	2013-06-28 11:40:42.681835206 -0400
+@@ -1,12 +1,6 @@
+ noinst_PROGRAMS += \
+ 	Programs/ImageDiff
+ 
+-if ENABLE_WEBKIT1
+-noinst_PROGRAMS += \
+-	Programs/DumpRenderTree \
+-	Programs/GtkLauncher
+-endif
+-
+ # GtkLauncher
+ Programs_GtkLauncher_CPPFLAGS = \
+ 	-I$(srcdir)/Source/WebKit/gtk \
--- a/build/windows/jhbuild/patches/webkit-add-autogen.patch
+++ b/build/windows/jhbuild/patches/webkit-add-autogen.patch
@ -0,0 +1,31 @@
+--- a/autogen.sh	2012-12-28 01:35:14.039456371 -0500
+++ b/autogen.sh	2012-12-28 20:52:50.687399680 -0500
+@@ -0,0 +1,28 @@
+#! /bin/sh
+
+# Allow invocation from a separate build directory; in that case, we change
+# to the source directory to run the auto*, then change back before running configure
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+rm -f $top_srcdir/autom4te.cache
+
+touch README INSTALL
+
+Tools/gtk/override-feature-defines $ORIGDIR
+
+if test -z `which autoreconf`; then
+    echo "Error: autoreconf not found, please install it."
+    exit 1
+fi
+autoreconf --verbose --install -I Source/autotools $ACLOCAL_FLAGS|| exit $?
+
+cd $ORIGDIR || exit 1
+
+if test -z "$NOCONFIGURE"; then
+    $srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
+fi
+
--- a/build/windows/jhbuild/patches/webkit-fix-freetype.diff
+++ b/build/windows/jhbuild/patches/webkit-fix-freetype.diff
@ -0,0 +1,14 @@
+Index: /trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp
+===================================================================
+--- /trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp	(revision 159938)
+++ /trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp	(revision 159939)
+@@ -40,6 +40,7 @@
+ #include <cairo-ft.h>
+ #include <cairo.h>
+-#include <freetype/freetype.h>
+-#include <freetype/tttables.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_TRUETYPE_TABLES_H
+ #include <hb.h>
+ #include <wtf/text/CString.h>