diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2011-04-02 09:16:57 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2011-04-02 09:16:57 (GMT) |
| commit | 2b34fc14ddeaf27de82f3fbb42c58ed9edc03a7e (patch) | |
| tree | bf01c816fe91a46a7539a1ec0e12f9f6a746dd7a | |
| parent | a237071dad1db2b7b82f20003dee1ea18c6c7ae3 (diff) | |
| download | mxe-2b34fc14ddeaf27de82f3fbb42c58ed9edc03a7e.zip mxe-2b34fc14ddeaf27de82f3fbb42c58ed9edc03a7e.tar.gz mxe-2b34fc14ddeaf27de82f3fbb42c58ed9edc03a7e.tar.bz2 | |
update packages glib gnutls gtk2 imagemagick xz
| -rw-r--r-- | src/glib.mk | 4 | ||||
| -rw-r--r-- | src/gnutls-1-fixes.patch | 60 | ||||
| -rw-r--r-- | src/gnutls.mk | 4 | ||||
| -rw-r--r-- | src/gtk2.mk | 4 | ||||
| -rw-r--r-- | src/imagemagick.mk | 4 | ||||
| -rw-r--r-- | src/xz.mk | 4 |
6 files changed, 10 insertions, 70 deletions
diff --git a/src/glib.mk b/src/glib.mk index 7bfa0c7..d14c34f 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -4,8 +4,8 @@ # GLib PKG := glib $(PKG)_IGNORE := -$(PKG)_VERSION := 2.28.4 -$(PKG)_CHECKSUM := 46b4e9eca27a936c686c32a768d5e352d1275673 +$(PKG)_VERSION := 2.28.5 +$(PKG)_CHECKSUM := 6cfc1a4e5ed069f0282b90de7635a5704cf7c04c $(PKG)_SUBDIR := glib-$($(PKG)_VERSION) $(PKG)_FILE := glib-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.gtk.org/ diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch deleted file mode 100644 index ab9356e..0000000 --- a/src/gnutls-1-fixes.patch +++ /dev/null @@ -1,60 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -Contains ad hoc patches for cross building. - -From e0633729f352fd3ca1dc31e11db0e03b0ec39132 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Fri, 25 Mar 2011 16:09:35 +0100 -Subject: [PATCH 1/2] C++ compatibility fix - - -diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h -index af02d92..6f200db 100644 ---- a/lib/includes/gnutls/compat.h -+++ b/lib/includes/gnutls/compat.h -@@ -114,6 +114,10 @@ - #define LIBGNUTLS_VERSION_NUMBER GNUTLS_VERSION_NUMBER - #define LIBGNUTLS_EXTRA_VERSION GNUTLS_VERSION - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - /* The gnutls_retr_st was deprecated by gnutls_certificate_retrieve_function() - * and gnutls_retr2_st. - */ -@@ -345,4 +349,7 @@ gnutls_sign_callback_get (gnutls_session_t session, void **userdata) - - void gnutls_transport_set_lowat (gnutls_session_t session, int num) _GNUTLS_GCC_ATTR_DEPRECATED; - -+#ifdef __cplusplus -+} -+#endif - #endif /* _GNUTLS_COMPAT_H */ --- -1.7.4.1 - - -From 4e2d2db1c9ca65ddfd59eefa6802177559676328 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Fri, 25 Mar 2011 16:10:53 +0100 -Subject: [PATCH 2/2] add parameter vaiable to avoid gcc error - - -diff --git a/lib/system.c b/lib/system.c -index f3bed5f..b795fca 100644 ---- a/lib/system.c -+++ b/lib/system.c -@@ -50,7 +50,7 @@ - #ifdef _WIN32 - - int --system_errno (gnutls_transport_ptr) -+system_errno (gnutls_transport_ptr p) - { - int tmperr = WSAGetLastError (); - int ret = 0; --- -1.7.4.1 - diff --git a/src/gnutls.mk b/src/gnutls.mk index afe1737..86cefea 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -4,8 +4,8 @@ # GnuTLS PKG := gnutls $(PKG)_IGNORE := -$(PKG)_VERSION := 2.12.0 -$(PKG)_CHECKSUM := 48f27df66c7a721c5ce2b690ab936a3c9162c40a +$(PKG)_VERSION := 2.12.1 +$(PKG)_CHECKSUM := f3105e39268cb2fbb1d9480ce4bc9b6236ebac26 $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.gnu.org/software/gnutls/ diff --git a/src/gtk2.mk b/src/gtk2.mk index 21ea360..fb36bd6 100644 --- a/src/gtk2.mk +++ b/src/gtk2.mk @@ -4,8 +4,8 @@ # GTK+ PKG := gtk2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.24.3 -$(PKG)_CHECKSUM := a139460a34bfb5a2095645ebc634a5754bdb2920 +$(PKG)_VERSION := 2.24.4 +$(PKG)_CHECKSUM := c15a25ba49eb459b2c4cdc46baedf6cecf08cbcf $(PKG)_SUBDIR := gtk+-$($(PKG)_VERSION) $(PKG)_FILE := gtk+-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.gtk.org/ diff --git a/src/imagemagick.mk b/src/imagemagick.mk index adb2848..5e97c6f 100644 --- a/src/imagemagick.mk +++ b/src/imagemagick.mk @@ -4,8 +4,8 @@ # ImageMagick PKG := imagemagick $(PKG)_IGNORE := -$(PKG)_VERSION := 6.6.8-6 -$(PKG)_CHECKSUM := f0eebc7a89aa1bfd087530e781647b3075faa443 +$(PKG)_VERSION := 6.6.9-3 +$(PKG)_CHECKSUM := 129f47e940a5c2339e6799e604c810dfc0c05dcb $(PKG)_SUBDIR := ImageMagick-$($(PKG)_VERSION) $(PKG)_FILE := ImageMagick-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.imagemagick.org/ @@ -4,8 +4,8 @@ # XZ PKG := xz $(PKG)_IGNORE := -$(PKG)_VERSION := 5.0.1 -$(PKG)_CHECKSUM := a5e7b697d4413f79e36a6c5959ece3db40938c1c +$(PKG)_VERSION := 5.0.2 +$(PKG)_CHECKSUM := 2f64e90df16a4cc143bf7ba5788953fac593f4f6 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://tukaani.org/xz/ |