# HG changeset patch # User Mark Brand
# Date 1275763881 -7200 # Node ID 529527556f60d7d875471dde506e24c78bc0981d # Parent 3758c0a4165934a7091ba04b54e4cb19dee976b3 # Parent 6874f44f93ea66654e026ed1e90065c348ccf323 upgrade packages exiv2 gettext glib gst-plugins-good libevent libtool diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ JOBS := 1 TARGET := i686-pc-mingw32 -SOURCEFORGE_MIRROR := kent.dl.sourceforge.net +SOURCEFORGE_MIRROR := surfnet.dl.sourceforge.net PREFIX := $(PWD)/usr LOG_DIR := $(PWD)/log 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