Mercurial > mxe-octave

changeset 1918:3886ee68250c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Volker Grabsch <vog@notjusthosting.com>
date Thu, 30 Jun 2011 01:08:50 +0200
parents d0120fb46c6c (current diff) d911945ef6fc (diff)
children f839103829f8
files src/gsoap-1-fixes.patch
diffstat 44 files changed, 950 insertions(+), 300 deletions(-) [+]
line wrap: on
line diff
--- a/doc/index.html	Thu Jun 30 01:07:59 2011 +0200
+++ b/doc/index.html	Thu Jun 30 01:08:50 2011 +0200
@@ -442,28 +442,15 @@
 
     <dl>
 
-    <dt>2011-06-07 &ndash; Release <span id="latest-version">2.21</span></dt>
+    <dt>2011-xx-xx &ndash; Release <span id="latest-version">2.22</span></dt>
     <dd>
         <p>
-        <a href="https://bitbucket.org/vog/mingw-cross-env/downloads/mingw-cross-env-2.21.tar.gz">Download</a> |
-        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.21">Changelog</a>
+        <a href="https://bitbucket.org/vog/mingw-cross-env/downloads/mingw-cross-env-2.22.tar.gz">Download</a> |
+        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.22">Changelog</a>
         </p>
 
         <p>
-        Minor bugfixes in several packages.
-        </p>
-
-        <p>
-        Almost all packages are updated to their latest version.
-        </p>
-
-        <p>
-        Packages gtkmm and gtksourceviewmm have been renamed to gtkmm2 and gtksourceviewmm2.
-        </p>
-
-        <p>
-        New packages are supported:
-        libass, poco, and t4k_common.
+        Almost all packages were updated to their latest version.
         </p>
     </dd>
 
@@ -1130,6 +1117,31 @@
 
     <dl>
 
+    <dt>2011-06-07 &ndash; Release 2.21</dt>
+    <dd>
+        <p>
+        <a href="https://bitbucket.org/vog/mingw-cross-env/downloads/mingw-cross-env-2.21.tar.gz">Download</a> |
+        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.21">Changelog</a>
+        </p>
+
+        <p>
+        Minor bugfixes in several packages.
+        </p>
+
+        <p>
+        Almost all packages are updated to their latest version.
+        </p>
+
+        <p>
+        Packages gtkmm and gtksourceviewmm have been renamed to gtkmm2 and gtksourceviewmm2.
+        </p>
+
+        <p>
+        New packages are supported:
+        libass, poco, and t4k_common.
+        </p>
+    </dd>
+
     <dt>2011-04-05 &ndash; Release 2.20</dt>
     <dd>
         <p>
--- a/src/atk.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/atk.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # ATK
 PKG             := atk
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.0.0
-$(PKG)_CHECKSUM := a11205c094ce68cbe3ee7dd92163e08e00c34cce
+$(PKG)_VERSION  := 2.0.1
+$(PKG)_CHECKSUM := f830ff27590e4dd486ebe6538e2b03484faee10a
 $(PKG)_SUBDIR   := atk-$($(PKG)_VERSION)
 $(PKG)_FILE     := atk-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gtk.org/
--- a/src/binutils.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/binutils.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # GNU Binutils
 PKG             := binutils
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.21
-$(PKG)_CHECKSUM := ef93235588eb443e4c4a77f229a8d131bccaecc6
+$(PKG)_VERSION  := 2.21.1
+$(PKG)_CHECKSUM := f188490772cc902ec44a76545887bff60dbfa22d
 $(PKG)_SUBDIR   := binutils-$($(PKG)_VERSION)
 $(PKG)_FILE     := binutils-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gnu.org/software/binutils/
--- a/src/curl.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/curl.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # cURL
 PKG             := curl
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 7.21.6
-$(PKG)_CHECKSUM := 049a3aff13d283f6e4ea1f9aa3aa6abc067fd42e
+$(PKG)_VERSION  := 7.21.7
+$(PKG)_CHECKSUM := 88aab0188ac86c3d13118bb5b6ee49a83e53b0ce
 $(PKG)_SUBDIR   := curl-$($(PKG)_VERSION)
 $(PKG)_FILE     := curl-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://curl.haxx.se/libcurl/
--- a/src/dbus-1-fixes.patch	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/dbus-1-fixes.patch	Thu Jun 30 01:08:50 2011 +0200
@@ -11,7 +11,7 @@
 index d1e40ec..3a32355 100644
 --- a/dbus/dbus-macros.h
 +++ b/dbus/dbus-macros.h
-@@ -158,6 +158,7 @@
+@@ -172,6 +172,7 @@
   */
  
  #if defined(_WIN32)
--- a/src/dbus.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/dbus.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # dbus
 PKG             := dbus
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.5.0
-$(PKG)_CHECKSUM := 4f0c82af6de628d7359dcdbc0da402f8e369e367
+$(PKG)_VERSION  := 1.5.4
+$(PKG)_CHECKSUM := 11bd5828ac56a3e8f125a487b5743f09914ecea6
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://$(PKG).freedesktop.org/
@@ -15,12 +15,12 @@
 define $(PKG)_UPDATE
     wget -q -O- 'http://cgit.freedesktop.org/dbus/dbus/refs/tags' | \
     $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9][^']*\\)'.*,\\1,p" | \
-    grep -v '^1\.[0123]\.' | \
+    grep -v '^1\.[01234]\.' | \
     head -1
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
+    cd '$(1)' && automake && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-xml=expat \
@@ -29,8 +29,6 @@
         --disable-asserts \
         --disable-shared \
         --enable-static \
-        --disable-tests \
-        --disable-standalone-tests \
         --disable-silent-rules
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
--- a/src/fltk.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/fltk.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,12 +4,12 @@
 # FLTK
 PKG             := fltk
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.3.x-r8659
-$(PKG)_CHECKSUM := 97d5002f1f3a32bf78634954e63c491483e727ac
+$(PKG)_VERSION  := 1.3.0
+$(PKG)_CHECKSUM := 720f2804be6132ebae9909d4e74dedcc00b39d25
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
+$(PKG)_FILE     := $($(PKG)_SUBDIR)-source.tar.gz
 $(PKG)_WEBSITE  := http://www.fltk.org/
-$(PKG)_URL      := http://ftp.easysw.com/pub/fltk/snapshots/$($(PKG)_FILE)
+$(PKG)_URL      := http://ftp.easysw.com/pub/fltk/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc zlib jpeg libpng pthreads
 
 define $(PKG)_UPDATE
--- a/src/freetds.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/freetds.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,10 +4,10 @@
 # FreeTDS
 PKG             := freetds
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.91.dev.20110523RC2
-$(PKG)_CHECKSUM := c5848c9bf940782730dddf24a3bff141c9c9c369
+$(PKG)_VERSION  := 0.91.dev.20110629RC2
+$(PKG)_CHECKSUM := 5586b1c7b94a2f07a83746941d9983d93259e392
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_WEBSITE  := http://www.freetds.org/
 $(PKG)_URL      := https://bitbucket.org/mabrand/mingw-cross-env/downloads/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc libiconv gnutls
--- a/src/freetype.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/freetype.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # freetype
 PKG             := freetype
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.4.4
-$(PKG)_CHECKSUM := 1d136cbc51c67b212c91ba04dc5db797f35e64e6
+$(PKG)_VERSION  := 2.4.5
+$(PKG)_CHECKSUM := edc5217f1a0e3bec37f9846bb5203e8d005cf470
 $(PKG)_SUBDIR   := freetype-$($(PKG)_VERSION)
 $(PKG)_FILE     := freetype-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://freetype.sourceforge.net/
--- a/src/gcc-1-mingw-float.patch	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/gcc-1-mingw-float.patch	Thu Jun 30 01:08:50 2011 +0200
@@ -8,7 +8,7 @@
 diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h
 --- a/gcc/ginclude/float.h	2009-04-09 17:00:19.000000000 +0200
 +++ b/gcc/ginclude/float.h	2010-06-05 12:03:41.887724045 +0200
-@@ -236,3 +236,7 @@
+@@ -275,3 +275,7 @@
  #endif /* __STDC_WANT_DEC_FP__ */
  
  #endif /* _FLOAT_H___ */
--- a/src/gcc.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/gcc.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # GCC
 PKG             := gcc
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.6.0
-$(PKG)_CHECKSUM := dcbb5ce724c4bf87b9ec93473d16b71e9ebac483
+$(PKG)_VERSION  := 4.6.1
+$(PKG)_CHECKSUM := 8bf66f7a71534ba564563a0ba0b2517aead8ac30
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://gcc.gnu.org/
--- a/src/geos.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/geos.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # GEOS
 PKG             := geos
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.3.0rc1
-$(PKG)_CHECKSUM := 6a8f7153d887d7a5085dcee62251b6f9c82a2283
+$(PKG)_VERSION  := 3.3.0
+$(PKG)_CHECKSUM := f6c6e3398d5c7bf389a0610a0d06896d76ad4480
 $(PKG)_SUBDIR   := geos-$($(PKG)_VERSION)
 $(PKG)_FILE     := geos-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://trac.osgeo.org/geos/
--- a/src/glib-1-fixes.patch	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/glib-1-fixes.patch	Thu Jun 30 01:08:50 2011 +0200
@@ -6,7 +6,7 @@
 From 4693f62d3f01f7b7d26607e6eed843202cbf90f7 Mon Sep 17 00:00:00 2001
 From: mingw-cross-env
 Date: Thu, 23 Sep 2010 21:36:04 +0200
-Subject: [PATCH 1/7] no gtk doc check
+Subject: [PATCH 1/5] no gtk doc check
 
 
 diff --git a/configure.ac b/configure.ac
@@ -29,7 +29,7 @@
 From 46d0d473e6fb32c5204d063cad5f5073d2a139a5 Mon Sep 17 00:00:00 2001
 From: mingw-cross-env
 Date: Thu, 23 Sep 2010 21:41:51 +0200
-Subject: [PATCH 2/7] optional gettext
+Subject: [PATCH 2/5] optional gettext
 
 
 diff --git a/configure.ac b/configure.ac
@@ -71,7 +71,7 @@
 From 3473b5183b2e59d247cd1db053efc6c9ecaf2aab Mon Sep 17 00:00:00 2001
 From: mingw-cross-env
 Date: Thu, 23 Sep 2010 21:42:46 +0200
-Subject: [PATCH 3/7] fix tool paths
+Subject: [PATCH 3/5] fix tool paths
 
 
 diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
@@ -98,7 +98,7 @@
 From 0e57514812500d5d4dee03e1be8059a25876dd99 Mon Sep 17 00:00:00 2001
 From: mingw-cross-env
 Date: Thu, 23 Sep 2010 21:45:50 +0200
-Subject: [PATCH 4/7] fix dependency libs
+Subject: [PATCH 4/5] fix dependency libs
 
 
 diff --git a/configure.ac b/configure.ac
@@ -132,7 +132,7 @@
 From 87931c81f6401fb0c25064ec0ba2edca9ec53924 Mon Sep 17 00:00:00 2001
 From: mingw-cross-env
 Date: Sat, 25 Sep 2010 00:07:33 +0200
-Subject: [PATCH 5/7] add -ldnsapi to gio-2.0.pc
+Subject: [PATCH 5/5] add -ldnsapi to gio-2.0.pc
 
 
 diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
@@ -149,56 +149,3 @@
  Cflags: 
 -- 
 1.7.1
-
-
-From 58d20f08e876298e795f7282ddc6cfccbe6f05fe Mon Sep 17 00:00:00 2001
-From: mingw-cross-env
-Date: Sun, 3 Oct 2010 20:24:46 +0200
-Subject: [PATCH 6/7] darwin config libiconv
-
-
-diff --git a/configure.ac b/configure.ac
-index e472768..a681285 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -374,6 +374,12 @@ dnl ***********************
- dnl
- dnl We do this before the gettext checks, to avoid distortion
- 
-+case $host in
-+  *-*-darwin*)
-+    with_libiconv=native
-+    ;;
-+esac
-+
- dnl On Windows we use a native implementation
- 
- if test x"$glib_native_win32" = xyes; then
--- 
-1.7.1
-
-
-From a340fa1dfbf9a8ac58cd1b026bd26de30d7fc581 Mon Sep 17 00:00:00 2001
-From: mingw-cross-env
-Date: Sun, 3 Oct 2010 20:25:32 +0200
-Subject: [PATCH 7/7] apple iconv
-
-This patch has been taken from:
-http://mail.gnome.org/archives/gtk-list/2009-August/msg00146.html
-
-diff --git a/glib/gconvert.c b/glib/gconvert.c
-index 52a3dd8..d8b4f89 100644
---- a/glib/gconvert.c
-+++ b/glib/gconvert.c
-@@ -61,7 +61,7 @@
- #if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H)
- #error GNU libiconv in use but included iconv.h not from libiconv
- #endif
--#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
-+#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) && !defined(__APPLE__)
- #error GNU libiconv not in use but included iconv.h is from libiconv
- #endif
- 
--- 
-1.7.1
-
--- a/src/glib.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/glib.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # GLib
 PKG             := glib
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.28.6
-$(PKG)_CHECKSUM := 51996339c823cf36ba28c774c4afad933d5f5744
+$(PKG)_VERSION  := 2.28.8
+$(PKG)_CHECKSUM := 20cd63705a8805260da0320c65b979233f2e3c18
 $(PKG)_SUBDIR   := glib-$($(PKG)_VERSION)
 $(PKG)_FILE     := glib-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gtk.org/
--- a/src/glibmm.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/glibmm.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # GLibmm
 PKG             := glibmm
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.28.1
-$(PKG)_CHECKSUM := 76cfba52d8fb1e3f46d14c3fea31269deb49e2fc
+$(PKG)_VERSION  := 2.28.2
+$(PKG)_CHECKSUM := d15bc0fed7dea6fec73746370653687f74e02592
 $(PKG)_SUBDIR   := glibmm-$($(PKG)_VERSION)
 $(PKG)_FILE     := glibmm-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gtkmm.org/
--- a/src/gnutls.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/gnutls.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -3,12 +3,12 @@
 
 # GnuTLS
 PKG             := gnutls
-$(PKG)_VERSION  := 2.12.5
-$(PKG)_CHECKSUM := dd45d4fb7c365d18803b9eafef838b310c899d67
+$(PKG)_VERSION  := 2.12.7
+$(PKG)_CHECKSUM := 41943d8f8648072a8e6a40cb213c91acf0451937
 $(PKG)_SUBDIR   := gnutls-$($(PKG)_VERSION)
 $(PKG)_FILE     := gnutls-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gnu.org/software/gnutls/
-$(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/gnutls/$($(PKG)_FILE)
+$(PKG)_URL      := ftp://ftp.gnutls.org/pub/gnutls/$($(PKG)_FILE)
 $(PKG)_URL_2    := ftp://ftp.gnupg.org/gcrypt/gnutls/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc zlib libgcrypt
 
--- a/src/gsoap-1-fixes.patch	Thu Jun 30 01:07:59 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-Patches taken from
-https://sourceforge.net/tracker/?func=detail&aid=3288762&group_id=52781&atid=468023
-https://sourceforge.net/tracker/?func=detail&aid=3288772&group_id=52781&atid=468023
-
-From d49ac167169e2db531e1be5a48575186c8bc8799 Mon Sep 17 00:00:00 2001
-From: mingw-cross-env
-Date: Mon, 18 Apr 2011 09:20:27 +0200
-Subject: [PATCH 1/2] use ws2spi instead of wspiapi
-
-
-diff --git a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h
-index 238b7f1..ffccf80 100644
---- a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h
-+++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h
-@@ -693,7 +693,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
- # endif
- #  include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
- #  include <ws2tcpip.h>
--#  include <wspiapi.h>
-+#  include <ws2spi.h>
- # ifdef WITH_IPV6
- #  define SOAP_GAI_STRERROR gai_strerrorA
- # endif
-diff --git a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h
-index 238b7f1..ffccf80 100644
---- a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h
-+++ b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h
-@@ -693,7 +693,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
- # endif
- #  include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
- #  include <ws2tcpip.h>
--#  include <wspiapi.h>
-+#  include <ws2spi.h>
- # ifdef WITH_IPV6
- #  define SOAP_GAI_STRERROR gai_strerrorA
- # endif
-diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h
-index 238b7f1..ffccf80 100644
---- a/gsoap/stdsoap2.h
-+++ b/gsoap/stdsoap2.h
-@@ -693,7 +693,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
- # endif
- #  include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
- #  include <ws2tcpip.h>
--#  include <wspiapi.h>
-+#  include <ws2spi.h>
- # ifdef WITH_IPV6
- #  define SOAP_GAI_STRERROR gai_strerrorA
- # endif
--- 
-1.7.4.1
-
-
-From 2ed5f1205a5517c4f1d919942fbebd58327ee3df Mon Sep 17 00:00:00 2001
-From: mingw-cross-env
-Date: Mon, 18 Apr 2011 10:14:06 +0200
-Subject: [PATCH 2/2] add missing libs to gsoapssl++.pc
-
-
-diff --git a/gsoapssl++.pc.in b/gsoapssl++.pc.in
-index e8c8f4f..07515fe 100644
---- a/gsoapssl++.pc.in
-+++ b/gsoapssl++.pc.in
-@@ -7,5 +7,5 @@ Name: GSoap
- Description: SOAP C++ Web Services with SSL and ZLIB
- Version: @VERSION@
- Requires:
--Libs: -L${libdir} -lgsoapssl++
-+Libs: -L${libdir} -lgsoapssl++ @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
- Cflags: -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
--- 
-1.7.4.1
-
--- a/src/gsoap.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/gsoap.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # gSOAP
 PKG             := gsoap
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.8.2
-$(PKG)_CHECKSUM := 199b7d4cf0b6a5bf81a2198e39f03c092ffc05a7
+$(PKG)_VERSION  := 2.8.3
+$(PKG)_CHECKSUM := 55677239751253b48f448eb30a7585df97cba486
 $(PKG)_SUBDIR   := gsoap-$(call SHORT_PKG_VERSION,$(PKG))
 $(PKG)_FILE     := gsoap_$($(PKG)_VERSION).zip
 $(PKG)_WEBSITE  := http://gsoap2.sourceforge.net/
--- a/src/gst-plugins-base.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/gst-plugins-base.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # gst-plugins-base
 PKG             := gst-plugins-base
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.10.34
-$(PKG)_CHECKSUM := 4db5f3112fe3a74ba46443e577647cff65b727e7
+$(PKG)_VERSION  := 0.10.35
+$(PKG)_CHECKSUM := 6d7dc463fed5dd43f79a53ad523fcbd6d0916303
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://gstreamer.freedesktop.org/
--- a/src/gst-plugins-good.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/gst-plugins-good.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # gst-plugins-good
 PKG             := gst-plugins-good
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.10.29
-$(PKG)_CHECKSUM := a0e55c20ae36c8de18990c56b4d97ed3997cc6e0
+$(PKG)_VERSION  := 0.10.30
+$(PKG)_CHECKSUM := 9c78a751bb2f20ad50a1daf6860e0098e0495f5a
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://gstreamer.freedesktop.org/
--- a/src/gstreamer.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/gstreamer.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # gstreamer
 PKG             := gstreamer
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.10.34
-$(PKG)_CHECKSUM := 3ebb64dceb45963e8be17c447a24a63958705164
+$(PKG)_VERSION  := 0.10.35
+$(PKG)_CHECKSUM := ad03b8aca7b2415929b6ecc4c140b178acef39de
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://gstreamer.freedesktop.org/
--- a/src/imagemagick.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/imagemagick.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,10 +4,10 @@
 # ImageMagick
 PKG             := imagemagick
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 6.6.9-9
-$(PKG)_CHECKSUM := 1d46f9d2b9294b11b9e9c03ee8da7e1df8d92fef
+$(PKG)_VERSION  := 6.7.0-9
+$(PKG)_CHECKSUM := 13cf46f8cef3036e3eeb5144bdd8a2427af3433e
 $(PKG)_SUBDIR   := ImageMagick-$($(PKG)_VERSION)
-$(PKG)_FILE     := ImageMagick-$($(PKG)_VERSION).tar.bz2
+$(PKG)_FILE     := ImageMagick-$($(PKG)_VERSION).tar.xz
 $(PKG)_WEBSITE  := http://www.imagemagick.org/
 $(PKG)_URL      := http://ftp.nluug.nl/ImageMagick/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc bzip2 ffmpeg fftw freetype jasper jpeg lcms libpng libtool openexr pthreads tiff zlib
--- a/src/lcms.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/lcms.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # lcms
 PKG             := lcms
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.1
-$(PKG)_CHECKSUM := 0ce856a004068ff6e22f9f2d7b94a11b9b469bf9
+$(PKG)_VERSION  := 2.2
+$(PKG)_CHECKSUM := 55ae4884a92c7fbd491c118aa3b356814b1014df
 $(PKG)_SUBDIR   := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION))
 $(PKG)_FILE     := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION)).tar.gz
 $(PKG)_WEBSITE  := http://www.littlecms.com/
--- a/src/libass.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/libass.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,10 +4,10 @@
 # libass
 PKG             := libass
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.9.11
-$(PKG)_CHECKSUM := 6f69f6c4474c649de4fd7913b050bfd4cf8110cb
+$(PKG)_VERSION  := 0.9.12
+$(PKG)_CHECKSUM := 7ce9689a6a3f822477880f3d11203a7f65444396
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.xz
 $(PKG)_WEBSITE  := http://code.google.com/p/libass/
 $(PKG)_URL      := http://libass.googlecode.com/files/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc freetype fontconfig
--- a/src/libevent.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/libevent.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # libevent
 PKG             := libevent
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.0.11
-$(PKG)_CHECKSUM := 843b5d395054b9d4d5586220c004c29cdcc37fcf
+$(PKG)_VERSION  := 2.0.12
+$(PKG)_CHECKSUM := fa2e1643101a8f8eba8e6fcffdce97cb9309c1d2
 $(PKG)_SUBDIR   := libevent-$($(PKG)_VERSION)-stable
 $(PKG)_FILE     := libevent-$($(PKG)_VERSION)-stable.tar.gz
 $(PKG)_WEBSITE  := http://monkey.org/~provos/libevent/
--- a/src/libgcrypt.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/libgcrypt.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # libgcrypt
 PKG             := libgcrypt
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.4.6
-$(PKG)_CHECKSUM := 445b9e158aaf91e24eae3d1040c6213e9d9f5ba6
+$(PKG)_VERSION  := 1.5.0
+$(PKG)_CHECKSUM := 3e776d44375dc1a710560b98ae8437d5da6e32cf
 $(PKG)_SUBDIR   := libgcrypt-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgcrypt-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := ftp://ftp.gnupg.org/gcrypt/libgcrypt/
--- a/src/libgsf-1-fixes.patch	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/libgsf-1-fixes.patch	Thu Jun 30 01:08:50 2011 +0200
@@ -6,7 +6,7 @@
 From f2970c9c697dd6a6104495ea91ed2488ead297b7 Mon Sep 17 00:00:00 2001
 From: mingw-cross-env
 Date: Fri, 24 Sep 2010 23:34:26 +0200
-Subject: [PATCH 1/2] s,DllMain,static _disabled_DllMain,
+Subject: [PATCH 1/1] s,DllMain,static _disabled_DllMain,
 
 
 diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c
@@ -28,28 +28,3 @@
 -- 
 1.7.1
 
-
-From ab87b1b623f774244935bf9f1d82365a3203d8db Mon Sep 17 00:00:00 2001
-From: mingw-cross-env
-Date: Wed, 29 Sep 2010 20:15:48 +0200
-Subject: [PATCH 2/2] no gettext
-
-
-diff --git a/configure.in b/configure.in
-index af40c28..7ce5f7b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -53,10 +53,6 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- 
- dnl Gettext/i18n stuff
- 
--IT_PROG_INTLTOOL([0.35.0])
--
--AM_GLIB_GNU_GETTEXT
--
- GETTEXT_PACKAGE=AC_PACKAGE_NAME
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
--- 
-1.7.1
-
--- a/src/libgsf.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/libgsf.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # libgsf
 PKG             := libgsf
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.14.20
-$(PKG)_CHECKSUM := d172b454c1b98f9c111df11e000b1ced050bdac9
+$(PKG)_VERSION  := 1.14.21
+$(PKG)_CHECKSUM := 17981f238f1f8dddb7af01c161bd6a1c4d5e85d2
 $(PKG)_SUBDIR   := libgsf-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgsf-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://ftp.gnome.org/pub/gnome/sources/libgsf/
@@ -23,8 +23,6 @@
 define $(PKG)_BUILD
     $(SED) -i 's,^\(Requires:.*\),\1 gio-2.0,' '$(1)'/libgsf-1.pc.in
     echo 'Libs.private: -lz -lbz2'          >> '$(1)'/libgsf-1.pc.in
-    cd '$(1)' && aclocal -I m4
-    cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libircclient-1-fixes.patch	Thu Jun 30 01:08:50 2011 +0200
@@ -0,0 +1,172 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+Contains ad hoc patches for cross building.
+
+From 7e5a98fd8854295cfde1987cb7d077c5876111b2 Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
+Date: Thu, 23 Jun 2011 15:45:49 +1000
+Subject: [PATCH 1/3] The wrong source files are specified in the makefile.
+
+There is one wrapper source file which includes all and
+implements additional functions.
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 091c6af..e3b7f81 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -20,7 +20,7 @@ install: lib
+ 	cp ../include/libirc_events.h  @prefix@/include/libirc_events.h 
+ 	cp libirc.a @prefix@/include/lib/libirc.a
+ 
+-$(OBJS): utils.c dcc.c errors.c portable.c sockets.c colors.c
++$(OBJS): libircclient.c
+ 
+ libircclient.a: $(OBJS)
+ 	$(AR) libircclient.a $(OBJS)
+-- 
+1.7.3.4
+
+
+From e7a3c62440a8c89c48914d8d45bb2e3d14b9bbd8 Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
+Date: Thu, 23 Jun 2011 15:47:52 +1000
+Subject: [PATCH 2/3] IPv6 support is broken and is forced to be disabled.
+
+This place is sufficient - IPv6 initialisation will now cause an error.
+
+diff --git a/src/libircclient.c b/src/libircclient.c
+index 5d266c0..1ec11c1 100644
+--- a/src/libircclient.c
++++ b/src/libircclient.c
+@@ -194,7 +194,7 @@ int irc_connect6 (irc_session_t * session,
+ 			const char * username,
+ 			const char * realname)
+ {
+-#if defined (ENABLE_IPV6)
++#if 0
+ 	struct sockaddr_in6 saddr;
+ 	struct addrinfo ainfo, *res = NULL;
+ 	char portStr[32];
+-- 
+1.7.3.4
+
+
+From 78326f1af372da340197c15897b54fdd45652bf3 Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
+Date: Thu, 23 Jun 2011 15:48:33 +1000
+Subject: [PATCH 3/3] Use the proper WIN32 define.
+
+
+diff --git a/include/libircclient.h b/include/libircclient.h
+index c78f3b1..23d1a51 100644
+--- a/include/libircclient.h
++++ b/include/libircclient.h
+@@ -43,7 +43,7 @@
+ #ifndef INCLUDE_LIBIRC_H
+ #define INCLUDE_LIBIRC_H
+ 
+-#if !defined (WIN32)
++#if !defined (_WIN32)
+ 	#include <sys/select.h>	/* fd_set */
+ #else
+ 	#include <winsock2.h>
+diff --git a/src/portable.c b/src/portable.c
+index 8071c13..ab8a57b 100644
+--- a/src/portable.c
++++ b/src/portable.c
+@@ -13,7 +13,7 @@
+  */
+ 
+ 
+-#if !defined (WIN32)
++#if !defined (_WIN32)
+ 	#include "config.h"
+ 	#include <stdio.h>
+ 	#include <stdarg.h>
+@@ -65,7 +65,7 @@
+ 
+ static inline int libirc_mutex_init (port_mutex_t * mutex)
+ {
+-#if defined (WIN32)
++#if defined (_WIN32)
+ 	InitializeCriticalSection (mutex);
+ 	return 0;
+ #elif defined (PTHREAD_MUTEX_RECURSIVE)
+@@ -78,13 +78,13 @@ static inline int libirc_mutex_init (port_mutex_t * mutex)
+ 
+ 	return pthread_mutex_init (mutex, 0);
+ 
+-#endif /* defined (WIN32) */
++#endif /* defined (_WIN32) */
+ }
+ 
+ 
+ static inline void libirc_mutex_destroy (port_mutex_t * mutex)
+ {
+-#if defined (WIN32)
++#if defined (_WIN32)
+ 	DeleteCriticalSection (mutex);
+ #else
+ 	pthread_mutex_destroy (mutex);
+@@ -94,7 +94,7 @@ static inline void libirc_mutex_destroy (port_mutex_t * mutex)
+ 
+ static inline void libirc_mutex_lock (port_mutex_t * mutex)
+ {
+-#if defined (WIN32)
++#if defined (_WIN32)
+ 	EnterCriticalSection (mutex);
+ #else
+ 	pthread_mutex_lock (mutex);
+@@ -104,7 +104,7 @@ static inline void libirc_mutex_lock (port_mutex_t * mutex)
+ 
+ static inline void libirc_mutex_unlock (port_mutex_t * mutex)
+ {
+-#if defined (WIN32)
++#if defined (_WIN32)
+ 	LeaveCriticalSection (mutex);
+ #else
+ 	pthread_mutex_unlock (mutex);
+diff --git a/src/sockets.c b/src/sockets.c
+index c2b33f1..e73f62c 100644
+--- a/src/sockets.c
++++ b/src/sockets.c
+@@ -15,7 +15,7 @@
+ /*
+  * The sockets interface was moved out to simplify going OpenSSL integration.
+  */
+-#if !defined (WIN32)
++#if !defined (_WIN32)
+ 	#include <sys/socket.h>
+ 	#include <netdb.h>
+ 	#include <arpa/inet.h>	
+@@ -47,7 +47,7 @@
+ 
+ static int socket_error()
+ {
+-#if !defined (WIN32)
++#if !defined (_WIN32)
+ 	return errno;
+ #else
+ 	return WSAGetLastError();
+@@ -64,7 +64,7 @@ static int socket_create (int domain, int type, socket_t * sock)
+ 
+ static int socket_make_nonblocking (socket_t * sock)
+ {
+-#if !defined (WIN32)
++#if !defined (_WIN32)
+ 	return fcntl (*sock, F_SETFL, fcntl (*sock, F_GETFL,0 ) | O_NONBLOCK) != 0;
+ #else
+ 	unsigned long mode = 0;
+@@ -75,7 +75,7 @@ static int socket_make_nonblocking (socket_t * sock)
+ 
+ static int socket_close (socket_t * sock)
+ {
+-#if !defined (WIN32)
++#if !defined (_WIN32)
+ 	close (*sock);
+ #else
+ 	closesocket (*sock);
+-- 
+1.7.3.4
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libircclient-test.cpp	Thu Jun 30 01:08:50 2011 +0200
@@ -0,0 +1,16 @@
+/* This file is part of mingw-cross-env.       */
+/* See doc/index.html for further information. */
+
+#include <libircclient/libircclient.h>
+
+int main(int argc, char *argv[])
+{
+    (void)argc;
+    (void)argv;
+
+    irc_callbacks_t callbacks;
+    memset(&callbacks, 0, sizeof(callbacks));
+
+    irc_create_session(&callbacks);
+    return 0;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libircclient.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -0,0 +1,43 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+# libircclient
+# Note that IPv6 support is partly broken and therefore disabled.
+PKG             := libircclient
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.3
+$(PKG)_CHECKSUM := 19b01d0227e717b58630037131798ee34fb0b414
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_WEBSITE  := http://sourceforge.net/projects/$(PKG)/
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://sourceforge.net/projects/libircclient/files/libircclient/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --host='$(TARGET)' \
+        --disable-debug \
+        --enable-threads \
+        --disable-ipv6
+    $(MAKE) -C '$(1)'/src -j '$(JOBS)'
+    $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
+    $(INSTALL) -m644 '$(1)/src/libircclient.a' '$(PREFIX)/$(TARGET)/lib/'
+    $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/libircclient'
+    $(INSTALL) -m644 '$(1)/include/libircclient.h' '$(PREFIX)/$(TARGET)/include/libircclient' 
+    $(INSTALL) -m644 '$(1)/include/libirc_errors.h' '$(PREFIX)/$(TARGET)/include/libircclient'
+    $(INSTALL) -m644 '$(1)/include/libirc_events.h' '$(PREFIX)/$(TARGET)/include/libircclient'
+    $(INSTALL) -m644 '$(1)/include/libirc_rfcnumeric.h' '$(PREFIX)/$(TARGET)/include/libircclient'
+    $(INSTALL) -m644 '$(1)/include/libirc_options.h' '$(PREFIX)/$(TARGET)/include/libircclient'
+
+    '$(TARGET)-g++' \
+        -W -Wall -Werror -ansi -pedantic \
+        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-libircclient.exe' \
+        -lircclient -lws2_32
+endef
--- a/src/libntlm.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/libntlm.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,12 +4,12 @@
 # Libntlm
 PKG             := libntlm
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2
-$(PKG)_CHECKSUM := 27538a3375690a37574fa991fbd327d150d8b505
+$(PKG)_VERSION  := 1.3
+$(PKG)_CHECKSUM := 5dd798d5fb9a75656225052aa88ceb9befbbd4a0
 $(PKG)_SUBDIR   := libntlm-$($(PKG)_VERSION)
 $(PKG)_FILE     := libntlm-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://josefsson.org/libntlm/
-$(PKG)_URL      := http://josefsson.org/libntlm/releases/$($(PKG)_FILE)
+$(PKG)_URL      := http://www.nongnu.org/libntlm/releases//$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
--- a/src/openscenegraph-3-pkg-config.patch	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/openscenegraph-3-pkg-config.patch	Thu Jun 30 01:08:50 2011 +0200
@@ -4,7 +4,7 @@
 diff -uNr OpenSceneGraph-2.8.3.orig/CMakeLists.txt OpenSceneGraph-2.8.3/CMakeLists.txt
 --- OpenSceneGraph-2.8.3.orig/CMakeLists.txt	2010-04-01 11:02:54.000000000 +0200
 +++ OpenSceneGraph-2.8.3/CMakeLists.txt	2010-04-20 07:41:05.000000000 +0200
-@@ -802,12 +802,34 @@
+@@ -810,12 +810,34 @@
  
  # Generate pkg-config configuration file
  
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/openscenegraph-4-curl.patch	Thu Jun 30 01:08:50 2011 +0200
@@ -0,0 +1,33 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+This patch taken from:
+http://lists.openscenegraph.org/pipermail/osg-submissions-openscenegraph.org/2011-June/008449.html
+
+From 6876c578528ecc61088940fb9358e393811e43ef Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Tue, 28 Jun 2011 00:34:27 +0200
+Subject: [PATCH] remove include of obsolete curl/types.h
+
+Quoth curl-7.21.7/CHANGES:
+
+    Removed types.h (it's been unused since April 2004)
+---
+ src/osgPlugins/curl/ReaderWriterCURL.cpp |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/src/osgPlugins/curl/ReaderWriterCURL.cpp b/src/osgPlugins/curl/ReaderWriterCURL.cpp
+index 83aee7b..daf156f 100644
+--- a/src/osgPlugins/curl/ReaderWriterCURL.cpp
++++ b/src/osgPlugins/curl/ReaderWriterCURL.cpp
+@@ -21,7 +21,6 @@
+ #include <fstream>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ 
+ #include "ReaderWriterCURL.h"
+ 
+-- 
+1.7.5.4
+
--- a/src/openscenegraph.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/openscenegraph.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # OpenSceneGraph
 PKG             := openscenegraph
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.8.4
-$(PKG)_CHECKSUM := 356ecd39f7e714dabb6776e23303fe3f1798a7cf
+$(PKG)_VERSION  := 2.8.5
+$(PKG)_CHECKSUM := 7325504070a262aa6eb952bc36d98843a4ed4cf7
 $(PKG)_SUBDIR   := OpenSceneGraph-$($(PKG)_VERSION)
 $(PKG)_FILE     := OpenSceneGraph-$($(PKG)_VERSION).zip
 $(PKG)_WEBSITE  := http://www.openscenegraph.org/
--- a/src/pfstools.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/pfstools.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # pfstools
 PKG             := pfstools
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.8.3
-$(PKG)_CHECKSUM := b13d1863944afc4a88eb6ec92954677995399ab7
+$(PKG)_VERSION  := 1.8.4
+$(PKG)_CHECKSUM := 7090fcf05850ad3186d36f750cab6810fac4a753
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://$(PKG).sourceforge.net/
--- a/src/qt-1-cherrypicks.patch	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/qt-1-cherrypicks.patch	Thu Jun 30 01:08:50 2011 +0200
@@ -7,7 +7,7 @@
 From bb75d02785da59c967dee09006700488af9f482e Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 15 Oct 2010 14:56:03 +0200
-Subject: [PATCH 01/16] removed obsolete -qt-gif configure option
+Subject: [PATCH 01/17] removed obsolete -qt-gif configure option
 
 Since "-system-gif" is not offered, offering "-qt-gif" is unnecessary
 and perhaps misleading. By default the GIF handler is built from code
@@ -84,13 +84,13 @@
          desc("LIBPNG", "no",    "-no-libpng",           "Do not compile PNG support.");
          desc("LIBPNG", "qt",    "-qt-libpng",           "Use the libpng bundled with Qt.");
 -- 
-1.7.4.2
+1.7.6
 
 
 From b5e382d8335628edf5d5c5a1671682de7c50c6d2 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 10 Jan 2011 16:41:54 +0100
-Subject: [PATCH 02/16] qmake: fix double directory separator
+Subject: [PATCH 02/17] qmake: fix double directory separator
 
 Merge-request: 2543
 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
@@ -120,13 +120,14 @@
          if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
              ret.prepend(project->first("DESTDIR"));
 -- 
-1.7.4.2
+1.7.6
 
 
 From f35c452aaf665489060d317ce180d192433abd24 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 10 Jan 2011 16:41:55 +0100
-Subject: [PATCH 03/16] qmake: don't limit pkg-config writing to unix generator
+Subject: [PATCH 03/17] qmake: don't limit pkg-config writing to unix
+ generator
 
 Move pkg-config related methods from unix generator to base class
 so they can be used by other generators too.
@@ -547,13 +548,13 @@
 -
  QT_END_NAMESPACE
 -- 
-1.7.4.2
+1.7.6
 
 
 From e8afbb5a998931c154aa83ed87be6521cb8d50d3 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 10 Jan 2011 16:41:56 +0100
-Subject: [PATCH 04/16] qmake: write and install pkg-config files for mingw
+Subject: [PATCH 04/17] qmake: write and install pkg-config files for mingw
 
 Merge-request: 2543
 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
@@ -601,13 +602,13 @@
              QString lib_target = getLibTarget();
              lib_target.remove('"');
 -- 
-1.7.4.2
+1.7.6
 
 
 From 175b395655d3f24aea0e4232069853dca1c33efd Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 10 Jan 2011 16:41:57 +0100
-Subject: [PATCH 05/16] qt project files: create pkg-config files for mingw
+Subject: [PATCH 05/17] qt project files: create pkg-config files for mingw
 
 This is mostly the same as for unix.
 
@@ -934,13 +935,13 @@
     QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
     QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET
 -- 
-1.7.4.2
+1.7.6
 
 
 From 5ef7985e6015c09735094545a07ed93832075507 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 10 Jan 2011 20:21:05 +0100
-Subject: [PATCH 06/16] Fix static build on Windows with MinGW.
+Subject: [PATCH 06/17] Fix static build on Windows with MinGW.
 
 Q_DECL_IMPORT is still __declspec(dllimport), which is unsuitable for
 static code.
@@ -1121,13 +1122,14 @@
  int QVGPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const
  {
 -- 
-1.7.4.2
+1.7.6
 
 
 From 3411ae8c3d83b3eb9407c8c338336e95fe74edf3 Mon Sep 17 00:00:00 2001
 From: Bernhard Rosenkraenzer <br@blankpage.ch>
 Date: Thu, 27 Jan 2011 13:48:13 +0100
-Subject: [PATCH 07/16] Allow the user to select imageformats to be built as plugin vs internal
+Subject: [PATCH 07/17] Allow the user to select imageformats to be built as
+ plugin vs internal
 
 This adds what is already there for different plugin types to
 imageformats plugins -- allowing the user to configure which
@@ -1229,13 +1231,14 @@
          // IDE project generation -----------------------------------
          else if (configCmdLine.at(i) == "-no-dsp")
 -- 
-1.7.4.2
+1.7.6
 
 
 From 8d719e67c51987fb6439ea1d05a2b10684b974e1 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Tue, 16 Nov 2010 20:06:28 +0100
-Subject: [PATCH 08/16] explicitly include -llcms for -lmng (mingw-cross-env specific)
+Subject: [PATCH 08/17] explicitly include -llcms for -lmng (mingw-cross-env
+ specific)
 
 ---
  src/gui/image/qmnghandler.pri |    2 +-
@@ -1255,13 +1258,14 @@
  } else {
      include($$PWD/../../3rdparty/libmng.pri)
 -- 
-1.7.4.2
+1.7.6
 
 
 From c34bd635af9263d1a719cd270db123b1a787640c Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Sat, 5 Jun 2010 23:41:04 +0200
-Subject: [PATCH 09/16] added missing INSTALLS to JavaScriptCore.pro for static libjscore (mingw-cross-env specific)
+Subject: [PATCH 09/17] added missing INSTALLS to JavaScriptCore.pro for
+ static libjscore (mingw-cross-env specific)
 
 For static build of Qt on win32-g++*, applications using webkit
 link to libjscore.a.
@@ -1287,13 +1291,14 @@
  
  CONFIG(QTDIR_build) {
 -- 
-1.7.4.2
+1.7.6
 
 
 From c56ec08a3e3af1a9beae552872b443c6a7cf401c Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Tue, 9 Nov 2010 20:09:45 +0100
-Subject: [PATCH 10/16] Partially restored support for static linking of QtWebKit (mingw-cross-env specific)
+Subject: [PATCH 10/17] Partially restored support for static linking of
+ QtWebKit (mingw-cross-env specific)
 
 Support was removed by 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113.
 Static QtWebkit might be supported by mingw-cross-env.
@@ -1319,13 +1324,13 @@
  CFG_CONCURRENT="yes"
  if [ "$canBuildQtConcurrent" = "no" ]; then
 -- 
-1.7.4.2
+1.7.6
 
 
 From 074e13614d6071247600eea3c3d6a1f4c4f4a0d5 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 6 Jan 2011 14:21:32 +0100
-Subject: [PATCH 11/16] pkg-config file for jscore (mingw-cross-env specific)
+Subject: [PATCH 11/17] pkg-config file for jscore (mingw-cross-env specific)
 
 ---
  .../webkit/JavaScriptCore/JavaScriptCore.pro       |    8 ++++++++
@@ -1348,13 +1353,14 @@
 +   QMAKE_PKGCONFIG_DESTDIR = pkgconfig
 +}
 -- 
-1.7.4.2
+1.7.6
 
 
 From c907c7c1f0922416fd5f19cb477b71c6f97fee45 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Mon, 21 Feb 2011 22:22:04 +0100
-Subject: [PATCH 12/16] workaround for native build on OSX (mingw-cross-env specific)
+Subject: [PATCH 12/17] workaround for native build on OSX (mingw-cross-env
+ specific)
 
 The native build complains about:
 "You are building a 64-bit application, but using a 32-bit version of
@@ -1379,13 +1385,13 @@
  include(../common/mac-g++.conf)
  
 -- 
-1.7.4.2
+1.7.6
 
 
 From ac552171a0729e1fae026741e4ec89a415298667 Mon Sep 17 00:00:00 2001
 From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 Date: Mon, 10 Jan 2011 20:09:24 +0100
-Subject: [PATCH 13/16] fix -enable-stdcall-fixup usage
+Subject: [PATCH 13/17] fix -enable-stdcall-fixup usage
 
 the leading "-Wl," was apparently accidentally split off to the wrong
 line.
@@ -1413,13 +1419,13 @@
  QMAKE_LFLAGS_RELEASE	= -Wl,-s
  QMAKE_LFLAGS_DEBUG	=
 -- 
-1.7.4.2
+1.7.6
 
 
 From 0e32298cb08ef1168dc6c06dd48bab8ee62c6e5d Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 28 Mar 2011 13:33:58 +0200
-Subject: [PATCH 14/16] fix -enable-stdcall-fixup usage
+Subject: [PATCH 14/17] fix -enable-stdcall-fixup usage
 
 the leading "-Wl," was apparently accidentally split off to the wrong
 line.
@@ -1449,13 +1455,14 @@
  QMAKE_LFLAGS_RELEASE	= -Wl,-s
  QMAKE_LFLAGS_DEBUG	=
 -- 
-1.7.4.2
+1.7.6
 
 
 From 0a9731cad65337c7084791b54db8bfeb0939dc7d Mon Sep 17 00:00:00 2001
 From: Jonathan Liu <net147@gmail.com>
 Date: Mon, 4 Apr 2011 13:01:48 +0200
-Subject: [PATCH 15/16] win32-g++: Correct the order of linked Windows libraries
+Subject: [PATCH 15/17] win32-g++: Correct the order of linked Windows
+ libraries
 
 On Windows 7, kernel32.dll exports many of the same functions as
 advapi32.dll. If executables link to these functions in kernel32.dll
@@ -1530,13 +1537,14 @@
  
      qnx {
 -- 
-1.7.4.2
+1.7.6
 
 
 From c4a1848f4178fe99daa2c12ad1f14e8de14cc389 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Tue, 5 Apr 2011 10:35:58 +0200
-Subject: [PATCH 16/16] win32-g++: Correct the order of linked Windows libraries
+Subject: [PATCH 16/17] win32-g++: Correct the order of linked Windows
+ libraries
 
 Commit a6d48ca corrected the problem for win32-g++. Here we do the same
 for win32-g++-cross.
@@ -1562,5 +1570,54 @@
  QMAKE_LIBS_NETWORK      = -lws2_32
  QMAKE_LIBS_OPENGL       = -lglu32 -lopengl32 -lgdi32 -luser32
 -- 
-1.7.4.2
+1.7.6
+
+
+From 31cbd33f7f47bbfe52de9b27a6020e87f309d2be Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Tue, 28 Jun 2011 23:02:29 +0200
+Subject: [PATCH 17/17] link static text codec plugins (mingw-cross-env
+ specific)
+
+Static QtCore for Windows introduces dependencies on the text codec plugins.
+Without this patch, users would have to handle these dependencies explicitly
+when building any Qt application.
+---
+ src/corelib/corelib.pro                   |    1 +
+ src/plugins/codecs/staticcodecplugins.cpp |    5 +++++
+ src/plugins/codecs/staticcodecplugins.pri |    2 ++
+ 3 files changed, 8 insertions(+), 0 deletions(-)
+ create mode 100644 src/plugins/codecs/staticcodecplugins.cpp
+ create mode 100644 src/plugins/codecs/staticcodecplugins.pri
 
+diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
+index 06aa191..21a8316 100644
+--- a/src/corelib/corelib.pro
++++ b/src/corelib/corelib.pro
+@@ -40,3 +40,4 @@ symbian: {
+                   "$${LITERAL_HASH}endif"
+     MMP_RULES += pagingBlock
+ }
++win32:static:include(../plugins/codecs/staticcodecplugins.pri)
+diff --git a/src/plugins/codecs/staticcodecplugins.cpp b/src/plugins/codecs/staticcodecplugins.cpp
+new file mode 100644
+index 0000000..47f5bf3
+--- /dev/null
++++ b/src/plugins/codecs/staticcodecplugins.cpp
+@@ -0,0 +1,5 @@
++#include <QtPlugin>
++Q_IMPORT_PLUGIN(qcncodecs)
++Q_IMPORT_PLUGIN(qjpcodecs)
++Q_IMPORT_PLUGIN(qtwcodecs)
++Q_IMPORT_PLUGIN(qkrcodecs)
+diff --git a/src/plugins/codecs/staticcodecplugins.pri b/src/plugins/codecs/staticcodecplugins.pri
+new file mode 100644
+index 0000000..a579487
+--- /dev/null
++++ b/src/plugins/codecs/staticcodecplugins.pri
+@@ -0,0 +1,2 @@
++QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs
++SOURCES += $$PWD/staticcodecplugins.cpp
+-- 
+1.7.6
+
--- a/src/qt-test.cpp	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/qt-test.cpp	Thu Jun 30 01:08:50 2011 +0200
@@ -2,6 +2,7 @@
 /* See doc/index.html for further information. */
 
 #include <QApplication>
+#include <QtPlugin>
 #include "ui_qt-test.h"
 
 #ifdef  Q_OS_AIX
--- a/src/qt.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/qt.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -10,7 +10,7 @@
 $(PKG)_FILE     := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://qt.nokia.com/
 $(PKG)_URL      := http://get.qt.nokia.com/qt/source/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite libiconv dbus
+$(PKG)_DEPS     := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://qt.gitorious.org/qt/qt/commits' | \
@@ -41,6 +41,7 @@
         -prefix '$(PREFIX)/$(TARGET)' \
         -prefix-install \
         -script \
+        -no-iconv \
         -opengl desktop \
         -webkit \
         -no-glib \
--- a/src/sqlite.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/sqlite.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # SQLite
 PKG             := sqlite
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3070603
-$(PKG)_CHECKSUM := a19e4496e2854e737d55465b77c87e775a362775
+$(PKG)_VERSION  := 3070701
+$(PKG)_CHECKSUM := ee405037ab49f46f657a9b314e66eec6009d5fc6
 $(PKG)_SUBDIR   := $(PKG)-autoconf-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.sqlite.org/
--- a/src/vmime-1-fixes.patch	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/vmime-1-fixes.patch	Thu Jun 30 01:08:50 2011 +0200
@@ -44,7 +44,7 @@
 From c6f077e695b75d9ff9a32d1621f6a320c8ce70f1 Mon Sep 17 00:00:00 2001
 From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
 Date: Tue, 30 Nov 2010 14:57:03 +0000
-Subject: [PATCH 1/8] Initialize and delete object.
+Subject: [PATCH 01/16] Initialize and delete object.
 
 git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@577 5301114d-f842-0410-bbdd-996ee0417009
 
@@ -72,13 +72,15 @@
  
  		void go(IMAPParser& parser, string& line, string::size_type* currentPos)
 -- 
-1.7.4.1
+1.7.5.4
 
 
 From 41203315eacf53230dd7bdb0cf2b0d1078ddee39 Mon Sep 17 00:00:00 2001
 From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
 Date: Wed, 8 Dec 2010 08:52:54 +0000
-Subject: [PATCH 2/8] No extra space between ':' and '<' in MAIL FROM and RCPT TO. Wait for server response after QUIT and before closing connection.
+Subject: [PATCH 02/16] No extra space between ':' and '<' in MAIL FROM and
+ RCPT TO. Wait for server response after QUIT and
+ before closing connection.
 
 git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@579 5301114d-f842-0410-bbdd-996ee0417009
 
@@ -113,13 +115,13 @@
  		if ((resp = readResponse())->getCode() != 250)
  		{
 -- 
-1.7.4.1
+1.7.5.4
 
 
 From 969b56f4bd61ddb8277c04ac2a1e35e029ec058b Mon Sep 17 00:00:00 2001
 From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
 Date: Fri, 10 Dec 2010 16:24:06 +0000
-Subject: [PATCH 3/8] Fixed unit test after bug fix.
+Subject: [PATCH 03/16] Fixed unit test after bug fix.
 
 git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@580 5301114d-f842-0410-bbdd-996ee0417009
 
@@ -137,13 +139,14 @@
  				localSend("250 OK\r\n");
  			}
 -- 
-1.7.4.1
+1.7.5.4
 
 
 From 50743da0712b216533acdc09069f1bfc81f988c6 Mon Sep 17 00:00:00 2001
 From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
 Date: Fri, 10 Dec 2010 16:54:38 +0000
-Subject: [PATCH 4/8] Fixed boundary parsing (thanks to John van der Kamp, Zarafa).
+Subject: [PATCH 04/16] Fixed boundary parsing (thanks to John van der Kamp,
+ Zarafa).
 
 git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@581 5301114d-f842-0410-bbdd-996ee0417009
 
@@ -225,13 +228,14 @@
  
  		vmime::bodyPart p;
 -- 
-1.7.4.1
+1.7.5.4
 
 
 From b6d2b4765c9472ff333cace13c57c6af0e866ee0 Mon Sep 17 00:00:00 2001
 From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
 Date: Fri, 21 Jan 2011 15:28:06 +0000
-Subject: [PATCH 5/8] Fixed possible infinite loop (thanks to John van der Kamp, Zarafa).
+Subject: [PATCH 05/16] Fixed possible infinite loop (thanks to John van der
+ Kamp, Zarafa).
 
 git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@582 5301114d-f842-0410-bbdd-996ee0417009
 
@@ -277,13 +281,14 @@
  VMIME_TEST_SUITE_END
  
 -- 
-1.7.4.1
+1.7.5.4
 
 
 From 022339ab63430d792d0314f51dd7854eabd5736e Mon Sep 17 00:00:00 2001
 From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
 Date: Fri, 28 Jan 2011 12:11:08 +0000
-Subject: [PATCH 6/8] Fixed possible read to invalid memory location (thanks to Alexander Konovalov).
+Subject: [PATCH 06/16] Fixed possible read to invalid memory location (thanks
+ to Alexander Konovalov).
 
 git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@583 5301114d-f842-0410-bbdd-996ee0417009
 
@@ -301,13 +306,15 @@
  					else
  						state->lastCharIsSpace = false;
 -- 
-1.7.4.1
+1.7.5.4
 
 
 From 7f1024917b3df6be013e18a2e0f0f1b13f4d112b Mon Sep 17 00:00:00 2001
 From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
 Date: Wed, 9 Mar 2011 18:03:31 +0000
-Subject: [PATCH 7/8] Fixed bug #3174903. Fixed word parsing when buffer does not end with NL. Fixed 'no encoding' when forced.
+Subject: [PATCH 07/16] Fixed bug #3174903. Fixed word parsing when buffer
+ does not end with NL. Fixed 'no encoding' when
+ forced.
 
 git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@584 5301114d-f842-0410-bbdd-996ee0417009
 (cherry picked from commit 07ebf241115eba44675223e307d212c772e1cc08)
@@ -507,13 +514,14 @@
  VMIME_TEST_SUITE_END
  
 -- 
-1.7.4.1
+1.7.5.4
 
 
 From 1c0648c2a3ee4072869446755c8a7604614752e1 Mon Sep 17 00:00:00 2001
 From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
 Date: Sun, 27 Mar 2011 11:26:55 +0000
-Subject: [PATCH 8/8] Allow static linking in mingw-cross-env. Added 'iconv' and uses 'ws2_32' instead of 'winsock32' (#3213487).
+Subject: [PATCH 08/16] Allow static linking in mingw-cross-env. Added 'iconv'
+ and uses 'ws2_32' instead of 'winsock32' (#3213487).
 
 git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@585 5301114d-f842-0410-bbdd-996ee0417009
 (cherry picked from commit 22ca7dc23b6bbbc8cc6aedd569ec938ecae96e92)
@@ -541,5 +549,470 @@
  
  # -- getaddrinfo (POSIX)
 -- 
-1.7.4.1
+1.7.5.4
+
+
+From c6c596b10702a98b59978c81c01dc7f4f33157c9 Mon Sep 17 00:00:00 2001
+From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
+Date: Thu, 31 Mar 2011 19:13:03 +0000
+Subject: [PATCH 09/16] Flush stateful data from iconv (thanks to John van der
+ Kamp, Zarafa).
+
+git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@586 5301114d-f842-0410-bbdd-996ee0417009
+(cherry picked from commit 9e06cc39d47e2eba8f554b337d472cc995be0d9d)
+
+diff --git a/src/charsetConverter.cpp b/src/charsetConverter.cpp
+index 38b9e5e..2135788 100644
+--- a/src/charsetConverter.cpp
++++ b/src/charsetConverter.cpp
+@@ -119,6 +119,7 @@ void charsetConverter::convert(utility::inputStream& in, utility::outputStream&
+ 	size_t inPos = 0;
+ 
+ 	bool prevIsInvalid = false;
++	bool breakAfterNext = false;
+ 
+ 	while (true)
+ 	{
+@@ -126,11 +127,12 @@ void charsetConverter::convert(utility::inputStream& in, utility::outputStream&
+ 		size_t inLength = static_cast <size_t>(in.read(inBuffer + inPos, sizeof(inBuffer) - inPos) + inPos);
+ 		size_t outLength = sizeof(outBuffer);
+ 
+-		const char* inPtr = inBuffer;
++		const char* inPtr = breakAfterNext ? NULL : inBuffer;
++		size_t *ptrLength = breakAfterNext ? NULL : &inLength;
+ 		char* outPtr = outBuffer;
+ 
+ 		// Convert input bytes
+-		if (iconv(cd, ICONV_HACK(&inPtr), &inLength,
++		if (iconv(cd, ICONV_HACK(&inPtr), ptrLength,
+ 			      &outPtr, &outLength) == static_cast <size_t>(-1))
+ 		{
+ 			// Illegal input sequence or input sequence has no equivalent
+@@ -170,9 +172,12 @@ void charsetConverter::convert(utility::inputStream& in, utility::outputStream&
+ 			prevIsInvalid = false;
+ 		}
+ 
+-		// Check for end of data
+-		if (in.eof() && inPos == 0)
++		if (breakAfterNext)
+ 			break;
++
++		// Check for end of data, loop again to flush stateful data from iconv
++		if (in.eof() && inPos == 0)
++			breakAfterNext = true;
+ 	}
+ }
+ 
+diff --git a/tests/parser/charsetTest.cpp b/tests/parser/charsetTest.cpp
+index 8ad71d7..54a09a7 100644
+--- a/tests/parser/charsetTest.cpp
++++ b/tests/parser/charsetTest.cpp
+@@ -100,6 +100,7 @@ VMIME_TEST_SUITE_BEGIN
+ 		VMIME_TEST(testFilterValid1)
+ 		VMIME_TEST(testFilterValid2)
+ 		VMIME_TEST(testFilterValid3)
++		VMIME_TEST(testEncodingHebrew1255)
+ 
+ 		// Test invalid input
+ 		VMIME_TEST(testFilterInvalid1)
+@@ -227,6 +228,15 @@ VMIME_TEST_SUITE_BEGIN
+ 		VASSERT_EQ("1", toHex(expectedOut), toHex(actualOut));
+ 	}
+ 
++	void testEncodingHebrew1255()
++	{
++		// hewbrew string in windows-1255 charset
++		const char data[] = "\xe9\xf9\xf7\xf8\xe9\xf9\xf8\xf7\xe9\xe9\xf9";
++		vmime::word w = vmime::word(data, "windows-1255");
++		vmime::string encoded = w.generate();
++		// less than 60% ascii, base64 received
++		VASSERT_EQ("1", "=?windows-1255?B?6fn3+On5+Pfp6fk=?=", encoded);
++	}
+ 
+ 	// Conversion to hexadecimal for easier debugging
+ 	static const vmime::string toHex(const vmime::string str)
+-- 
+1.7.5.4
+
+
+From dce9b255556d59773bbbdd9027fd1b1bd5627886 Mon Sep 17 00:00:00 2001
+From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
+Date: Fri, 10 Jun 2011 19:39:09 +0000
+Subject: [PATCH 10/16] Requested email change.
+
+git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@587 5301114d-f842-0410-bbdd-996ee0417009
+(cherry picked from commit 418a39a7d33921672bd1c4beb31c8a31bc87d8dd)
+
+diff --git a/AUTHORS b/AUTHORS
+index 20a0181..bbddb30 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -21,7 +21,7 @@ AUTHORS file.
+  - Rafael Fernandez <prf@adinet.com.uy>
+  - Xin Li <lixin3@staff.sina.com.cn>
+  - Benjamin Biron <benbiron@gmail.com>
+- - Bertrand Benoit <bsquare@bsquare.levillage.org>
++ - Bertrand Benoit <projettwk@users.sourceforge.net>
+  - Tim Teulings <rael@edge.ping.de>
+  - Georg Sauthoff <gsauthof@techfak.uni-bielefeld.de>
+  - Pierre Thierry <nowhere.man@levallois.eu.org> (patches for STL algorithms)
+-- 
+1.7.5.4
+
+
+From 42612622a7c42aac7bef1605d9ba8117aa651789 Mon Sep 17 00:00:00 2001
+From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
+Date: Tue, 14 Jun 2011 18:37:54 +0000
+Subject: [PATCH 11/16] Fixed compilation issue following namespace change.
+
+git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@588 5301114d-f842-0410-bbdd-996ee0417009
+(cherry picked from commit 4008955783ef566b98b16762c7bfa28df26e9198)
+
+diff --git a/examples/example7.cpp b/examples/example7.cpp
+index 1ddb3d0..243b1da 100644
+--- a/examples/example7.cpp
++++ b/examples/example7.cpp
+@@ -43,18 +43,18 @@ int main()
+ 	vmime::platform::setHandler<vmime::platforms::posix::posixHandler>();
+ 
+ 	// Enumerate encoders
+-	vmime::encoderFactory* ef = vmime::encoderFactory::getInstance();
++	vmime::utility::encoder::encoderFactory* ef = vmime::utility::encoder::encoderFactory::getInstance();
+ 
+ 	std::cout << "Available encoders:" << std::endl;
+ 
+ 	for (int i = 0 ; i < ef->getEncoderCount() ; ++i)
+ 	{
+-		vmime::ref <const vmime::encoderFactory::registeredEncoder>
++		vmime::ref <const vmime::utility::encoder::encoderFactory::registeredEncoder>
+ 			enc = ef->getEncoderAt(i);
+ 
+ 		std::cout << "  * " << enc->getName() << std::endl;
+ 
+-		vmime::ref <vmime::encoder> e = enc->create();
++		vmime::ref <vmime::utility::encoder::encoder> e = enc->create();
+ 
+ 		std::vector <vmime::string> props = e->getAvailableProperties();
+ 
+-- 
+1.7.5.4
+
+
+From 43346ae2d6c39af2ed16e64cc6d7f89f427a0fee Mon Sep 17 00:00:00 2001
+From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
+Date: Sun, 19 Jun 2011 17:51:33 +0000
+Subject: [PATCH 12/16] Fixed parsing of an attachment filename that is
+ between 66 and 76 characters long (Zarafa).
+
+git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@589 5301114d-f842-0410-bbdd-996ee0417009
+(cherry picked from commit e80db1ce802a45b71659d16d77ea47368beeabc1)
+
+diff --git a/src/parameter.cpp b/src/parameter.cpp
+index 91a7e5c..f59d5ab 100644
+--- a/src/parameter.cpp
++++ b/src/parameter.cpp
+@@ -281,7 +281,8 @@ void parameter::generate(utility::outputStream& os, const string::size_type maxL
+ 	bool needQuoting = false;
+ 	string::size_type valueLength = 0;
+ 
+-	for (string::size_type i = 0 ; (i < value.length()) && (pos + valueLength < maxLineLength - 4) ; ++i, ++valueLength)
++	// Use worst-case length name.length()+2 for 'name=' part of line
++	for (string::size_type i = 0 ; (i < value.length()) && (pos + name.length() + 2 + valueLength < maxLineLength - 4) ; ++i, ++valueLength)
+ 	{
+ 		switch (value[i])
+ 		{
+-- 
+1.7.5.4
+
+
+From 5ef189953965b639a9038da337e104592417c465 Mon Sep 17 00:00:00 2001
+From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
+Date: Sun, 19 Jun 2011 18:08:12 +0000
+Subject: [PATCH 13/16] Correctly generate attachment names which are long and
+ have high characters for Outlook Express (Zarafa).
+
+git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@590 5301114d-f842-0410-bbdd-996ee0417009
+(cherry picked from commit 58316dddddbfe8a7c582aa52e9abff8ca3a227b6)
 
+diff --git a/src/parameter.cpp b/src/parameter.cpp
+index f59d5ab..d757e1b 100644
+--- a/src/parameter.cpp
++++ b/src/parameter.cpp
+@@ -268,17 +268,19 @@ void parameter::generate(utility::outputStream& os, const string::size_type maxL
+ 	// value is to be generated.
+ 
+ 	// A stream for a temporary storage
+-	std::ostringstream sevenBitBuffer;
++	std::string sevenBitBuffer;
++	utility::outputStreamStringAdapter sevenBitStream(sevenBitBuffer);
+ 
+ 	string::size_type pos = curLinePos;
+ 
+ 	if (pos + name.length() + 10 + value.length() > maxLineLength)
+ 	{
+-		sevenBitBuffer << NEW_LINE_SEQUENCE;
++		sevenBitStream << NEW_LINE_SEQUENCE;
+ 		pos = NEW_LINE_SEQUENCE_LENGTH;
+ 	}
+ 
+ 	bool needQuoting = false;
++	bool needQuotedPrintable = false;
+ 	string::size_type valueLength = 0;
+ 
+ 	// Use worst-case length name.length()+2 for 'name=' part of line
+@@ -308,6 +310,16 @@ void parameter::generate(utility::outputStream& os, const string::size_type maxL
+ 
+ 			needQuoting = true;
+ 			break;
++
++		default:
++
++			if (!parserHelpers::isAscii(value[i]))
++			{
++				needQuotedPrintable = true;
++				needQuoting = true;
++			}
++
++			break;
+ 		}
+ 	}
+ 
+@@ -315,12 +327,12 @@ void parameter::generate(utility::outputStream& os, const string::size_type maxL
+ 
+ 	if (needQuoting)
+ 	{
+-		sevenBitBuffer << name << "=\"";
++		sevenBitStream << name << "=\"";
+ 		pos += name.length() + 2;
+ 	}
+ 	else
+ 	{
+-		sevenBitBuffer << name << "=";
++		sevenBitStream << name << "=";
+ 		pos += name.length() + 1;
+ 	}
+ 
+@@ -332,29 +344,43 @@ void parameter::generate(utility::outputStream& os, const string::size_type maxL
+ 	const bool alwaysEncode = m_value.getCharset().getRecommendedEncoding(recommendedEnc);
+ 	bool extended = alwaysEncode;
+ 
+-	for (string::size_type i = 0 ; (i < value.length()) && (pos < maxLineLength - 4) ; ++i)
++	if (needQuotedPrintable)
+ 	{
+-		const char_t c = value[i];
+-
+-		if (/* needQuoting && */ (c == '"' || c == '\\'))  // 'needQuoting' is implicit
+-		{
+-			sevenBitBuffer << '\\' << value[i];  // escape 'x' with '\x'
+-			pos += 2;
+-		}
+-		else if (parserHelpers::isAscii(c))
+-		{
+-			sevenBitBuffer << value[i];
+-			++pos;
+-		}
+-		else
++		// Send the name in quoted-printable, so outlook express et.al.
++		// will understand the real filename
++		size_t oldLen = sevenBitBuffer.length();
++		m_value.generate(sevenBitStream);
++		pos += sevenBitBuffer.length() - oldLen;
++		extended = true;		// also send with RFC-2231 encoding
++	}
++	else
++	{
++		// Do not chop off this value, but just add the complete name as one header line.
++		for (string::size_type i = 0 ; i < value.length() ; ++i)
+ 		{
+-			extended = true;
++			const char_t c = value[i];
++
++			if (/* needQuoting && */ (c == '"' || c == '\\'))  // 'needQuoting' is implicit
++			{
++				sevenBitStream << '\\' << value[i];  // escape 'x' with '\x'
++				pos += 2;
++			}
++			else if (parserHelpers::isAscii(c))
++			{
++				sevenBitStream << value[i];
++				++pos;
++			}
++			else
++			{
++				extended = true;
++			}
+ 		}
+-	}
++
++	} // !needQuotedPrintable
+ 
+ 	if (needQuoting)
+ 	{
+-		sevenBitBuffer << '"';
++		sevenBitStream << '"';
+ 		++pos;
+ 	}
+ 
+@@ -532,7 +558,7 @@ void parameter::generate(utility::outputStream& os, const string::size_type maxL
+ 		// "7bit/us-ascii" will suffice in this case.
+ 
+ 		// Output what has been stored in temporary buffer so far
+-		os << sevenBitBuffer.str();
++		os << sevenBitBuffer;
+ 	}
+ #endif // !VMIME_ALWAYS_GENERATE_7BIT_PARAMETER
+ 
+-- 
+1.7.5.4
+
+
+From caa3cbc0fe9218d3d494bfed1afed2ee620a2e4e Mon Sep 17 00:00:00 2001
+From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
+Date: Sun, 19 Jun 2011 18:16:49 +0000
+Subject: [PATCH 14/16] Alias for UTF-7 charset.
+
+git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@591 5301114d-f842-0410-bbdd-996ee0417009
+(cherry picked from commit f7ad17cffea462faf8cbe4f785644da0f3ee812a)
+
+diff --git a/src/charset.cpp b/src/charset.cpp
+index e043186..0fda450 100644
+--- a/src/charset.cpp
++++ b/src/charset.cpp
+@@ -45,6 +45,9 @@ charset::charset()
+ charset::charset(const string& name)
+ 	: m_name(name)
+ {
++	// If we receive this rfc-1642 valid MIME charset, convert it to something usefull for iconv
++	if (utility::stringUtils::isStringEqualNoCase(m_name, "unicode-1-1-utf-7"))
++		m_name = "utf-7";
+ }
+ 
+ 
+@@ -60,6 +63,10 @@ void charset::parse(const string& buffer, const string::size_type position,
+ 	m_name = utility::stringUtils::trim
+ 		(string(buffer.begin() + position, buffer.begin() + end));
+ 
++	// If we parsed this rfc-1642 valid MIME charset, convert it to something usefull for iconv
++	if (utility::stringUtils::isStringEqualNoCase(m_name, "unicode-1-1-utf-7"))
++		m_name = "utf-7";
++
+ 	setParsedBounds(position, end);
+ 
+ 	if (newPosition)
+-- 
+1.7.5.4
+
+
+From 97d992cda306d96a8dda948abb9806ee2c2ce587 Mon Sep 17 00:00:00 2001
+From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
+Date: Sun, 19 Jun 2011 18:39:35 +0000
+Subject: [PATCH 15/16] Fixed messageBuilder to accept an empty mailbox group
+ in 'To:' field, to allow for undisclosed-recipients
+ (Zarafa).
+
+git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@592 5301114d-f842-0410-bbdd-996ee0417009
+(cherry picked from commit eac20f47a33a7fdd617f9fd905b8029621259269)
+
+diff --git a/src/messageBuilder.cpp b/src/messageBuilder.cpp
+index 870d59e..3597b3a 100644
+--- a/src/messageBuilder.cpp
++++ b/src/messageBuilder.cpp
+@@ -51,17 +51,15 @@ ref <message> messageBuilder::construct() const
+ 	// Generate the header fields
+ 	msg->getHeader()->Subject()->setValue(m_subject);
+ 
+-	if (m_from.isEmpty())
+-		throw exceptions::no_expeditor();
+-
+-	if ((m_to.isEmpty() || m_to.getAddressAt(0)->isEmpty()) &&
++	if (((m_to.isEmpty()) || (m_to.getAddressAt(0)->isEmpty() && !m_to.getAddressAt(0)->isGroup())) &&
+ 	    (m_cc.isEmpty() || m_cc.getAddressAt(0)->isEmpty()) &&
+ 	    (m_bcc.isEmpty() || m_bcc.getAddressAt(0)->isEmpty()))
+ 	{
+ 		throw exceptions::no_recipient();
+ 	}
+ 
+-	msg->getHeader()->From()->setValue(m_from);
++	if (!m_from.isEmpty())
++		msg->getHeader()->From()->setValue(m_from);
+ 
+ 	if (!m_to.isEmpty())
+ 		msg->getHeader()->To()->setValue(m_to);
+-- 
+1.7.5.4
+
+
+From db98569ef427f9f3fac9a9dcc25ab8b6f2b3bd91 Mon Sep 17 00:00:00 2001
+From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
+Date: Sun, 19 Jun 2011 18:49:55 +0000
+Subject: [PATCH 16/16] Added support for mailboxes that specify an (encoded)
+ full name with an empty email address, set by a <>
+ marker (Zarafa).
+
+git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@593 5301114d-f842-0410-bbdd-996ee0417009
+(cherry picked from commit 1e5dfa80a63b0a7fe90406ce4a3de1593f2e4045)
+
+diff --git a/src/mailbox.cpp b/src/mailbox.cpp
+index 5cb0139..fea7479 100644
+--- a/src/mailbox.cpp
++++ b/src/mailbox.cpp
+@@ -88,6 +88,7 @@ void mailbox::parse(const string& buffer, const string::size_type position,
+ 	// Temporary buffers for extracted name and address
+ 	string name;
+ 	string address;
++	bool hadBrackets = false;
+ 
+ 	while (p < pend)
+ 	{
+@@ -283,6 +284,7 @@ void mailbox::parse(const string& buffer, const string::size_type position,
+ 				}
+ 				else if (*p == '>')
+ 				{
++					hadBrackets = true;
+ 					break;
+ 				}
+ 				else if (!parserHelpers::isSpace(*p))
+@@ -309,7 +311,7 @@ void mailbox::parse(const string& buffer, const string::size_type position,
+ 
+ 	// Swap name and address when no address was found
+ 	// (email address is mandatory, whereas name is optional).
+-	if (address.empty() && !name.empty())
++	if (address.empty() && !name.empty() && !hadBrackets)
+ 	{
+ 		m_email.clear();
+ 		m_email.reserve(name.size());
+diff --git a/tests/parser/mailboxTest.cpp b/tests/parser/mailboxTest.cpp
+index 8411daa..9ebadca 100644
+--- a/tests/parser/mailboxTest.cpp
++++ b/tests/parser/mailboxTest.cpp
+@@ -32,6 +32,7 @@ VMIME_TEST_SUITE_BEGIN
+ 
+ 	VMIME_TEST_LIST_BEGIN
+ 		VMIME_TEST(testParse)
++		VMIME_TEST(testEmptyEmailAddress)
+ 	VMIME_TEST_LIST_END
+ 
+ 
+@@ -113,5 +114,19 @@ VMIME_TEST_SUITE_BEGIN
+ 		}
+ 	}
+ 
++	void testEmptyEmailAddress()
++	{
++		vmime::addressList addrList;
++		addrList.parse("\"Full Name\" <>");
++
++		VASSERT_EQ("count", 1, addrList.getAddressCount());
++		VASSERT_EQ("!group", false, addrList.getAddressAt(0)->isGroup());
++
++		vmime::ref <vmime::mailbox> mbox = addrList.getAddressAt(0).dynamicCast <vmime::mailbox>();
++
++		VASSERT_EQ("name", "Full Name", mbox->getName());
++		VASSERT_EQ("email", "", mbox->getEmail());
++	}
++
+ VMIME_TEST_SUITE_END
+ 
+-- 
+1.7.5.4
+
--- a/src/x264.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/x264.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # x264
 PKG             := x264
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 20110517-2245
-$(PKG)_CHECKSUM := 51aa8e7ac683ef1bfeec638d0e44e2bd94a25a92
+$(PKG)_VERSION  := 20110626-2245
+$(PKG)_CHECKSUM := ce72aa63ad35520901266a7197c9f928369bc308
 $(PKG)_SUBDIR   := $(PKG)-snapshot-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.videolan.org/developers/x264.html
--- a/src/xvidcore.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/xvidcore.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # xvidcore
 PKG             := xvidcore
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.3.1
-$(PKG)_CHECKSUM := 68c73b9a00dfb830083f619335eb876b0f845bec
+$(PKG)_VERSION  := 1.3.2
+$(PKG)_CHECKSUM := 56e065d331545ade04c63c91153b9624b51d6e1b
 $(PKG)_SUBDIR   := xvidcore/build/generic
 $(PKG)_FILE     := xvidcore-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.xvid.org/
--- a/src/xz.mk	Thu Jun 30 01:07:59 2011 +0200
+++ b/src/xz.mk	Thu Jun 30 01:08:50 2011 +0200
@@ -4,8 +4,8 @@
 # XZ
 PKG             := xz
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.0.2
-$(PKG)_CHECKSUM := 2f64e90df16a4cc143bf7ba5788953fac593f4f6
+$(PKG)_VERSION  := 5.0.3
+$(PKG)_CHECKSUM := 50ce842bea6519537457d9ad90d110a127656786
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://tukaani.org/xz/