# HG changeset patch # User Mark Brand # Date 1275766283 -7200 # Node ID 71ad5f519681a16435890a5a239a8c2149ab8206 # Parent 3758c0a4165934a7091ba04b54e4cb19dee976b3 # Parent 6874f44f93ea66654e026ed1e90065c348ccf323 upgrade packages exiv2 gettext glib gst-plugins-good libevent libtool diff --git a/src/exiv2-1-bugfix.patch b/src/exiv2-1-bugfix.patch deleted file mode 100644 --- a/src/exiv2-1-bugfix.patch +++ /dev/null @@ -1,18 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://dev.exiv2.org/issues/show/690 - -diff -ru exiv2-0.19.orig/src/convert.cpp exiv2-0.19/src/convert.cpp -+++ exiv2-0.19.orig/src/convert.cpp 2009-12-28 15:47:58.000000000 +0100 ---- exiv2-0.19/src/convert.cpp 2010-03-25 01:14:57.000000000 +0100 -@@ -406,7 +406,7 @@ - { mdIptc, "Iptc.Application2.SuppCategory", "Xmp.photoshop.SupplementalCategory", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, - { mdIptc, "Iptc.Application2.Keywords", "Xmp.dc.subject", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, - { mdIptc, "Iptc.Application2.SubLocation", "Xmp.iptc.Location", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, -- { mdIptc, "Iptc.Application2.SpecialInstructions","Xmp.photoshop.Instruction", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, -+ { mdIptc, "Iptc.Application2.SpecialInstructions","Xmp.photoshop.Instructions", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, - { mdIptc, "Iptc.Application2.DateCreated", "Xmp.photoshop.DateCreated", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, - { mdIptc, "Iptc.Application2.Byline", "Xmp.dc.creator", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, - { mdIptc, "Iptc.Application2.BylineTitle", "Xmp.photoshop.AuthorsPosition", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, diff --git a/src/exiv2.mk b/src/exiv2.mk --- a/src/exiv2.mk +++ b/src/exiv2.mk @@ -4,8 +4,8 @@ # Exiv2 PKG := exiv2 $(PKG)_IGNORE := -$(PKG)_VERSION := 0.19 -$(PKG)_CHECKSUM := 4ab8d830094f2842bc286d8e7fb03100ca7f07b1 +$(PKG)_VERSION := 0.20 +$(PKG)_CHECKSUM := 3ebab0acd114a463fe11881bd95f1c3e258c7c0c $(PKG)_SUBDIR := exiv2-$($(PKG)_VERSION) $(PKG)_FILE := exiv2-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.exiv2.org/ diff --git a/src/gettext.mk b/src/gettext.mk --- a/src/gettext.mk +++ b/src/gettext.mk @@ -4,8 +4,8 @@ # gettext PKG := gettext $(PKG)_IGNORE := -$(PKG)_VERSION := 0.18 -$(PKG)_CHECKSUM := de396ec6877a451427d8597197d18c2d4b8f1a26 +$(PKG)_VERSION := 0.18.1 +$(PKG)_CHECKSUM := 14f870a5453932880f81ce90aa59b3da9d4daf5c $(PKG)_SUBDIR := gettext-$($(PKG)_VERSION) $(PKG)_FILE := gettext-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.gnu.org/software/gettext/ diff --git a/src/glib-2-optional-gettext.patch b/src/glib-2-optional-gettext.patch deleted file mode 100644 --- a/src/glib-2-optional-gettext.patch +++ /dev/null @@ -1,58 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -https://bugzilla.gnome.org/show_bug.cgi?id=617004#c8 - -diff -r 3241a43cfc79 configure.in ---- a/configure.in Sun May 16 16:38:34 2010 +0200 -+++ b/configure.in Sun May 16 17:02:59 2010 +0200 -@@ -477,8 +477,8 @@ - GLIB_GNU_GETTEXT - - if test "$gt_cv_have_gettext" != "yes" ; then -- AC_MSG_ERROR([ --*** You must have either have gettext support in your C library, or use the -+ AC_MSG_WARN([ -+*** You should either have gettext support in your C library, or use the - *** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html - ]) - fi -diff -r 3241a43cfc79 gio/gsettings.c ---- a/gio/gsettings.c Sun May 16 16:38:34 2010 +0200 -+++ b/gio/gsettings.c Sun May 16 17:02:59 2010 +0200 -@@ -782,16 +782,13 @@ - const gchar *translated; - GError *error = NULL; - const gchar *domain; -- gint lc_category; - - domain = g_settings_schema_get_gettext_domain (settings->priv->schema); - - if (lc_char == 't') -- lc_category = LC_TIME; -+ translated = dcgettext (domain, unparsed, LC_TIME); - else -- lc_category = LC_MESSAGES; -- -- translated = dcgettext (domain, unparsed, lc_category); -+ translated = dgettext (domain, unparsed); - - if (translated != unparsed) - /* it was translated, so we need to re-parse it */ -diff -r 3241a43cfc79 glib/gi18n.h ---- a/glib/gi18n.h Sun May 16 16:38:34 2010 +0200 -+++ b/glib/gi18n.h Sun May 16 17:02:59 2010 +0200 -@@ -22,7 +22,12 @@ - - #include - -+#ifdef ENABLE_NLS - #include -+#else -+#define gettext(String) (String) -+#endif -+ - #include - - #define _(String) gettext (String) diff --git a/src/glib-5-fix-stray-commas.patch b/src/glib-5-fix-stray-commas.patch new file mode 100644 --- /dev/null +++ b/src/glib-5-fix-stray-commas.patch @@ -0,0 +1,73 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from: +Patch sent to gtk-devel-list on 5-Jun-2010. Subject: [patch] stray commas +http://mail.gnome.org/archives/gtk-devel-list/2010-June/date.html + +diff -urN a/gio/gioenums.h b/gio/gioenums.h +--- a/gio/gioenums.h 2010-05-24 18:39:22.000000000 +0200 ++++ b/gio/gioenums.h 2010-06-05 20:37:07.923709408 +0200 +@@ -770,7 +770,7 @@ + { + G_BUS_NAME_OWNER_FLAGS_NONE = 0, /*< nick=none >*/ + G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT = (1<<0), /*< nick=allow-replacement >*/ +- G_BUS_NAME_OWNER_FLAGS_REPLACE = (1<<1), /*< nick=replace >*/ ++ G_BUS_NAME_OWNER_FLAGS_REPLACE = (1<<1) /*< nick=replace >*/ + } GBusNameOwnerFlags; + + /** +@@ -804,7 +804,7 @@ + { + G_DBUS_PROXY_FLAGS_NONE = 0, /*< nick=none >*/ + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES = (1<<0), /*< nick=do-not-load-properties >*/ +- G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS = (1<<1), /*< nick=do-not-connect-signals >*/ ++ G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS = (1<<1) /*< nick=do-not-connect-signals >*/ + } GDBusProxyFlags; + + /** +@@ -949,7 +949,7 @@ + G_DBUS_ERROR_INVALID_FILE_CONTENT, /* org.freedesktop.DBus.Error.InvalidFileContent */ + G_DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN, /* org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown */ + G_DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN, /* org.freedesktop.DBus.Error.AdtAuditDataUnknown */ +- G_DBUS_ERROR_OBJECT_PATH_IN_USE, /* org.freedesktop.DBus.Error.ObjectPathInUse */ ++ G_DBUS_ERROR_OBJECT_PATH_IN_USE /* org.freedesktop.DBus.Error.ObjectPathInUse */ + } GDBusError; + /* Remember to update g_dbus_error_quark() in gdbuserror.c if you extend this enumeration */ + +@@ -988,7 +988,7 @@ + */ + typedef enum { + G_DBUS_CAPABILITY_FLAGS_NONE = 0, +- G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING = (1<<0), ++ G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING = (1<<0) + } GDBusCapabilityFlags; + + /** +@@ -1004,7 +1004,7 @@ + */ + typedef enum { + G_DBUS_CALL_FLAGS_NONE = 0, +- G_DBUS_CALL_FLAGS_NO_AUTO_START = (1<<0), ++ G_DBUS_CALL_FLAGS_NO_AUTO_START = (1<<0) + } GDBusCallFlags; + + /** +@@ -1088,7 +1088,7 @@ + { + G_DBUS_PROPERTY_INFO_FLAGS_NONE = 0, + G_DBUS_PROPERTY_INFO_FLAGS_READABLE = (1<<0), +- G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE = (1<<1), ++ G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE = (1<<1) + } GDBusPropertyInfoFlags; + + /** +@@ -1105,7 +1105,7 @@ + typedef enum + { + G_DBUS_SUBTREE_FLAGS_NONE = 0, +- G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES = (1<<0), ++ G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES = (1<<0) + } GDBusSubtreeFlags; + + /** diff --git a/src/glib.mk b/src/glib.mk --- a/src/glib.mk +++ b/src/glib.mk @@ -4,8 +4,8 @@ # GLib PKG := glib $(PKG)_IGNORE := 2.25.6 -$(PKG)_VERSION := 2.25.3 -$(PKG)_CHECKSUM := 5a8cf17c44decb27de3fbc202be05c89d55f647d +$(PKG)_VERSION := 2.25.7 +$(PKG)_CHECKSUM := 8423e1f5346ecc629e85adfe5498c2545de421ef $(PKG)_SUBDIR := glib-$($(PKG)_VERSION) $(PKG)_FILE := glib-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.gtk.org/ diff --git a/src/gst-plugins-good.mk b/src/gst-plugins-good.mk --- a/src/gst-plugins-good.mk +++ b/src/gst-plugins-good.mk @@ -4,8 +4,8 @@ # gst-plugins-good PKG := gst-plugins-good $(PKG)_IGNORE := 0.10.20 -$(PKG)_VERSION := 0.10.22 -$(PKG)_CHECKSUM := 381f3603a1704aa36297937808220fb8c6c102f4 +$(PKG)_VERSION := 0.10.23 +$(PKG)_CHECKSUM := d819a2690e5bfe83f1277c850b737a13f8f28c12 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://gstreamer.freedesktop.org/ diff --git a/src/libevent.mk b/src/libevent.mk --- a/src/libevent.mk +++ b/src/libevent.mk @@ -4,8 +4,8 @@ # libevent PKG := libevent $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.13 -$(PKG)_CHECKSUM := b0c4e9801b74f8bed1502353674288a5e4f1ca16 +$(PKG)_VERSION := 1.4.14 +$(PKG)_CHECKSUM := 512b02964d0a7581489813939904cb11b9616a8c $(PKG)_SUBDIR := libevent-$($(PKG)_VERSION)-stable $(PKG)_FILE := libevent-$($(PKG)_VERSION)-stable.tar.gz $(PKG)_WEBSITE := http://monkey.org/~provos/libevent/ diff --git a/src/libtool.mk b/src/libtool.mk --- a/src/libtool.mk +++ b/src/libtool.mk @@ -4,8 +4,8 @@ # GNU Libtool PKG := libtool $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.6b -$(PKG)_CHECKSUM := 5afa73c8ef9ebe64bbb438a0f8779c9036e43c55 +$(PKG)_VERSION := 2.2.8 +$(PKG)_CHECKSUM := e0fd6f9d39c81c2da8b548411c74a46c24442abf $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.gnu.org/software/$(PKG)/