Mercurial > mxe-octave

changeset 2501:a38c8f7515f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'stable'
author Volker Grabsch <vog@notjusthosting.com>
date Thu, 03 May 2012 23:18:14 +0200
parents 8db5a297f243 (diff) 9a0fd1a69bbe (current diff)
children 72b584e79721
files index.html
diffstat 72 files changed, 1474 insertions(+), 255 deletions(-) [+]
line wrap: on
line diff
--- a/.gitignore	Thu May 03 07:06:55 2012 +1000
+++ b/.gitignore	Thu May 03 23:18:14 2012 +0200
@@ -1,3 +1,4 @@
+/settings.mk
 /usr/
 /log/
 /pkg
--- a/Makefile	Thu May 03 07:06:55 2012 +1000
+++ b/Makefile	Thu May 03 23:18:14 2012 +0200
@@ -68,6 +68,18 @@
         ) \
     > '$(PKG_DIR)/$($(1)_FILE)'
 
+ifeq ($(IGNORE_SETTINGS),yes)
+    $(info [ignore settings.mk])
+else ifeq ($(wildcard $(PWD)/settings.mk),$(PWD)/settings.mk)
+    include $(PWD)/settings.mk
+else
+    $(info [create settings.mk])
+    $(shell { \
+        echo '#JOBS = $(JOBS)'; \
+        echo '#PKGS ='; \
+    } >'$(PWD)/settings.mk')
+endif
+
 .PHONY: all
 all: $(PKGS)
 
--- a/index.html	Thu May 03 07:06:55 2012 +1000
+++ b/index.html	Thu May 03 23:18:14 2012 +0200
@@ -914,6 +914,16 @@
         <td id="agg-website"><a href="http://www.antigrain.com/">Anti-Grain Geometry</a></td>
     </tr>
     <tr>
+        <td id="apr-util-package">apr-util</td>
+        <td id="apr-util-version">1.3.10</td>
+        <td id="apr-util-website"><a href="http://apr.apache.org/">APR-util</a></td>
+    </tr>
+    <tr>
+        <td id="apr-package">apr</td>
+        <td id="apr-version">1.4.2</td>
+        <td id="apr-website"><a href="http://apr.apache.org/">APR</a></td>
+    </tr>
+    <tr>
         <td id="atk-package">atk</td>
         <td id="atk-version">2.2.0</td>
         <td id="atk-website"><a href="http://www.gtk.org/">ATK</a></td>
@@ -974,6 +984,11 @@
         <td id="cgal-website"><a href="http://www.cgal.org/">cgal</a></td>
     </tr>
     <tr>
+        <td id="cminpack-package">cminpack</td>
+        <td id="cminpack-version">1.1.4</td>
+        <td id="cminpack-website"><a href="http://devernay.free.fr/hacks/cminpack/cminpack.html">cminpack</a></td>
+    </tr>
+    <tr>
         <td id="cppunit-package">cppunit</td>
         <td id="cppunit-version">1.12.1</td>
         <td id="cppunit-website"><a href="http://apps.sourceforge.net/mediawiki/cppunit/">CppUnit</a></td>
@@ -1120,7 +1135,7 @@
     </tr>
     <tr>
         <td id="gdb-package">gdb</td>
-        <td id="gdb-version">7.4</td>
+        <td id="gdb-version">7.4.1</td>
         <td id="gdb-website"><a href="http://www.gnu.org/software/gdb/">gdb</a></td>
     </tr>
     <tr>
@@ -1130,7 +1145,7 @@
     </tr>
     <tr>
         <td id="geos-package">geos</td>
-        <td id="geos-version">3.3.2</td>
+        <td id="geos-version">3.3.3</td>
         <td id="geos-website"><a href="http://trac.osgeo.org/geos/">GEOS</a></td>
     </tr>
     <tr>
@@ -1165,7 +1180,7 @@
     </tr>
     <tr>
         <td id="gnutls-package">gnutls</td>
-        <td id="gnutls-version">3.0.17</td>
+        <td id="gnutls-version">3.0.19</td>
         <td id="gnutls-website"><a href="http://www.gnu.org/software/gnutls/">GnuTLS</a></td>
     </tr>
     <tr>
@@ -1239,6 +1254,11 @@
         <td id="guile-website"><a href="http://www.gnu.org/software/guile/">GNU Guile</a></td>
     </tr>
     <tr>
+        <td id="hunspell-package">hunspell</td>
+        <td id="hunspell-version">1.3.2</td>
+        <td id="hunspell-website"><a href="http://hunspell.sourceforge.net/">Hunspell</a></td>
+    </tr>
+    <tr>
         <td id="id3lib-package">id3lib</td>
         <td id="id3lib-version">3.8.3</td>
         <td id="id3lib-website"><a href="http://id3lib.sourceforge.net/">id3lib</a></td>
@@ -1289,6 +1309,11 @@
         <td id="lcms1-website"><a href="http://www.littlecms.com/">lcms1</a></td>
     </tr>
     <tr>
+        <td id="levmar-package">levmar</td>
+        <td id="levmar-version">2.6</td>
+        <td id="levmar-website"><a href="http://www.ics.forth.gr/~lourakis/levmar">levmar</a></td>
+    </tr>
+    <tr>
         <td id="libarchive-package">libarchive</td>
         <td id="libarchive-version">3.0.3</td>
         <td id="libarchive-website"><a href="http://code.google.com/p/libarchive/">Libarchive</a></td>
@@ -1314,8 +1339,13 @@
         <td id="libevent-website"><a href="http://libevent.org/">libevent</a></td>
     </tr>
     <tr>
+        <td id="libf2c-package">libf2c</td>
+        <td id="libf2c-version">1</td>
+        <td id="libf2c-website"><a href="http://www.netlib.org/f2c/">libf2c</a></td>
+    </tr>
+    <tr>
         <td id="libffi-package">libffi</td>
-        <td id="libffi-version">3.0.10</td>
+        <td id="libffi-version">3.0.11</td>
         <td id="libffi-website"><a href="http://sourceware.org/libffi/">libffi</a></td>
     </tr>
     <tr>
@@ -1324,13 +1354,23 @@
         <td id="libgcrypt-website"><a href="ftp://ftp.gnupg.org/gcrypt/libgcrypt/">libgcrypt</a></td>
     </tr>
     <tr>
+        <td id="libgda-package">libgda</td>
+        <td id="libgda-version">4.2.13</td>
+        <td id="libgda-website"><a href="http://www.gnome-db.org/">libgda</a></td>
+    </tr>
+    <tr>
+        <td id="libgdamm-package">libgdamm</td>
+        <td id="libgdamm-version">4.1.3</td>
+        <td id="libgdamm-website"><a href="https://launchpad.net/libgdamm">libgdamm</a></td>
+    </tr>
+    <tr>
         <td id="libgee-package">libgee</td>
         <td id="libgee-version">0.5.0</td>
         <td id="libgee-website"><a href="http://live.gnome.org/Libgee">libgee</a></td>
     </tr>
     <tr>
         <td id="libgeotiff-package">libgeotiff</td>
-        <td id="libgeotiff-version">1.3.0</td>
+        <td id="libgeotiff-version">1.4.0</td>
         <td id="libgeotiff-website"><a href="http://trac.osgeo.org/geotiff/">GeoTiff</a></td>
     </tr>
     <tr>
@@ -1409,6 +1449,11 @@
         <td id="libmng-website"><a href="http://www.libmng.com/">libmng</a></td>
     </tr>
     <tr>
+        <td id="libmodplug-package">libmodplug</td>
+        <td id="libmodplug-version">0.8.8.4</td>
+        <td id="libmodplug-website"><a href="http://modplug-xmms.sourceforge.net/">libmodplug</a></td>
+    </tr>
+    <tr>
         <td id="libntlm-package">libntlm</td>
         <td id="libntlm-version">1.3</td>
         <td id="libntlm-website"><a href="http://www.nongnu.org/libntlm/">Libntlm</a></td>
@@ -1445,7 +1490,7 @@
     </tr>
     <tr>
         <td id="librsvg-package">librsvg</td>
-        <td id="librsvg-version">2.36.0</td>
+        <td id="librsvg-version">2.36.1</td>
         <td id="librsvg-website"><a href="http://librsvg.sourceforge.net/">librsvg</a></td>
     </tr>
     <tr>
@@ -1470,7 +1515,7 @@
     </tr>
     <tr>
         <td id="libssh2-package">libssh2</td>
-        <td id="libssh2-version">1.4.0</td>
+        <td id="libssh2-version">1.4.1</td>
         <td id="libssh2-website"><a href="http://www.libssh2.org">libssh2</a></td>
     </tr>
     <tr>
@@ -1514,8 +1559,13 @@
         <td id="llvm-website"><a href="http://llvm.org/">llvm</a></td>
     </tr>
     <tr>
+        <td id="log4cxx-package">log4cxx</td>
+        <td id="log4cxx-version">0.10.0</td>
+        <td id="log4cxx-website"><a href="http://logging.apache.org/log4cxx/">log4cxx</a></td>
+    </tr>
+    <tr>
         <td id="lua-package">lua</td>
-        <td id="lua-version">5.1.4</td>
+        <td id="lua-version">5.2.0</td>
         <td id="lua-website"><a href="http://www.lua.org/">Lua</a></td>
     </tr>
     <tr>
@@ -1529,6 +1579,11 @@
         <td id="matio-website"><a href="http://sourceforge.net/projects/matio/">matio</a></td>
     </tr>
     <tr>
+        <td id="mdbtools-package">mdbtools</td>
+        <td id="mdbtools-version">0.6pre1</td>
+        <td id="mdbtools-website"><a href="http://sourceforge.net/projects/mdbtools/">mdbtools</a></td>
+    </tr>
+    <tr>
         <td id="mingw-utils-package">mingw-utils</td>
         <td id="mingw-utils-version">0.4-1</td>
         <td id="mingw-utils-website"><a href="http://www.mingw.org/">MinGW Utilities</a></td>
@@ -1545,7 +1600,7 @@
     </tr>
     <tr>
         <td id="muparser-package">muparser</td>
-        <td id="muparser-version">1.34</td>
+        <td id="muparser-version">2.2.2</td>
         <td id="muparser-website"><a href="http://muparser.sourceforge.net/">muParser</a></td>
     </tr>
     <tr>
@@ -1554,6 +1609,11 @@
         <td id="mxml-website"><a href="http://www.minixml.org/">Mini-XML</a></td>
     </tr>
     <tr>
+        <td id="ncurses-package">ncurses</td>
+        <td id="ncurses-version">5.9</td>
+        <td id="ncurses-website"><a href="http://www.gnu.org/software/ncurses/">Ncurses</a></td>
+    </tr>
+    <tr>
         <td id="nettle-package">nettle</td>
         <td id="nettle-version">2.4</td>
         <td id="nettle-website"><a href="http://www.lysator.liu.se/~nisse/nettle/">nettle</a></td>
@@ -1575,7 +1635,7 @@
     </tr>
     <tr>
         <td id="openal-package">openal</td>
-        <td id="openal-version">1.13</td>
+        <td id="openal-version">1.14</td>
         <td id="openal-website"><a href="http://kcat.strangesoft.net/openal.html">openal</a></td>
     </tr>
     <tr>
@@ -1600,7 +1660,7 @@
     </tr>
     <tr>
         <td id="openssl-package">openssl</td>
-        <td id="openssl-version">1.0.1</td>
+        <td id="openssl-version">1.0.1b</td>
         <td id="openssl-website"><a href="http://www.openssl.org/">openssl</a></td>
     </tr>
     <tr>
@@ -1659,6 +1719,11 @@
         <td id="poco-website"><a href="http://pocoproject.org/">POCO C++ Libraries</a></td>
     </tr>
     <tr>
+        <td id="poppler-package">poppler</td>
+        <td id="poppler-version">0.18.4</td>
+        <td id="poppler-website"><a href="http://poppler.freedesktop.org/">poppler</a></td>
+    </tr>
+    <tr>
         <td id="popt-package">popt</td>
         <td id="popt-version">1.16</td>
         <td id="popt-website"><a href="http://freshmeat.net/projects/popt/">popt</a></td>
@@ -1744,6 +1809,11 @@
         <td id="smpeg-website"><a href="http://icculus.org/smpeg/">smpeg</a></td>
     </tr>
     <tr>
+        <td id="sox-package">sox</td>
+        <td id="sox-version">14.4.0</td>
+        <td id="sox-website"><a href="http://sox.sourceforge.net/">SoX</a></td>
+    </tr>
+    <tr>
         <td id="speex-package">speex</td>
         <td id="speex-version">1.2rc1</td>
         <td id="speex-website"><a href="http://www.speex.org/">Speex</a></td>
@@ -1845,7 +1915,7 @@
     </tr>
     <tr>
         <td id="xmlwrapp-package">xmlwrapp</td>
-        <td id="xmlwrapp-version">0.6.2</td>
+        <td id="xmlwrapp-version">0.6.3</td>
         <td id="xmlwrapp-website"><a href="http://sourceforge.net/projects/xmlwrapp/">xmlwrapp</a></td>
     </tr>
     <tr>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/apr-util.mk	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,33 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := apr-util
+$(PKG)_IGNORE   := 1.4.1
+$(PKG)_CHECKSUM := f5aaf15542209fee479679299dc4cb1ac0924a59
+$(PKG)_SUBDIR   := apr-util-$($(PKG)_VERSION)
+$(PKG)_FILE     := apr-util-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://mirror.apache-kr.org/apr/$($(PKG)_FILE)
+$(PKG)_URL_2    := http://archive.apache.org/dist/apr/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc apr expat libiconv
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://apr.apache.org/download.cgi' | \
+    grep 'aprutil1.*best' |
+    $(SED) -n 's,.*APR-util \([0-9.]*\).*,\1,p'
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --host='$(TARGET)' \
+        --build="`config.guess`" \
+        --disable-shared \
+        --enable-static \
+        --without-pgsql \
+        --without-sqlite2 \
+        --without-sqlite3 \
+        --with-apr='$(PREFIX)/$(TARGET)' \
+        CFLAGS=-D_WIN32_WINNT=0x0500
+    $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
+    ln -sf '$(PREFIX)/$(TARGET)/bin/apu-1-config' '$(PREFIX)/bin/$(TARGET)-apu-1-config'
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/apr.mk	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,33 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := apr
+$(PKG)_IGNORE   := 1.4.6
+$(PKG)_CHECKSUM := d48324efb0280749a5d7ccbb053d68545c568b4b
+$(PKG)_SUBDIR   := apr-$($(PKG)_VERSION)
+$(PKG)_FILE     := apr-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://mirror.apache-kr.org/apr/$($(PKG)_FILE)
+$(PKG)_URL_2    := http://archive.apache.org/dist/apr/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://apr.apache.org/download.cgi' | \
+    grep 'apr1.*best' |
+    $(SED) -n 's,.*APR \([0-9.]*\).*,\1,p'
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --host='$(TARGET)' \
+        --build="`config.guess`" \
+        --disable-shared \
+        --enable-static \
+        ac_cv_sizeof_off_t=4 \
+        ac_cv_sizeof_pid_t=4 \
+        ac_cv_sizeof_size_t=4 \
+        ac_cv_sizeof_ssize_t=4 \
+        CFLAGS=-D_WIN32_WINNT=0x0500
+    $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
+    ln -sf '$(PREFIX)/$(TARGET)/bin/apr-1-config' '$(PREFIX)/bin/$(TARGET)-apr-1-config'
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/atk-1-DllMain.patch	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,12 @@
+diff -uNr atk-2.2.0-orig/atk/atkobject.c atk-2.2.0/atk/atkobject.c
+--- atk-2.2.0-orig/atk/atkobject.c	2011-09-19 19:06:54.000000000 +0200
++++ atk-2.2.0/atk/atkobject.c	2012-04-14 20:26:12.763814596 +0200
+@@ -366,7 +366,7 @@
+ static HMODULE atk_dll;
+ 
+ BOOL WINAPI
+-DllMain (HINSTANCE hinstDLL,
++atk_DllMain (HINSTANCE hinstDLL,
+ 	 DWORD     fdwReason,
+ 	 LPVOID    lpvReserved)
+ {
--- a/src/atk.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/atk.mk	Thu May 03 23:18:14 2012 +0200
@@ -3,9 +3,9 @@
 
 PKG             := atk
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 3f4daf31f99b6e0c12ce9675400f2f02dbf1b820
+$(PKG)_CHECKSUM := b9808b77c7905eb46fc2b64587ef93beab37470a
 $(PKG)_SUBDIR   := atk-$($(PKG)_VERSION)
-$(PKG)_FILE     := atk-$($(PKG)_VERSION).tar.bz2
+$(PKG)_FILE     := atk-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/atk/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc glib gettext
 
@@ -18,7 +18,6 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) -i 's,DllMain,static _disabled_DllMain,' '$(1)/atk/atkobject.c'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/atkmm.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/atkmm.mk	Thu May 03 23:18:14 2012 +0200
@@ -3,9 +3,9 @@
 
 PKG             := atkmm
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 9ca44756821f4d431c554e1cf8184989bb25ce12
+$(PKG)_CHECKSUM := 2af04a30dd1f6250d3d35f616bbc34c264b7b327
 $(PKG)_SUBDIR   := atkmm-$($(PKG)_VERSION)
-$(PKG)_FILE     := atkmm-$($(PKG)_VERSION).tar.bz2
+$(PKG)_FILE     := atkmm-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/atkmm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc atk glibmm
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cairo-1-DllMain.patch	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,18 @@
+diff -uNr cairo-1.10.2-orig/src/cairo-system.c cairo-1.10.2/src/cairo-system.c
+--- cairo-1.10.2-orig/src/cairo-system.c	2010-06-18 13:47:14.000000000 +0200
++++ cairo-1.10.2/src/cairo-system.c	2012-04-14 22:01:27.848928137 +0200
+@@ -70,12 +70,12 @@
+ 
+ /* declare to avoid "no previous prototype for 'DllMain'" warning */
+ BOOL WINAPI
+-DllMain (HINSTANCE hinstDLL,
++cairo_DllMain (HINSTANCE hinstDLL,
+          DWORD     fdwReason,
+          LPVOID    lpvReserved);
+ 
+ BOOL WINAPI
+-DllMain (HINSTANCE hinstDLL,
++cairo_DllMain (HINSTANCE hinstDLL,
+          DWORD     fdwReason,
+          LPVOID    lpvReserved)
+ {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cminpack.mk	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := cminpack
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 7a89a0c5c09585823ca4b11bc3eddb13df3fd0c3
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://devernay.free.fr/hacks/cminpack/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://devernay.free.fr/hacks/cminpack/cminpack.html' | \
+    $(SED) -n 's,.*cminpack-\([0-9.]*\)\.tar.*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && cmake \
+        -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'
+    $(MAKE) -C '$(1)' -j $(JOBS)
+
+    $(INSTALL) -d                         '$(PREFIX)/$(TARGET)/lib'
+    $(INSTALL) -m644 '$(1)/libcminpack.a' '$(PREFIX)/$(TARGET)/lib/'
+    $(INSTALL) -d                         '$(PREFIX)/$(TARGET)/include'
+    $(INSTALL) -m644 '$(1)/cminpack.h'    '$(PREFIX)/$(TARGET)/include/'
+endef
--- a/src/gdb-2-fix-makeinfo.patch	Thu May 03 07:06:55 2012 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-This patch has been taken from:
-http://sourceware.org/bugzilla/show_bug.cgi?id=13638
-
-===================================================================
-RCS file: /cvs/src/src/gdb/configure,v
-retrieving revision 1.335.2.2
-retrieving revision 1.335.2.3
-diff -u -r1.335.2.2 -r1.335.2.3
---- src/gdb/configure	2012/02/21 22:03:47	1.335.2.2
-+++ src/gdb/configure	2012/02/21 22:07:40	1.335.2.3
-@@ -995,6 +995,8 @@
- LIBS
- CPPFLAGS
- CPP
-+MAKEINFO
-+MAKEINFOFLAGS
- YACC
- YFLAGS
- XMKMF'
-@@ -1696,6 +1698,9 @@
-   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-               you have headers in a nonstandard directory <include dir>
-   CPP         C preprocessor
-+  MAKEINFO    Parent configure detects if it is of sufficient version.
-+  MAKEINFOFLAGS
-+              Parameters for MAKEINFO.
-   YACC        The `Yet Another C Compiler' implementation to use. Defaults to
-               the first program found out of: `bison -y', `byacc', `yacc'.
-   YFLAGS      The list of arguments that will be passed by default to $YACC.
-@@ -7158,59 +7163,9 @@
- 
- 
- 
--# Do we have a single-tree copy of texinfo?  Even if we do, we can't
--# rely on it - libiberty is built before texinfo.
--# Extract the first word of "makeinfo", so it can be a program name with args.
--set dummy makeinfo; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_MAKEINFO+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$MAKEINFO"; then
--  ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_MAKEINFO="makeinfo"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--fi
--fi
--MAKEINFO=$ac_cv_prog_MAKEINFO
--if test -n "$MAKEINFO"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEINFO" >&5
--$as_echo "$MAKEINFO" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--if test "x$MAKEINFO" = "x"; then
--  as_fn_error "makeinfo is required for compilation" "$LINENO" 5
--else
--  case "$MAKEINFO" in
--    */missing\ makeinfo*)
--      as_fn_error "makeinfo is required for compilation" "$LINENO" 5
--      ;;
--  esac
--fi
--
-+# We never need to detect it in this sub-configure.
-+# But preserve it for config.status --recheck.
- 
--# --split-size=5000000 may be already in $MAKEINFO from parent configure.
--# Re-running configure in gdb/ would lose it so ensure it stays present.
--MAKEINFOFLAGS=${MAKEINFOFLAGS---split-size=5000000}
- 
- 
- MAKEINFO_EXTRA_FLAGS=""
--- a/src/gdb.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/gdb.mk	Thu May 03 23:18:14 2012 +0200
@@ -2,7 +2,7 @@
 # See index.html for further information.
 
 PKG             := gdb
-$(PKG)_CHECKSUM := 43a3ee582eae4d69c2babea4f8700b7bec8e37fa
+$(PKG)_CHECKSUM := 1b0f8c3778d4b10c8d2be6922ac01a9900e8116c
 $(PKG)_SUBDIR   := gdb-$($(PKG)_VERSION)
 $(PKG)_FILE     := gdb-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
--- a/src/gdk-pixbuf-1-fixes.patch	Thu May 03 07:06:55 2012 +1000
+++ b/src/gdk-pixbuf-1-fixes.patch	Thu May 03 23:18:14 2012 +0200
@@ -27,7 +27,7 @@
  
  BOOL WINAPI
 -DllMain (HINSTANCE hinstDLL,
-+static _disabled_DllMain (HINSTANCE hinstDLL,
++gdkpixbuf_DllMain (HINSTANCE hinstDLL,
           DWORD     fdwReason,
           LPVOID    lpvReserved)
  {
--- a/src/geos.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/geos.mk	Thu May 03 23:18:14 2012 +0200
@@ -3,7 +3,7 @@
 
 PKG             := geos
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 942b0bbc61a059bd5269fddd4c0b44a508670cb3
+$(PKG)_CHECKSUM := 2ecd23c38d74e5f04757dc528ec30858006fb6a7
 $(PKG)_SUBDIR   := geos-$($(PKG)_VERSION)
 $(PKG)_FILE     := geos-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://download.osgeo.org/geos/$($(PKG)_FILE)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/glib-2-DllMain.patch	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,59 @@
+diff -uNr glib-2.28.8-orig/gio/giomodule.c glib/gio/giomodule.c
+--- glib-2.28.8-orig/gio/giomodule.c	2011-01-05 22:44:06.000000000 +0100
++++ glib/gio/giomodule.c	2011-11-23 21:04:43.867004895 +0100
+@@ -489,10 +489,8 @@
+ 
+ static HMODULE gio_dll = NULL;
+ 
+-#ifdef DLL_EXPORT
+-
+ BOOL WINAPI
+-DllMain (HINSTANCE hinstDLL,
++gio_DllMain (HINSTANCE hinstDLL,
+ 	 DWORD     fdwReason,
+ 	 LPVOID    lpvReserved)
+ {
+@@ -502,8 +500,6 @@
+   return TRUE;
+ }
+ 
+-#endif
+-
+ #undef GIO_MODULE_DIR
+ 
+ /* GIO_MODULE_DIR is used only in code called just once,
+diff -uNr glib-2.28.8-orig/glib/gutils.c glib/glib/gutils.c
+--- glib-2.28.8-orig/glib/gutils.c	2011-06-06 01:18:49.000000000 +0200
++++ glib/glib/gutils.c	2011-11-23 21:05:07.822988144 +0100
+@@ -144,10 +144,8 @@
+ 
+ static HMODULE glib_dll = NULL;
+ 
+-#ifdef DLL_EXPORT
+-
+ BOOL WINAPI
+-DllMain (HINSTANCE hinstDLL,
++glib_DllMain (HINSTANCE hinstDLL,
+ 	 DWORD     fdwReason,
+ 	 LPVOID    lpvReserved)
+ {
+@@ -157,8 +155,6 @@
+   return TRUE;
+ }
+ 
+-#endif
+-
+ gchar *
+ _glib_get_dll_directory (void)
+ {
+@@ -166,10 +162,8 @@
+   gchar *p;
+   wchar_t wc_fn[MAX_PATH];
+ 
+-#ifdef DLL_EXPORT
+   if (glib_dll == NULL)
+     return NULL;
+-#endif
+ 
+   /* This code is different from that in
+    * g_win32_get_package_installation_directory_of_module() in that
--- a/src/glib.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/glib.mk	Thu May 03 23:18:14 2012 +0200
@@ -3,9 +3,9 @@
 
 PKG             := glib
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 20cd63705a8805260da0320c65b979233f2e3c18
+$(PKG)_CHECKSUM := 9b11968fedf4da45bcd10c4a8c50012d41b3af50
 $(PKG)_SUBDIR   := glib-$($(PKG)_VERSION)
-$(PKG)_FILE     := glib-$($(PKG)_VERSION).tar.bz2
+$(PKG)_FILE     := glib-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/glib/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc gettext pcre libiconv zlib dbus
 
--- a/src/glibmm.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/glibmm.mk	Thu May 03 23:18:14 2012 +0200
@@ -3,9 +3,9 @@
 
 PKG             := glibmm
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := d15bc0fed7dea6fec73746370653687f74e02592
+$(PKG)_CHECKSUM := bd1962c7de710036875a8b6d7ab7b5e5e50fb7af
 $(PKG)_SUBDIR   := glibmm-$($(PKG)_VERSION)
-$(PKG)_FILE     := glibmm-$($(PKG)_VERSION).tar.bz2
+$(PKG)_FILE     := glibmm-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/glibmm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc glib libsigc++
 
--- a/src/gnutls-1-fixes.patch	Thu May 03 07:06:55 2012 +1000
+++ b/src/gnutls-1-fixes.patch	Thu May 03 23:18:14 2012 +0200
@@ -3,11 +3,14 @@
 
 Contains ad hoc patches for cross building.
 
-From 6e89465f1e792f5d527708544cce1ef92ae4669b Mon Sep 17 00:00:00 2001
-From: MXE
+From ef8ca0b0c163a5fbca686a292890479c498607c8 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 28 Oct 2011 09:23:41 +0200
-Subject: [PATCH 1/2] add missing static library linking
+Subject: [PATCH 1/3] add missing static library linking
 
+---
+ lib/gnutls.pc.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
 index c45f8f3..57d0dbb 100644
@@ -25,11 +28,14 @@
 1.7.9.2
 
 
-From aa11a6f645ce93f80fbffd7e72c6964bdfd68542 Mon Sep 17 00:00:00 2001
-From: MXE
+From e90e7ac3a472b0bef5475966ac06d7f2f12c712b Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 24 Nov 2011 15:06:06 +0100
-Subject: [PATCH 2/2] disable doc and test (MXE specific)
+Subject: [PATCH 2/3] disable doc and test (MXE specific)
 
+---
+ Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.am b/Makefile.am
 index 0afe4bd..da7436a 100644
@@ -47,3 +53,31 @@
 -- 
 1.7.9.2
 
+
+From 5f92acf7123fed0e7a2c617a8abea48f00d83c19 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Tue, 3 Apr 2012 13:58:42 +0200
+Subject: [PATCH 3/3] Revert "make dist will also make lzip compressed
+ tarball"
+
+This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f.
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ba60ce8..9af1253 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.0.18], [bug-gnutls@gnu.org])
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz dist-lzip -Wall -Werror -Wno-override])
++AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz -Wall -Werror -Wno-override])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ AM_CONFIG_HEADER(config.h)
+ 
+-- 
+1.7.9.2
+
--- a/src/gnutls.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/gnutls.mk	Thu May 03 23:18:14 2012 +0200
@@ -2,7 +2,7 @@
 # See index.html for further information.
 
 PKG             := gnutls
-$(PKG)_CHECKSUM := 2e2adc41e0c75d8170fdca5955bd007ae93ceada
+$(PKG)_CHECKSUM := df55f60a0426de1f0efb5c1a902e209b069b3d51
 $(PKG)_SUBDIR   := gnutls-$($(PKG)_VERSION)
 $(PKG)_FILE     := gnutls-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnutls.org/pub/gnutls/$($(PKG)_FILE)
--- a/src/gtk2-1-fixes.patch	Thu May 03 07:06:55 2012 +1000
+++ b/src/gtk2-1-fixes.patch	Thu May 03 23:18:14 2012 +0200
@@ -18,7 +18,7 @@
  
  int __stdcall
 -DllMain (HINSTANCE hinstDLL,
-+static _disabled_DllMain (HINSTANCE hinstDLL,
++gdk_DllMain (HINSTANCE hinstDLL,
  	 DWORD     dwReason,
  	 LPVOID    reserved)
  {
@@ -31,7 +31,7 @@
  
  BOOL WINAPI
 -DllMain (HINSTANCE hinstDLL,
-+static _disabled_DllMain (HINSTANCE hinstDLL,
++gtk_DllMain (HINSTANCE hinstDLL,
  	 DWORD     fdwReason,
  	 LPVOID    lpvReserved)
  {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hunspell-test.cpp	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,37 @@
+/*
+ * This file is part of MXE.
+ * See index.html for further information.
+ */
+
+#include <iostream>
+#include <fstream>
+#include <hunspell.hxx>
+
+int main(int argc, char *argv[])
+{
+    (void)argc;
+    (void)argv;
+
+    std::ofstream dic ("hunspell-test.dic");
+    dic << "2\nHello\nWorld";
+    dic.close();
+    std::ofstream aff ("hunspell-test.aff");
+    aff << "SET UTF-8\nTRY loredWH\nMAXDIFF 1";
+    aff.close();
+    Hunspell h("hunspell-test.aff", "hunspell-test.dic");
+
+    if (h.spell("Hello") == 0)
+    {
+        std::cerr << "Error: hunspell marked correct word as wrong" << std::endl;
+    }
+    if (h.spell("wrld") != 0)
+    {
+        std::cerr << "Error: hunspell marked wrong word as correct" << std::endl;
+    }
+
+    char ** result;
+    int n = h.suggest(&result, "ell");
+    for (int i = 0; i < n; i++) std::cout << result[i];
+
+    return 0;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hunspell.mk	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,36 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := hunspell
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 902c76d2b55a22610e2227abc4fd26cbe606a51c
+$(PKG)_SUBDIR   := hunspell-$($(PKG)_VERSION)
+$(PKG)_FILE     := hunspell-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/hunspell/Hunspell/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc libiconv gettext readline pthreads
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://sourceforge.net/projects/hunspell/files/Hunspell/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    # Note: the configure file doesn't pick up pdcurses, so "ui" is disabled
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --enable-static \
+        --disable-shared \
+        --with-warnings \
+        --without-ui \
+        --with-readline \
+        --prefix='$(PREFIX)/$(TARGET)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+
+
+    # Test
+    '$(TARGET)-g++' \
+        -W -Wall -Werror -ansi -pedantic \
+        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-hunspell.exe' \
+        `'$(TARGET)-pkg-config' hunspell --cflags --libs`
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lapack-test.f	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,10 @@
+*
+* This file is part of MXE.
+* See index.html for further information.
+*
+      INTEGER MAJOR, MINOR, PATCH
+*
+      CALL ILAVER ( MAJOR,MINOR, PATCH )
+      WRITE(*,*) "LAPACK ",MAJOR,".",MINOR,".",PATCH
+*
+      END
--- a/src/lapack.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/lapack.mk	Thu May 03 23:18:14 2012 +0200
@@ -2,7 +2,7 @@
 # See index.html for further information.
 
 PKG             := lapack
-$(PKG)_IGNORE   :=
+$(PKG)_IGNORE   := 3.4.1
 $(PKG)_CHECKSUM := 910109a931524f8dcc2734ce23fe927b00ca199f
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tgz
@@ -20,6 +20,12 @@
     cd '$(1)' && cmake \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DCMAKE_AR='$(PREFIX)/bin/$(TARGET)-ar' \
+        -DCMAKE_RANLIB='$(PREFIX)/bin/$(TARGET)-ranlib' \
         .
     $(MAKE) -C '$(1)/SRC' -j '$(JOBS)' install
+
+    '$(TARGET)-gfortran' \
+        -W -Wall -Werror -pedantic \
+        '$(2).f' -o '$(PREFIX)/$(TARGET)/bin/test-lapack.exe' \
+        -llapack
 endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/levmar.mk	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,25 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := levmar
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 118bd20b55ab828d875f1b752cb5e1238258950b
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tgz
+$(PKG)_URL      := http://www.ics.forth.gr/~lourakis/$(PKG)/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc lapack blas libf2c
+
+define $(PKG)_UPDATE
+    wget -q -O- "http://www.ics.forth.gr/~lourakis/levmar/"  | \
+    $(SED) -n 's_.*Latest:.*levmar-\([0-9]\.[0-9]\).*_\1_ip' | \
+    head -1;
+endef
+
+define $(PKG)_BUILD
+    $(MAKE) -C '$(1)' -j '$(JOBS)' liblevmar.a \
+        CC=$(TARGET)-gcc \
+        AR=$(TARGET)-ar \
+        RANLIB=$(TARGET)-ranlib
+    $(INSTALL) -m644 '$(1)/levmar.h'    '$(PREFIX)/$(TARGET)/include/'
+    $(INSTALL) -m644 '$(1)/liblevmar.a' '$(PREFIX)/$(TARGET)/lib/'
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libf2c-1.patch	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,59 @@
+This file is part of MXE.
+See index.html for further information.
+
+diff -ur libf2c.orig/makefile.u libf2c/makefile.u
+--- libf2c.orig/makefile.u	2012-05-04 01:39:36.000000000 +1000
++++ libf2c/makefile.u	2012-05-04 01:45:30.000000000 +1000
+@@ -20,7 +20,7 @@
+ # compile, then strip unnecessary symbols
+ .c.o:
+ 	$(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c
+-	ld -r -x -o $*.xxx $*.o
++	$(LD) -r -x -o $*.xxx $*.o
+ 	mv $*.xxx $*.o
+ ## Under Solaris (and other systems that do not understand ld -x),
+ ## omit -x in the ld line above.
+@@ -72,8 +72,8 @@
+ all: f2c.h signal1.h sysdep1.h libf2c.a
+
+ libf2c.a: $(OFILES)
+-	ar r libf2c.a $?
+-	-ranlib libf2c.a
++	$(AR) r libf2c.a $?
++	-$(RANLIB) libf2c.a
+
+ ## Shared-library variant: the following rule works on Linux
+ ## systems.  Details are system-dependent.  Under Linux, -fPIC
+@@ -123,7 +123,7 @@
+
+ install: libf2c.a
+ 	cp libf2c.a $(LIBDIR)
+-	-ranlib $(LIBDIR)/libf2c.a
++	-$(RANLIB) $(LIBDIR)/libf2c.a
+
+ clean:
+ 	rm -f libf2c.a *.o arith.h signal1.h sysdep1.h
+@@ -182,12 +182,6 @@
+ xwsne.o:	lio.h
+ xwsne.o:	fmt.h
+
+-arith.h: arithchk.c
+-	$(CC) $(CFLAGS) -DNO_FPINIT arithchk.c -lm ||\
+-	 $(CC) -DNO_LONG_LONG $(CFLAGS) -DNO_FPINIT arithchk.c -lm
+-	./a.out >arith.h
+-	rm -f a.out arithchk.o
+-
+ check:
+ 	xsum Notice README abort_.c arithchk.c backspac.c c_abs.c c_cos.c \
+ 	c_div.c c_exp.c c_log.c c_sin.c c_sqrt.c cabs.c close.c comptry.bat \
+
+diff -urN tmp-libf2c.orig/arith.h tmp-libf2c/arith.h
+--- tmp-libf2c.orig/arith.h	1970-01-01 10:00:00.000000000 +1000
++++ tmp-libf2c/arith.h	2012-05-04 01:16:16.000000000 +1000
+@@ -0,0 +1,5 @@
++#define IEEE_8087
++#define Arith_Kind_ASL 1
++#define Double_Align
++#define QNaN0 0x0
++#define QNaN1 0xfff80000
++
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libf2c.mk	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,25 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := libf2c
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := f71066b41695738dec2261de71eaf02a1aaffe8b
+$(PKG)_SUBDIR   :=
+$(PKG)_FILE     := $(PKG).zip
+$(PKG)_URL      := http://www.netlib.org/f2c/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc
+
+define $(PKG)_UPDATE
+    echo 1
+endef
+
+define $(PKG)_BUILD
+    $(MAKE) -C '$(1)' -j '$(JOBS)' -f makefile.u \
+        CC=$(TARGET)-gcc \
+        AR=$(TARGET)-ar \
+        LD=$(TARGET)-ld \
+        RANLIB=$(TARGET)-ranlib \
+        CFLAGS='-O -DUSE_CLOCK'
+    $(INSTALL) -m644 '$(1)/libf2c.a' '$(PREFIX)/$(TARGET)/lib'
+    $(INSTALL) -m644 '$(1)/f2c.h'    '$(PREFIX)/$(TARGET)/include'
+endef
--- a/src/libffi.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/libffi.mk	Thu May 03 23:18:14 2012 +0200
@@ -3,7 +3,7 @@
 
 PKG             := libffi
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 97abf70e6a6d315d9259d58ac463663051d471e1
+$(PKG)_CHECKSUM := bff6a6c886f90ad5e30dee0b46676e8e0297d81d
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://sourceware.org/pub/$(PKG)/$($(PKG)_FILE)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libgcrypt-test.c	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,32 @@
+/*
+ * This file is part of MXE.
+ * See index.html for further information.
+ */
+
+#include <stdio.h>
+#include <gcrypt.h>
+
+int main(int argc, char *argv[])
+{
+    (void)argc;
+    (void)argv;
+
+    if (!gcry_check_version (GCRYPT_VERSION)) {
+        fputs ("libgcrypt version mismatch\n", stderr);
+        exit (2);
+    }
+
+    gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
+    gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0);
+    gcry_control (GCRYCTL_RESUME_SECMEM_WARN);
+    gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
+
+    if (!gcry_control (GCRYCTL_INITIALIZATION_FINISHED_P)) {
+       fputs ("libgcrypt has not been initialized\n", stderr);
+       abort ();
+    }
+
+    printf("gcrypt version: %s", GCRYPT_VERSION );
+
+    return 0;
+}
--- a/src/libgcrypt.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/libgcrypt.mk	Thu May 03 23:18:14 2012 +0200
@@ -24,4 +24,10 @@
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-gpg-error-prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    ln -sf '$(PREFIX)/$(TARGET)/bin/libgcrypt-config' '$(PREFIX)/bin/$(TARGET)-libgcrypt-config'
+
+    '$(TARGET)-gcc' \
+        -W -Wall -Werror -ansi -pedantic \
+        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libgcrypt.exe' \
+        `$(TARGET)-libgcrypt-config --cflags --libs`
 endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libgda.mk	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,34 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+# LibGDA
+PKG             := libgda
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 61d0b498202b780750633cc2e957c40325d6c705
+$(PKG)_SUBDIR   := libgda-$($(PKG)_VERSION)
+$(PKG)_FILE     := libgda-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/libgda/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc glib libxml2 mdbtools postgresql
+
+define $(PKG)_UPDATE
+    echo 'TODO: Updates for package libgda need to be fixed.' >&2;
+    echo $(libgda_VERSION)
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --disable-shared \
+        --disable-gtk-doc \
+        --without-bdb \
+        --with-mdb \
+        --without-oracle \
+        --without-mysql \
+        --without-firebird \
+        --without-java \
+        --enable-binreloc \
+        --disable-crypto
+    $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libgdamm.mk	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,28 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+# libgdamm
+PKG             := libgdamm
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := f6126d7b46720e3ea4f3d49e03add2e52da233be
+$(PKG)_SUBDIR   := libgdamm-$($(PKG)_VERSION)
+$(PKG)_FILE     := libgdamm-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/libgdamm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc libgda glibmm
+
+define $(PKG)_UPDATE
+    echo 'TODO: Updates for package libgdamm need to be fixed.' >&2;
+    echo $(libgdamm_VERSION)
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --build="`config.guess`" \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        CXX='$(TARGET)-c++' \
+        PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
+        MAKE=$(MAKE)
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+endef
--- a/src/libgeotiff.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/libgeotiff.mk	Thu May 03 23:18:14 2012 +0200
@@ -3,7 +3,7 @@
 
 PKG             := libgeotiff
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := b8cde5014cf82fe4683fa35fc81a5ea8d64b940f
+$(PKG)_CHECKSUM := 4c6f405869826bb7d9f35f1d69167e3b44a57ef0
 $(PKG)_SUBDIR   := libgeotiff-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgeotiff-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://download.osgeo.org/geotiff/libgeotiff/$($(PKG)_FILE)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libmodplug-test.c	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,17 @@
+/*
+ * This file is part of MXE.
+ * See index.html for further information.
+ */
+
+#include <modplug.h>
+
+int main(int argc, char *argv[])
+{
+    (void)argc;
+    (void)argv;
+
+    ModPlug_Settings settings;
+    ModPlug_GetSettings(&settings);
+    ModPlug_SetSettings(&settings);
+    return 0;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libmodplug.mk	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,31 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+# libmodplug
+PKG             := libmodplug
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := df4deffe542b501070ccb0aee37d875ebb0c9e22
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/modplug-xmms/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://sourceforge.net/projects/modplug-xmms/files/libmodplug/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --disable-shared \
+        --enable-static \
+        --prefix='$(PREFIX)/$(TARGET)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+
+    '$(TARGET)-gcc' \
+        -W -Wall -ansi -pedantic \
+        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libmodplug.exe' \
+        `'$(TARGET)-pkg-config' libmodplug --cflags --libs`
+endef
--- a/src/librsvg.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/librsvg.mk	Thu May 03 23:18:14 2012 +0200
@@ -3,7 +3,7 @@
 
 PKG             := librsvg
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 11a2dc00c813da13532d7f16a822b414201e8b1b
+$(PKG)_CHECKSUM := 1084015373e90ff8fccbae4b27ee778bbdf14d40
 $(PKG)_SUBDIR   := librsvg-$($(PKG)_VERSION)
 $(PKG)_FILE     := librsvg-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
--- a/src/libsigc++.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/libsigc++.mk	Thu May 03 23:18:14 2012 +0200
@@ -3,9 +3,9 @@
 
 PKG             := libsigc++
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 240d3e0a02e764a6362f6ce1b32de71401e50844
+$(PKG)_CHECKSUM := 493d6e60c08bd8ec3688478d176e04b5713ced2a
 $(PKG)_SUBDIR   := libsigc++-$($(PKG)_VERSION)
-$(PKG)_FILE     := libsigc++-$($(PKG)_VERSION).tar.bz2
+$(PKG)_FILE     := libsigc++-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/libsigc++/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
--- a/src/libssh2-1-fixes.patch	Thu May 03 07:06:55 2012 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-From b3ade9a63e881e69b4c9cfe7b5dbad78dcc4a0e0 Mon Sep 17 00:00:00 2001
-From: Peter Stuge <peter@stuge.se>
-Date: Wed, 1 Feb 2012 09:53:44 +0100
-Subject: [PATCH] Fix undefined reference to _libssh_error in libgcrypt
- backend
-
-Commit 209de22299b4b58e582891dfba70f57e1e0492db introduced a function
-call to a non-existing function, and since then the libgcrypt backend
-has not been buildable.
----
- src/libgcrypt.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/libgcrypt.c b/src/libgcrypt.c
-index 1bda5ee..5c2787b 100644
---- a/src/libgcrypt.c
-+++ b/src/libgcrypt.c
-@@ -581,7 +581,7 @@ _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session,
-                           const char *privatekey,
-                           const char *passphrase)
- {
--    return _libssh_error(session, LIBSSH2_ERROR_FILE,
-+    return _libssh2_error(session, LIBSSH2_ERROR_FILE,
-                          "Unable to extract public key from private key file: "
-                          "Method unimplemented in libgcrypt backend");
- }
--- 
-1.7.8.3
-
--- a/src/libssh2.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/libssh2.mk	Thu May 03 23:18:14 2012 +0200
@@ -3,7 +3,7 @@
 
 PKG             := libssh2
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 53428b4935ab6eb843d45f1593dc434cb287b93e
+$(PKG)_CHECKSUM := a5c59eac66f5686f3960f59dcb54b5bf3b339811
 $(PKG)_SUBDIR   := libssh2-$($(PKG)_VERSION)
 $(PKG)_FILE     := libssh2-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.libssh2.org/download/$($(PKG)_FILE)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/log4cxx-1-gcc.4.4.patch	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,47 @@
+This file is part of MXE.
+See index.html for further information.
+
+These changes have already been applied to log4cxx trunk to update inclusions
+for recent gcc's.
+
+diff -NBaur vanilla/src/examples/cpp/console.cpp mingw_cross/src/examples/cpp/console.cpp
+--- vanilla/src/examples/cpp/console.cpp	2008-04-01 07:34:52.000000000 +0900
++++ mingw_cross/src/examples/cpp/console.cpp	2011-05-09 10:27:52.923808248 +0900
+@@ -15,6 +15,7 @@
+  * limitations under the License.
+  */
+ 
++#include <cstdio>
+ #include <stdlib.h>
+ #include <log4cxx/logger.h>
+ #include <log4cxx/consoleappender.h>
+@@ -22,6 +23,7 @@
+ #include <log4cxx/logmanager.h>
+ #include <iostream>
+ #include <locale.h>
++#include <string.h>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
+diff -NBaur vanilla/src/main/cpp/inputstreamreader.cpp mingw_cross/src/main/cpp/inputstreamreader.cpp
+--- vanilla/src/main/cpp/inputstreamreader.cpp	2008-04-01 07:34:09.000000000 +0900
++++ mingw_cross/src/main/cpp/inputstreamreader.cpp	2011-05-09 10:27:27.991842868 +0900
+@@ -20,6 +20,7 @@
+ #include <log4cxx/helpers/exception.h>
+ #include <log4cxx/helpers/pool.h>
+ #include <log4cxx/helpers/bytebuffer.h>
++#include <string.h>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
+diff -NBaur vanilla/src/main/cpp/socketoutputstream.cpp mingw_cross/src/main/cpp/socketoutputstream.cpp
+--- vanilla/src/main/cpp/socketoutputstream.cpp	2008-04-01 07:34:09.000000000 +0900
++++ mingw_cross/src/main/cpp/socketoutputstream.cpp	2011-05-09 10:27:27.999058156 +0900
+@@ -19,6 +19,7 @@
+ #include <log4cxx/helpers/socketoutputstream.h>
+ #include <log4cxx/helpers/socket.h>
+ #include <log4cxx/helpers/bytebuffer.h>
++#include <string.h>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/log4cxx-2-pkgconfig.patch	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,19 @@
+This file is part of MXE.
+See index.html for further information.
+
+This patch ensures that the correct dependencies can always be found for
+static mingw builds. Submitted upstream: 
+
+   https://issues.apache.org/jira/browse/LOGCXX-381
+
+diff -NBaur vanilla/liblog4cxx.pc.in mingw_cross/liblog4cxx.pc.in
+--- vanilla/liblog4cxx.pc.in	2008-04-01 07:34:52.000000000 +0900
++++ mingw_cross/liblog4cxx.pc.in	2011-05-09 10:31:00.175584637 +0900
+@@ -20,6 +20,7 @@
+ Name: log4cxx
+ Description: log4cxx C++ logging framework
+ Version: @VERSION@
++Requires: apr-util-1, apr-1
+ Libs: -L${libdir} -llog4cxx
+ Cflags: -I${includedir}
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/log4cxx-3-warnings.patch	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,20 @@
+This file is part of MXE.
+See index.html for further information.
+
+Already applied to log4cxx trunk.
+
+diff -NBaur vanilla/src/main/include/log4cxx/helpers/objectptr.h mingw_cross/src/main/include/log4cxx/helpers/objectptr.h
+--- vanilla/src/main/include/log4cxx/helpers/objectptr.h	2008-04-01 07:34:26.000000000 +0900
++++ mingw_cross/src/main/include/log4cxx/helpers/objectptr.h	2011-05-09 10:30:03.767560165 +0900
+@@ -28,9 +28,9 @@
+ //   switching between the initialization styles.
+ //
+ #if LOG4CXX_HELGRIND
+-#define _LOG4CXX_OBJECTPTR_INIT(x) { exchange(x); 
++#define _LOG4CXX_OBJECTPTR_INIT(x) : ObjectPtrBase() { exchange(x); 
+ #else
+-#define _LOG4CXX_OBJECTPTR_INIT(x) : p(x) {
++#define _LOG4CXX_OBJECTPTR_INIT(x) : ObjectPtrBase(), p(x) {
+ #endif
+ 
+ namespace log4cxx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/log4cxx-4-mingw.definitions.patch	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,28 @@
+This file is part of MXE.
+See index.html for further information.
+
+Fixes a problem with the mismatched calling conventions in apr and log4cxx.
+See http://www.mail-archive.com/log4cxx-user@logging.apache.org/msg02671.html
+Submitted upstream:
+
+  https://issues.apache.org/jira/browse/LOGCXX-382
+
+diff -NBaur vanilla/src/main/include/log4cxx/helpers/thread.h mingw_cross/src/main/include/log4cxx/helpers/thread.h
+--- vanilla/src/main/include/log4cxx/helpers/thread.h	2008-04-01 07:34:26.000000000 +0900
++++ mingw_cross/src/main/include/log4cxx/helpers/thread.h	2011-05-09 11:08:23.123558232 +0900
+@@ -23,9 +23,13 @@
+ 
+ #if !defined(LOG4CXX_THREAD_FUNC)
+ #if defined(_WIN32)
+-#define LOG4CXX_THREAD_FUNC __stdcall
++  #if defined(__MINGW32__)
++    #define LOG4CXX_THREAD_FUNC
++  #else
++    #define LOG4CXX_THREAD_FUNC __stdcall
++  #endif
+ #else
+-#define LOG4CXX_THREAD_FUNC
++  #define LOG4CXX_THREAD_FUNC
+ #endif
+ #endif
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/log4cxx-5-cmake.patch	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,17 @@
+This file is part of MXE.
+See index.html for further information.
+
+diff -NBaur vanilla/log4cxx-config.cmake mingw_cross/log4cxx-config.cmake
+--- vanilla/log4cxx-config.cmake	1970-01-01 09:00:00.000000000 +0900
++++ mingw_cross/log4cxx-config.cmake	2012-03-14 15:29:54.706247316 +0900
+@@ -0,0 +1,10 @@
++
++set(LOG4CXX_VERSION 0.10.0)
++
++get_filename_component(LOG4CXX_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
++
++set(LOG4CXX_INCLUDE_DIR "${LOG4CXX_CMAKE_DIR}/../../../include" CACHE FILEPATH "Log4cxx include directory")
++set(LOG4CXX_INCLUDE_DIRS "${LOG4CXX_INCLUDE_DIR}")
++set(LOG4CXX_LIBRARY_DIRS "${LOG4CXX_CMAKE_DIR}/../../../lib")
++set(LOG4CXX_LIBRARIES "log4cxx;aprutil-1;iconv;expat;apr-1;rpcrt4;shell32;ws2_32;advapi32;kernel32;msvcrt")
++
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/log4cxx-test.cpp	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,33 @@
+/*
+ * This file is part of MXE.
+ * See index.html for further information.
+ */
+
+#include <cstdlib>
+#include "log4cxx/logger.h"
+#include "log4cxx/basicconfigurator.h"
+#include "log4cxx/helpers/exception.h"
+
+using namespace log4cxx;
+using namespace log4cxx::helpers;
+
+LoggerPtr logger(Logger::getLogger("MXE"));
+
+int main(int argc, char **argv)
+{
+    (void)argc;
+    (void)argv;
+
+    int result = EXIT_SUCCESS;
+    try
+    {
+        BasicConfigurator::configure();
+        LOG4CXX_INFO(logger, "Hello World!");
+    }
+    catch(Exception&)
+    {
+        result = EXIT_FAILURE;
+    }
+
+    return result;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/log4cxx.mk	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,37 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := log4cxx
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := d79c053e8ac90f66c5e873b712bb359fd42b648d
+$(PKG)_SUBDIR   := apache-log4cxx-$($(PKG)_VERSION)
+$(PKG)_FILE     := apache-log4cxx-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://apache.naggo.co.kr/logging/log4cxx/0.10.0/$($(PKG)_FILE)
+$(PKG)_URL_2    := http://apache.mirror.cdnetworks.com//logging/log4cxx/0.10.0/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc apr-util
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://logging.apache.org/log4cxx/download.html' | \
+    $(SED) -n 's,.*log4cxx-\([0-9.]*\)\.tar.*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --host='$(TARGET)' \
+        --disable-shared \
+        --enable-static \
+        --with-apr='$(PREFIX)/$(TARGET)' \
+        --with-apr-util='$(PREFIX)/$(TARGET)' \
+        CFLAGS=-D_WIN32_WINNT=0x0500 \
+        CXXFLAGS=-D_WIN32_WINNT=0x0500
+    $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
+    mkdir -p '$(PREFIX)/$(TARGET)/share/cmake/log4cxx'
+    cp '$(1)/log4cxx-config.cmake' '$(PREFIX)/$(TARGET)/share/cmake/log4cxx/log4cxx-config.cmake'
+
+    '$(TARGET)-g++' \
+        -W -Wall -Werror -ansi -pedantic \
+        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-log4cxx.exe' \
+        `i686-pc-mingw32-pkg-config liblog4cxx --libs`
+endef
--- a/src/lua-test.c	Thu May 03 07:06:55 2012 +1000
+++ b/src/lua-test.c	Thu May 03 23:18:14 2012 +0200
@@ -14,7 +14,7 @@
     (void)argc;
     (void)argv;
 
-    L = lua_open();
+    L = luaL_newstate();
     lua_close(L);
     return 0;
 }
--- a/src/lua.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/lua.mk	Thu May 03 23:18:14 2012 +0200
@@ -3,7 +3,7 @@
 
 PKG             := lua
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 2b11c8e60306efb7f0734b747588f57995493db7
+$(PKG)_CHECKSUM := 08f84c355cdd646f617f09cebea48bd832415829
 $(PKG)_SUBDIR   := lua-$($(PKG)_VERSION)
 $(PKG)_FILE     := lua-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.lua.org/ftp/$($(PKG)_FILE)
@@ -29,12 +29,9 @@
         TO_BIN='lua.h' \
         INSTALL='$(INSTALL)' \
         install
-    $(SED) -i 's,^prefix=.*,prefix=$(PREFIX)/$(TARGET),' '$(1)/etc/lua.pc'
-    $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'
-    $(INSTALL) -m644 '$(1)/etc/lua.pc' '$(PREFIX)/$(TARGET)/lib/pkgconfig/lua.pc'
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
         '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-lua.exe' \
-        `'$(TARGET)-pkg-config' lua --cflags --libs`
+        -llua
 endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mdbtools-1-header.patch	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,15 @@
+This file is part of MXE.
+See index.html for further information.
+
+diff -ur mdbtools-0.6pre1-orig//include/mdbtools.h mdbtools-0.6pre1//include/mdbtools.h
+--- mdbtools-0.6pre1-orig//include/mdbtools.h	2011-06-01 00:07:12.336088034 +0900
++++ mdbtools-0.6pre1//include/mdbtools.h	2011-06-01 00:10:51.536088143 +0900
+@@ -147,7 +147,7 @@
+ #define IS_JET3(mdb) (mdb->f->jet_version==MDB_VER_JET3)
+
+ /* hash to store registered backends */
+-extern GHashTable	*mdb_backends;
++static GHashTable	*mdb_backends;
+
+ /* forward declarations */
+ typedef struct mdbindex MdbIndex;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mdbtools.mk	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,26 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+# mdbtools
+PKG             := mdbtools
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 37a50d623a444ec690d2677b12b59c2f11e497c0
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc glib
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://sourceforge.net/projects/mdbtools/files/mdbtools/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA=
+endef
--- a/src/muparser.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/muparser.mk	Thu May 03 23:18:14 2012 +0200
@@ -3,9 +3,9 @@
 
 PKG             := muparser
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := d6d834d3ba2bd3c316c9b3070369d32701703f78
-$(PKG)_SUBDIR   := $(PKG)_v$(subst .,,$($(PKG)_VERSION))
-$(PKG)_FILE     := $(PKG)_v$(subst .,,$($(PKG)_VERSION)).tar.gz
+$(PKG)_CHECKSUM := 830383b1bcfa706be5a6ac8b7ba43f32f16a1497
+$(PKG)_SUBDIR   := $(PKG)_v$(subst .,_,$($(PKG)_VERSION))
+$(PKG)_FILE     := $(PKG)_v$(subst .,_,$($(PKG)_VERSION)).zip
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/Version $($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ncurses.mk	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,34 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+# ncurses
+PKG             := ncurses
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 3e042e5f2c7223bffdaac9646a533b8c758b65b5
+$(PKG)_SUBDIR   := ncurses-$($(PKG)_VERSION)
+$(PKG)_FILE     := ncurses-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://ftp.gnu.org/pub/gnu/ncurses/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://ftp.gnu.org/pub/gnu/ncurses/?C=M;O=D' | \
+    $(SED) -n 's,.*<a href="ncurses-\([0-9][^"]*\)\.tar.*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --prefix=$(PREFIX)/$(TARGET) \
+        --disable-home-terminfo \
+        --enable-sp-funcs \
+        --enable-term-driver \
+        --enable-interop \
+        --without-debug \
+        --without-ada \
+        --without-manpages \
+        --enable-pc-files \
+        --with-normal \
+        --without-shared
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/openal-1-fixes.patch	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,29 @@
+This file is part of MXE.
+See index.html for further information.
+
+Contains ad hoc patches for cross building.
+
+From b5c7c4853307964f0b8e11e2c9edb5bf0f8511f7 Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Tue, 3 Apr 2012 14:36:58 +0200
+Subject: [PATCH] add static private dependencies to pkg-config for cmake
+
+---
+ CMakeLists.txt |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ef3d08d..88de1e5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -543,6 +543,7 @@ IF(DSOUND)
+                 SET(BACKENDS  "${BACKENDS} DirectSound \(linked\),")
+                 SET(EXTRA_LIBS dsound ${EXTRA_LIBS})
+             ENDIF()
++            SET(PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} -luuid -lole32")
+         ENDIF()
+     ENDIF()
+ ENDIF()
+-- 
+1.7.9.2
+
--- a/src/openal-1-luuid-pkg-config.patch	Thu May 03 07:06:55 2012 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-This patch has been taken from:
-
-
-diff -ur openal-soft-1.13.orig/CMakeLists.txt openal-soft-1.13/CMakeLists.txt
---- openal-soft-1.13.orig/CMakeLists.txt	2011-02-16 07:05:40.000000000 +1100
-+++ openal-soft-1.13/CMakeLists.txt	2011-03-02 15:40:02.000000000 +1100
-@@ -393,6 +393,7 @@
-                 SET(BACKENDS  "${BACKENDS} DirectSound \(linked\),")
-                 SET(EXTRA_LIBS dsound ${EXTRA_LIBS})
-             ENDIF()
-+            SET(PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} -luuid")
-         ENDIF()
-     ENDIF()
- ENDIF()
--- a/src/openal-2-guid-static-link.patch	Thu May 03 07:06:55 2012 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-This patch has been taken from:
-
-
---- openal-soft-1.13.orig/Alc/dsound.c	2011-02-08 01:44:06.000000000 -0500
-+++ openal-soft-1.13/Alc/dsound.c	2011-03-02 22:57:58.000000000 -0500
-@@ -21,7 +21,6 @@
- #include "config.h"
- 
- #define _WIN32_WINNT 0x0500
--#define INITGUID
- #include <stdlib.h>
- #include <stdio.h>
- #include <memory.h>
-@@ -45,8 +44,8 @@
- #define DSSPEAKER_7POINT1       7
- #endif
- 
--DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
--DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
-+const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001, 0x0000, 0x0010,{0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
-+const GUID KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = {0x00000003, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
- 
- static void *ds_handle;
- static HRESULT (WINAPI *pDirectSoundCreate)(LPCGUID pcGuidDevice, LPDIRECTSOUND *ppDS, LPUNKNOWN pUnkOuter);
--- a/src/openal.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/openal.mk	Thu May 03 23:18:14 2012 +0200
@@ -3,7 +3,7 @@
 
 PKG             := openal
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 0e2449375a12cee65a9cea354533dcaabf9d5068
+$(PKG)_CHECKSUM := e6d69db13ec15465b83a45ef89978e8a0f55beca
 $(PKG)_SUBDIR   := openal-soft-$($(PKG)_VERSION)
 $(PKG)_FILE     := openal-soft-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://kcat.strangesoft.net/openal-releases/$($(PKG)_FILE)
--- a/src/openssl.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/openssl.mk	Thu May 03 23:18:14 2012 +0200
@@ -3,7 +3,7 @@
 
 PKG             := openssl
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := a6476d33fd38c2e7dfb438d1e3be178cc242c907
+$(PKG)_CHECKSUM := b6222cbbf835c27d9ad6db22262da6e4a2aca8b8
 $(PKG)_SUBDIR   := openssl-$($(PKG)_VERSION)
 $(PKG)_FILE     := openssl-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.openssl.org/source/$($(PKG)_FILE)
--- a/src/pango-1-fixes.patch	Thu May 03 07:06:55 2012 +1000
+++ b/src/pango-1-fixes.patch	Thu May 03 23:18:14 2012 +0200
@@ -24,7 +24,7 @@
  
  BOOL WINAPI
 -DllMain (HINSTANCE hinstDLL,
-+static _disabled_DllMain (HINSTANCE hinstDLL,
++pango_DllMain (HINSTANCE hinstDLL,
  	 DWORD     fdwReason,
  	 LPVOID    lpvReserved)
  {
--- a/src/pango.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/pango.mk	Thu May 03 23:18:14 2012 +0200
@@ -3,9 +3,9 @@
 
 PKG             := pango
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 467a3dacc0f3173e6fd457524b9ccd9772039a62
+$(PKG)_CHECKSUM := f0bf7974ef3e8826fbbb55c0974466ede1e67dd3
 $(PKG)_SUBDIR   := pango-$($(PKG)_VERSION)
-$(PKG)_FILE     := pango-$($(PKG)_VERSION).tar.bz2
+$(PKG)_FILE     := pango-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/pango/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc fontconfig freetype cairo glib
 
--- a/src/poco.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/poco.mk	Thu May 03 23:18:14 2012 +0200
@@ -20,7 +20,7 @@
         --config=MinGW-CrossEnv \
         --static \
         --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install CROSSENV=$(TARGET)
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/poppler-1-win32.patch	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,243 @@
+This file is part of MXE.
+See index.html for further information.
+
+From 991d23243522e1ae2bd8efd279032792681f3789 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
+Date: Sat, 21 Apr 2012 09:29:25 +0200
+Subject: [PATCH 1/4] Fix Standard-14 fallback fonts
+
+wingding.ttf is totally different from ZapfDingbats. symbol.ttf is only a lousy fallback for Symbol.
+Based on patch provided by Jonathan Kew.
+Proposed upstream at https://bugs.freedesktop.org/show_bug.cgi?id=49037
+---
+ poppler/GlobalParamsWin.cc |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
+index f989fb8..b15773f 100644
+--- a/poppler/GlobalParamsWin.cc
++++ b/poppler/GlobalParamsWin.cc
+@@ -73,13 +73,17 @@ static struct {
+     {"Helvetica-BoldOblique", "n019024l.pfb", "arialbi.ttf"},
+     {"Helvetica-Oblique",     "n019023l.pfb", "ariali.ttf"},
+     // TODO: not sure if "symbol.ttf" is right
++    // "symbol.ttf" can be used as a fallback, but some symbols are differently
++    // encoded (e.g., the glyphs for 'f', 'j', 'v'), while most other glyphs
++    // have a fairly different appearance
+     {"Symbol",                "s050000l.pfb", "symbol.ttf"},
+     {"Times-Bold",            "n021004l.pfb", "timesbd.ttf"},
+     {"Times-BoldItalic",      "n021024l.pfb", "timesbi.ttf"},
+     {"Times-Italic",          "n021023l.pfb", "timesi.ttf"},
+     {"Times-Roman",           "n021003l.pfb", "times.ttf"},
+     // TODO: not sure if "wingding.ttf" is right
+-    {"ZapfDingbats",          "d050000l.pfb", "wingding.ttf"},
++    // No, the symbol sets are totally different
++    {"ZapfDingbats",          "d050000l.pfb", NULL},
+ 
+     // those seem to be frequently accessed by PDF files and I kind of guess
+     // which font file do the refer to
+-- 
+1.7.5.4
+
+
+From 482782fa1951c8c75636918fb45c90f3f329bf86 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
+Date: Sat, 21 Apr 2012 09:34:46 +0200
+Subject: [PATCH 2/4] Only check for Type1 fonts in custom directory if path
+ is non-NULL
+
+Otherwise, programs using poppler may crash
+Proposed upstream at https://bugs.freedesktop.org/show_bug.cgi?id=49037
+---
+ poppler/GlobalParamsWin.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
+index b15773f..f68577f 100644
+--- a/poppler/GlobalParamsWin.cc
++++ b/poppler/GlobalParamsWin.cc
+@@ -243,7 +243,7 @@ void GlobalParams::setupBaseFonts(char * dir)
+         if (displayFonts->lookup(fontName))
+             continue;
+ 
+-        if (dir) {
++        if (dir && displayFontTab[i].t1FileName) {
+             GooString *fontPath = appendToPath(new GooString(dir), displayFontTab[i].t1FileName);
+             if (FileExists(fontPath->getCString())) {
+                 AddFont(displayFonts, fontName, fontPath, displayFontT1);
+-- 
+1.7.5.4
+
+
+From 7f01e803b134d01a72f6912d088d7887eba0df08 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
+Date: Sat, 21 Apr 2012 11:57:02 +0200
+Subject: [PATCH 3/4] Allow custom substitution fonts on Windows
+
+Standard-compliant PDF viewers must be able to handle 14 standard fonts even if they are not embedded. For the Symbol and ZapfDingbats fonts, there is no suitable alternative available on Windows by default, so they must be provided separately (and poppler must find them).
+
+The search path is share/fonts/type1/gsfonts (relative to poppler) similar to *nix systems and the search path for poppler-data.
+Proposed upstream at https://bugs.freedesktop.org/show_bug.cgi?id=49037
+---
+ poppler/GlobalParams.cc    |   31 +++++++++++++++++++++++++++++++
+ poppler/GlobalParamsWin.cc |    2 +-
+ 2 files changed, 32 insertions(+), 1 deletions(-)
+
+diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
+index 687fd25..eea60be 100644
+--- a/poppler/GlobalParams.cc
++++ b/poppler/GlobalParams.cc
+@@ -214,6 +214,37 @@ get_poppler_datadir (void)
+ 
+ #ifdef _WIN32
+ 
++static char *
++get_poppler_fontdir (void)
++{
++#if !ENABLE_RELOCATABLE
++  static HMODULE hmodule = 0;
++#endif
++  static char retval[MAX_PATH];
++  static int beenhere = 0;
++
++  unsigned char *p;
++
++  if (beenhere)
++    return retval;
++
++  if (!GetModuleFileName (hmodule, (CHAR *) retval, sizeof(retval) - 32))
++    return NULL;
++
++  p = _mbsrchr ((unsigned char *) retval, '\\');
++  *p = '\0';
++  p = _mbsrchr ((unsigned char *) retval, '\\');
++  if (p) {
++    if (stricmp ((const char *) (p+1), "bin") == 0)
++      *p = '\0';
++  }
++  strcat (retval, "\\share\\fonts\\type1\\gsfonts");
++
++  beenhere = 1;
++
++  return retval;
++}
++
+ //------------------------------------------------------------------------
+ // WinFontInfo
+ //------------------------------------------------------------------------
+diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
+index f68577f..3ee75e4 100644
+--- a/poppler/GlobalParamsWin.cc
++++ b/poppler/GlobalParamsWin.cc
+@@ -281,7 +281,7 @@ DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
+ 
+     if (!fontName) return NULL;
+     lockGlobalParams;
+-    setupBaseFonts(NULL);
++    setupBaseFonts(get_poppler_fontdir());
+     dfp = (DisplayFontParam *)displayFonts->lookup(fontName);
+     if (!dfp) {
+         substFontName = findSubstituteName(fontName->getCString());
+-- 
+1.7.5.4
+
+
+From e000aafa7dec5441d072158814fa35631c5a9c52 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
+Date: Sat, 21 Apr 2012 13:19:54 +0200
+Subject: [PATCH 4/4] Don't use dllimport/dllexport
+
+Otherwise static linking fails
+MXE workaround for https://bugs.freedesktop.org/show_bug.cgi?id=49038 (presumably would break shared linking!)
+---
+ cpp/poppler-global.h     |    5 -----
+ poppler/XpdfPluginAPI.h  |   18 ------------------
+ qt4/src/poppler-export.h |    5 -----
+ 3 files changed, 0 insertions(+), 28 deletions(-)
+
+diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h
+index 5650182..6c3e01b 100644
+--- a/cpp/poppler-global.h
++++ b/cpp/poppler-global.h
+@@ -20,13 +20,8 @@
+ #ifndef POPPLER_GLOBAL_H
+ #define POPPLER_GLOBAL_H
+ 
+-#if defined(_WIN32)
+-#  define LIB_EXPORT __declspec(dllexport)
+-#  define LIB_IMPORT __declspec(dllimport)
+-#else
+ #  define LIB_EXPORT
+ #  define LIB_IMPORT
+-#endif
+ 
+ #if defined(poppler_cpp_EXPORTS)
+ #  define POPPLER_CPP_EXPORT LIB_EXPORT
+diff --git a/poppler/XpdfPluginAPI.h b/poppler/XpdfPluginAPI.h
+index 22540f7..290aa63 100644
+--- a/poppler/XpdfPluginAPI.h
++++ b/poppler/XpdfPluginAPI.h
+@@ -28,19 +28,11 @@ extern "C" {
+  */
+ #define xpdfPluginAPIVersion 1
+ 
+-#ifdef _WIN32
+-#  ifdef __cplusplus
+-#    define PLUGINFUNC(retType) extern "C" __declspec(dllexport) retType
+-#  else
+-#    define PLUGINFUNC(retType) extern __declspec(dllexport) retType
+-#  endif
+-#else
+ #  ifdef __cplusplus
+ #    define PLUGINFUNC(retType) extern "C" retType
+ #  else
+ #    define PLUGINFUNC(retType) extern retType
+ #  endif
+-#endif
+ 
+ /*------------------------------------------------------------------------
+  * Plugin setup/cleanup
+@@ -285,22 +277,12 @@ void (*_xpdfRegisterSecurityHandler)(XpdfSecurityHandler *handler);
+ 
+ } XpdfPluginVecTable;
+ 
+-#ifdef _WIN32
+-
+-extern __declspec(dllexport) XpdfPluginVecTable xpdfPluginVecTable;
+-
+-#define xpdfPluginSetup \
+-  extern __declspec(dllexport) \
+-  XpdfPluginVecTable xpdfPluginVecTable = {xpdfPluginAPIVersion};
+-
+-#else
+ 
+ extern XpdfPluginVecTable xpdfPluginVecTable;
+ 
+ #define xpdfPluginSetup \
+   XpdfPluginVecTable xpdfPluginVecTable = {xpdfPluginAPIVersion};
+ 
+-#endif
+ 
+ #define xpdfGetInfoDict (*xpdfPluginVecTable._xpdfGetInfoDict)
+ #define xpdfGetCatalog (*xpdfPluginVecTable._xpdfGetCatalog)
+diff --git a/qt4/src/poppler-export.h b/qt4/src/poppler-export.h
+index 7661fe9..ebb1e18 100644
+--- a/qt4/src/poppler-export.h
++++ b/qt4/src/poppler-export.h
+@@ -2,13 +2,8 @@
+ * This file is used to set the poppler_qt4_EXPORT macros right.
+ * This is needed for setting the visibility on windows, it will have no effect on other platforms.
+ */
+-#if defined(_WIN32)
+-# define LIB_EXPORT __declspec(dllexport)
+-# define LIB_IMPORT __declspec(dllimport)
+-#else
+ # define LIB_EXPORT
+ # define LIB_IMPORT
+-#endif
+ 
+ #ifdef poppler_qt4_EXPORTS
+ # define POPPLER_QT4_EXPORT LIB_EXPORT
+-- 
+1.7.5.4
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/poppler-test.cxx	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,12 @@
+#include <iostream>
+#include <cpp/poppler-version.h>
+
+int main(int argc, char *argv[])
+{
+    (void)argc;
+    (void)argv;
+
+    std::cout << "Poppler version: " << poppler::version_string() << std::endl;
+
+    return 0;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/poppler.mk	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,58 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := poppler
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 3753caecba71afaf29f097e0b9c52e0f83a10a59
+$(PKG)_SUBDIR   := poppler-$($(PKG)_VERSION)
+$(PKG)_FILE     := poppler-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://poppler.freedesktop.org/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc glib cairo libpng lcms jpeg tiff freetype zlib curl qt
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://poppler.freedesktop.org/' | \
+    $(SED) -n 's,.*"poppler-\([0-9.]\+\)\.tar\.gz".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    # Note: Specifying LIBS explicitly is necessary for configure to properly
+    #       pick up libtiff (otherwise linking a minimal test program fails not
+    #       because libtiff is not found, but because some references are
+    #       undefined)
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --disable-silent-rules \
+        --disable-shared \
+        --enable-static \
+        --enable-xpdf-headers \
+        --enable-poppler-qt4 \
+        --enable-zlib \
+        --enable-libcurl \
+        --enable-libtiff \
+        --enable-libjpeg \
+        --enable-libpng \
+        --enable-poppler-glib \
+        --enable-poppler-cpp \
+        --enable-cairo-output \
+        --enable-splash-output \
+        --enable-compile-warnings=yes \
+        --enable-introspection=auto \
+        --disable-libopenjpeg \
+        --disable-gtk-test \
+        --disable-utils \
+        --disable-gtk-doc \
+        --disable-gtk-doc-html \
+        --disable-gtk-doc-pdf \
+        --with-font-configuration=win32 \
+        LIBS="`'$(TARGET)-pkg-config' zlib liblzma --libs` -ljpeg"
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+
+    # Test program
+    '$(TARGET)-g++' \
+        -W -Wall -Werror -ansi -pedantic \
+        '$(2).cxx' -o '$(PREFIX)/$(TARGET)/bin/test-poppler.exe' \
+        `'$(TARGET)-pkg-config' poppler poppler-cpp --cflags --libs`
+endef
+
--- a/src/qt-1-cherrypicks.patch	Thu May 03 07:06:55 2012 +1000
+++ b/src/qt-1-cherrypicks.patch	Thu May 03 23:18:14 2012 +0200
@@ -8,7 +8,7 @@
 From 16a4f14e8e879a14ae5db47d0731c9199c01a816 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 13 Jan 2012 00:17:48 +0100
-Subject: [PATCH 01/16] remove trailing whitespace
+Subject: [PATCH 01/17] remove trailing whitespace
 
 backported from qt5/qtbase
 Change-Id: If53a0bd1794e69b4856f993c6e2959369bd007d6
@@ -38,7 +38,7 @@
 From 162708efc51e40ed59d4e3397d399920c21d03a6 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 30 Jun 2011 10:22:33 +0200
-Subject: [PATCH 02/16] do not detect or configure iconv for Windows
+Subject: [PATCH 02/17] do not detect or configure iconv for Windows
 
 Qt doesn't use iconv on Windows, but configuring it will appear to
 work and the build will complete. The result is that character
@@ -75,7 +75,7 @@
 From dd34e052a555203b2bfb415bd0ce348ef232aa7e Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Wed, 18 Jan 2012 11:43:10 +0100
-Subject: [PATCH 03/16] fix whitespace
+Subject: [PATCH 03/17] fix whitespace
 
 backported from qt5/qtbase
 Change-Id: I0cfccae085c000d4368386a34f288c1e6f01a88f
@@ -152,7 +152,7 @@
 From 7f2e5f5e4bc740446f0160ae3246907fa4f6dc2f Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 4 Jul 2011 00:42:24 +0200
-Subject: [PATCH 04/16] build and load text codecs regardless of iconv and
+Subject: [PATCH 04/17] build and load text codecs regardless of iconv and
  platform
 
 Otherwise applications linking to static Qt may have to import
@@ -298,7 +298,7 @@
 From 00db0d7b9b99b18fd08463f86102f1b63eb3a527 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 13 Jan 2012 00:24:13 +0100
-Subject: [PATCH 05/16] move plugin text codecs to QtCore
+Subject: [PATCH 05/17] move plugin text codecs to QtCore
 
 Having plugin text codecs adds considerable complexity to
 configuring Qt. The plugin interface is designed for optional
@@ -79340,7 +79340,7 @@
 From 0332650cdfb4c5847a4678a1aebfbe146c850b87 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Wed, 18 Jan 2012 21:01:26 +0100
-Subject: [PATCH 06/16] update private header references
+Subject: [PATCH 06/17] update private header references
 
 backported from qt5/qtbase
 Change-Id: I092d879653b6900532a0c4534c1eb2be84e9d0f6
@@ -79516,7 +79516,7 @@
 From e76298384079852d9cc1e0138a10b0637f34687f Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Sun, 3 Jul 2011 21:53:27 +0200
-Subject: [PATCH 07/16] cosmetic adjustments for files moved to core/codecs
+Subject: [PATCH 07/17] cosmetic adjustments for files moved to core/codecs
 
 -update old reference to 'plugin'
 -rename multiple inclusion guards
@@ -80027,7 +80027,7 @@
 From 16ea320980842c9c16d380f3bdd84c5a413dbd21 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 12 Jan 2012 10:43:29 +0100
-Subject: [PATCH 08/16] remove obsolete codec plugin loading code
+Subject: [PATCH 08/17] remove obsolete codec plugin loading code
 
 backported from qt5/qtbase
 Change-Id: I1f3dbb5c10009413f701947b1b89ed3dbc94bf3d
@@ -80577,7 +80577,7 @@
 From 5a5ae1066dbcf8a663e7f292d8679aae2ccd7b73 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 23 Jan 2012 23:12:46 +0100
-Subject: [PATCH 09/16] remove vestiges of text codec plugins
+Subject: [PATCH 09/17] remove vestiges of text codec plugins
 
 follow-up to 3a3356a85079d734dfa57205a00e1996afc033df
 
@@ -80614,7 +80614,7 @@
 From 90daa3f753c91a3efde3dfdc9151f9a639c653d0 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 3 Nov 2011 15:10:26 +0100
-Subject: [PATCH 10/16] use pkg-config for libmng (MXE specific)
+Subject: [PATCH 10/17] use pkg-config for libmng (MXE specific)
 
 Change-Id: Ifce956d5cad06d5273088656b8500b87980063f4
 ---
@@ -80643,7 +80643,7 @@
 From 1d4c3643de6eea011e74ed73dc2290c58f41d865 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 3 Nov 2011 14:11:02 +0100
-Subject: [PATCH 11/16] use pkg-config for libtiff-4 (MXE specific)
+Subject: [PATCH 11/17] use pkg-config for libtiff-4 (MXE specific)
 
 Change-Id: I5e89e66fc1606d425553e781c9e62db703136957
 ---
@@ -80669,10 +80669,10 @@
 1.7.9.2
 
 
-From 53435e54b4d81bdcd35ccbe292ba6cc9321e8b17 Mon Sep 17 00:00:00 2001
+From a3c87e93fd4aa06163eb157b060e155c44fbbe14 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Sat, 5 Jun 2010 23:41:04 +0200
-Subject: [PATCH 12/16] restore support for static linking of QtWebKit (MXE
+Subject: [PATCH 12/17] restore support for static linking of QtWebKit (MXE
  specific)
 
 Support was removed by 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113.
@@ -80688,8 +80688,9 @@
  configure                                          |    6 ------
  .../Source/JavaScriptCore/JavaScriptCore.pri       |   12 ++++++++++++
  src/3rdparty/webkit/Source/WebCore/WebCore.pri     |   12 ++++++++++++
+ src/3rdparty/webkit/Source/WebCore/WebCore.pro     |    2 +-
  src/3rdparty/webkit/Source/WebKit.pro              |    2 +-
- 4 files changed, 25 insertions(+), 7 deletions(-)
+ 5 files changed, 26 insertions(+), 8 deletions(-)
 
 diff --git a/configure b/configure
 index 0690822..2837eec 100755
@@ -80748,6 +80749,19 @@
 +    QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS]
 +    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
 +}
+diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pro b/src/3rdparty/webkit/Source/WebCore/WebCore.pro
+index ceceee8..6609944 100644
+--- a/src/3rdparty/webkit/Source/WebCore/WebCore.pro
++++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pro
+@@ -16,7 +16,7 @@ CONFIG += staticlib
+ DESTDIR = $$WEBCORE_DESTDIR
+ 
+ DEFINES += BUILDING_WEBKIT
+-DEFINES += QT_MAKEDLL
++!static:DEFINES += QT_MAKEDLL
+ 
+ contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) {
+     DEFINES += ENABLE_NO_LISTBOX_RENDERING=1
 diff --git a/src/3rdparty/webkit/Source/WebKit.pro b/src/3rdparty/webkit/Source/WebKit.pro
 index 9be0f4a..6744f58 100644
 --- a/src/3rdparty/webkit/Source/WebKit.pro
@@ -80765,10 +80779,10 @@
 1.7.9.2
 
 
-From f6375f66b90b8f03c2df62330bd1c14e16a0120e Mon Sep 17 00:00:00 2001
+From 0f6cab5fff9eb2e0cfc173eaf71e068f9b82e9d3 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 1 Sep 2011 13:47:10 +0200
-Subject: [PATCH 13/16] fix building on GNU/kFreeBSD (MXE specific)
+Subject: [PATCH 13/17] fix building on GNU/kFreeBSD (MXE specific)
 
 This patch has been taken from:
 
@@ -80799,10 +80813,10 @@
 1.7.9.2
 
 
-From 90fc0213a853e155514e49765794ebbe9ef3da1f Mon Sep 17 00:00:00 2001
+From 3b9839cc26fc7997b043a74c7d30fc3b0b81ad83 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 1 Sep 2011 13:49:47 +0200
-Subject: [PATCH 14/16] fix missing platform when building on GNU/kFreeBSD
+Subject: [PATCH 14/17] fix missing platform when building on GNU/kFreeBSD
  (MXE specific)
 
 This patch is inspired by:
@@ -80833,10 +80847,10 @@
 1.7.9.2
 
 
-From 3c0837566e8319fddae6c6f5a037657e729f9d43 Mon Sep 17 00:00:00 2001
+From e15286869c4e9b5714209ec38686f63c8b2ff44c Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 1 Sep 2011 13:51:50 +0200
-Subject: [PATCH 15/16] fix building on dragonfly (MXE specific)
+Subject: [PATCH 15/17] fix building on dragonfly (MXE specific)
 
 This patch is inspired by:
 http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/x11/qt4-libs/Makefile.common?rev=1.27&content-type=text/x-cvsweb-markup
@@ -80863,10 +80877,10 @@
 1.7.9.2
 
 
-From b80860ba8ddb8c418fc4fb356bc1bc6a93274a4a Mon Sep 17 00:00:00 2001
+From 87952077f0d192d2ce15ea111be3f320bc03be40 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 23 Mar 2012 16:29:57 +0100
-Subject: [PATCH 16/16] gcc 4.7.0 compatibility fix for javascript
+Subject: [PATCH 16/17] gcc 4.7.0 compatibility fix for javascript
 
 taken from http://qt-project.org/forums/viewthread/15071
 
@@ -80905,3 +80919,39 @@
 -- 
 1.7.9.2
 
+
+From 4de5298ed5b06dea106f054ef110146a45f06b6f Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Thu, 19 Apr 2012 14:48:34 +0200
+Subject: [PATCH 17/17] fix static library names when generating .pc files for
+ pkgconfig
+
+c354d16cc64cf516a0b5149cdc9ef74de096a998 added the version extension
+which only occurs on the DLL import library.
+
+cherry-picked from qt5/qtbase 8e053a5dfc9b4c8f100b1e77335439774f52fc61
+Change-Id: Ie913adf039d7f3a9aadf43f4af014289a8aeacbe
+Reviewed-by: Mark Brand <mabrand@mabrand.nl>
+Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
+(cherry picked from commit 51a2b0fde9bf635482fd2463b901139c82ed0dc4)
+---
+ qmake/generators/makefile.cpp |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
+index 66c6d49..447943a 100644
+--- a/qmake/generators/makefile.cpp
++++ b/qmake/generators/makefile.cpp
+@@ -3258,7 +3258,8 @@ MakefileGenerator::writePkgConfigFile()
+     } else {
+         pkgConfiglibDir = "-L${libdir}";
+         pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length());
+-        pkgConfiglibName += project->first("TARGET_VERSION_EXT");
++        if (project->isActiveConfig("shared"))
++            pkgConfiglibName += project->first("TARGET_VERSION_EXT");
+     }
+     t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl;
+ 
+-- 
+1.7.9.2
+
--- a/src/qt.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/qt.mk	Thu May 03 23:18:14 2012 +0200
@@ -37,7 +37,7 @@
         -script \
         -no-iconv \
         -opengl desktop \
-        -webkit \
+        -no-webkit \
         -no-glib \
         -no-gstreamer \
         -no-phonon \
@@ -71,6 +71,12 @@
     $(INSTALL) -m755 '$(1)/bin/uic'   '$(PREFIX)/bin/$(TARGET)-uic'
     $(INSTALL) -m755 '$(1)/bin/qmake' '$(PREFIX)/bin/$(TARGET)-qmake'
 
+    cd '$(1)/tools/assistant' && '$(1)/bin/qmake' assistant.pro
+    $(MAKE) -C '$(1)/tools/assistant' -j '$(JOBS)' install
+
+    cd '$(1)/tools/designer' && '$(1)/bin/qmake' designer.pro
+    $(MAKE) -C '$(1)/tools/designer' -j '$(JOBS)' install
+
     # at least some of the qdbus tools are useful on target
     cd '$(1)/tools/qdbus' && '$(1)/bin/qmake' qdbus.pro
     $(MAKE) -C '$(1)/tools/qdbus' -j '$(JOBS)' install
--- a/src/sdl_mixer.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/sdl_mixer.mk	Thu May 03 23:18:14 2012 +0200
@@ -7,7 +7,7 @@
 $(PKG)_SUBDIR   := SDL_mixer-$($(PKG)_VERSION)
 $(PKG)_FILE     := SDL_mixer-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.libsdl.org/projects/SDL_mixer/release/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc sdl libmikmod ogg vorbis smpeg
+$(PKG)_DEPS     := gcc sdl libmodplug ogg vorbis smpeg
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://hg.libsdl.org/SDL_mixer/tags' | \
@@ -19,7 +19,7 @@
     $(SED) -i 's,^\(Requires:.*\),\1 vorbisfile,' '$(1)/SDL_mixer.pc.in'
     echo \
         'Libs.private:' \
-        "`$(PREFIX)/$(TARGET)/bin/libmikmod-config --libs`" \
+        "`$(TARGET)-pkg-config libmodplug --libs`" \
         "`$(PREFIX)/$(TARGET)/bin/smpeg-config     --libs`" \
         >> '$(1)/SDL_mixer.pc.in'
     $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure'
@@ -29,7 +29,8 @@
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-sdl-prefix='$(PREFIX)/$(TARGET)' \
         --disable-sdltest \
-        --enable-music-mod \
+        --disable-music-mod \
+        --enable-music-mod-modplug \
         --enable-music-ogg \
         --disable-music-flac \
         --enable-music-mp3 \
@@ -39,7 +40,6 @@
         --disable-music-mp3-shared \
         --disable-smpegtest \
         --with-smpeg-prefix='$(PREFIX)/$(TARGET)' \
-        LIBMIKMOD_CONFIG='$(PREFIX)/$(TARGET)/bin/libmikmod-config' \
         LIBS='-lvorbis -logg'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sox-test.c	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,15 @@
+/*
+ * This file is part of MXE.
+ * See index.html for further information.
+ */
+
+#include <sox.h>
+
+int main(int argc, char *argv[])
+{
+    (void)argc;
+    (void)argv;
+
+    sox_format_init();
+    return(0);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sox.mk	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,39 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+# sox
+PKG             := sox
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := d809cab382c7a9d015491c69051a9d1c1a1a44f1
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc ffmpeg flac lame libgomp libmad libsndfile vorbis
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://sourceforge.net/projects/sox/files/sox/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    # set pkg-config cflags and libs
+    $(SED) -i 's,^\(Cflags:.*\),\1 -fopenmp,' '$(1)/sox.pc.in'
+    $(SED) -i '/Libs.private/d'               '$(1)/sox.pc.in'
+    echo Libs.private: `grep sox_LDADD '$(1)/src/optional-fmts.am' | \
+    $(SED) 's, sox_LDADD += ,,g' | tr -d '\n'` >>'$(1)/sox.pc.in'
+
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --build="`config.guess`" \
+        --disable-shared
+
+    $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= EXTRA_PROGRAMS=
+    $(MAKE) -C '$(1)' -j 1 install
+
+    '$(TARGET)-gcc' \
+        -W -Wall -Werror -ansi -pedantic \
+        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sox.exe' \
+        `'$(TARGET)-pkg-config' sox --cflags --libs`
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/suitesparse-1.patch	Thu May 03 23:18:14 2012 +0200
@@ -0,0 +1,19 @@
+--- SuiteSparse-3.7.0/CHOLMOD/Makefile	2011-12-08 19:56:52.000000000 +0100
++++ SuiteSparse-3.6.0/CHOLMOD/Makefile	2011-01-25 21:05:49.000000000 +0100
+@@ -13,6 +13,6 @@
+ 
+ # Compile the C-callable libraries and the Demo programs.
+ all:
++	( cd Lib ; $(MAKE) )
+-	( cd Demo ; $(MAKE) )
+ 
+ # Compile the C-callable libraries only.
+--- SuiteSparse-3.7.0/UMFPACK/Makefile	2011-12-08 20:57:27.000000000 +0100
++++ SuiteSparse-3.6.1/UMFPACK/Makefile	2011-01-25 21:07:50.000000000 +0100
+@@ -13,5 +13,5 @@
+ # compile all C code (except hb, fortran, and fortran64), including AMD and the
+ # demos, but not the MATLAB mexFunctions
+ all:
++	( cd Lib    ; $(MAKE) )
+-	( cd Demo   ; $(MAKE) )
+ 
--- a/src/suitesparse.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/suitesparse.mk	Thu May 03 23:18:14 2012 +0200
@@ -24,7 +24,7 @@
         CC='$(TARGET)-gcc' \
         CPLUSPLUS='$(TARGET)-g++' \
         F77='$(TARGET)-gfortran' \
-        AR='$(TARGET)-ar cr' \
+        AR='$(TARGET)-ar' \
         RANLIB='$(TARGET)-ranlib' \
         BLAS='-lblas -lgfortran -lgfortranbegin' \
         CHOLMOD_CONFIG='-DNPARTITION'
--- a/src/wt.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/wt.mk	Thu May 03 23:18:14 2012 +0200
@@ -31,6 +31,7 @@
         -DGM_PREFIX='$(PREFIX)/$(TARGET)' \
         -DGM_LIBS="`'$(TARGET)-pkg-config' --libs-only-l GraphicsMagick++`" \
         -DPANGO_FT2_LIBS="`'$(TARGET)-pkg-config' --libs-only-l pangoft2`" \
+        -DWT_CMAKE_FINDER_INSTALL_DIR='/lib/wt' \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DCMAKE_BUILD_TYPE:STRING="Release" \
         '$(1)'
--- a/src/xmlwrapp.mk	Thu May 03 07:06:55 2012 +1000
+++ b/src/xmlwrapp.mk	Thu May 03 23:18:14 2012 +0200
@@ -3,11 +3,11 @@
 
 PKG             := xmlwrapp
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := b3ef8bff215bbacd988790615b76379672105928
+$(PKG)_CHECKSUM := 7bd66ecc1204b296580a499fd929d77b79e6e85a
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc libxml2 libxslt
+$(PKG)_DEPS     := gcc boost libxml2 libxslt
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://sourceforge.net/projects/xmlwrapp/files/xmlwrapp/' | \