d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade packages: exiv2 gettext glib gst-plugins-good libevent libtool

This commit is contained in:
Mark Brand 2010-06-05 21:31:23 +02:00
parent af2aee636b
commit f94a2193f3
9 changed files with 84 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/exiv2-1-bugfix.patch
View File

@ -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 },

4
src/exiv2.mk
View File

@ -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/

4
src/gettext.mk
View File

@ -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/

58
src/glib-2-optional-gettext.patch
View File

@ -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 <glib.h>
+#ifdef ENABLE_NLS
#include <libintl.h>
+#else
+#define gettext(String) (String)
+#endif
+
#include <string.h>
#define _(String) gettext (String)

72
src/glib-5-fix-stray-commas.patch Normal file
View File

@ -0,0 +1,72 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
This patch has been taken from:
http://mail.gnome.org/archives/gtk-devel-list/2010-June/msg00027.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;
/**

4
src/glib.mk
View File

@ -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/

4
src/gst-plugins-good.mk
View File

@ -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/

4
src/libevent.mk
View File

@ -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/

4
src/libtool.mk
View File

@ -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)/