diff options
author | Mark Brand <mabrand@mabrand.nl> | 2012-07-17 08:23:12 (GMT) |
---|---|---|
committer | Mark Brand <mabrand@mabrand.nl> | 2012-07-17 08:23:12 (GMT) |
commit | 89c57c0b91dde47a71029c435c8834392cdba68d (patch) | |
tree | a3031776aa5896b26a06b89a2d53387c3dd45b8b | |
parent | c7f63d40df884a9c1714e964fcf10313e6b02187 (diff) | |
download | mxe-89c57c0b91dde47a71029c435c8834392cdba68d.zip mxe-89c57c0b91dde47a71029c435c8834392cdba68d.tar.gz mxe-89c57c0b91dde47a71029c435c8834392cdba68d.tar.bz2 |
package fribidi: compatibility with new glib
-rw-r--r-- | src/fribidi-1-fix-gassert.patch | 14 | ||||
-rw-r--r-- | src/fribidi-1-fixes.patch | 93 | ||||
-rw-r--r-- | src/fribidi.mk | 1 |
3 files changed, 94 insertions, 14 deletions
diff --git a/src/fribidi-1-fix-gassert.patch b/src/fribidi-1-fix-gassert.patch deleted file mode 100644 index 5a9f816..0000000 --- a/src/fribidi-1-fix-gassert.patch +++ /dev/null @@ -1,14 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -diff -ru fribidi-0.19.2.orig/lib/fribidi-common.h fribidi-0.19.2/lib/fribidi-common.h ---- fribidi-0.19.2.orig/lib/fribidi-common.h 2007-04-05 18:13:24.000000000 +0200 -+++ fribidi-0.19.2/lib/fribidi-common.h 2010-02-24 17:20:47.000000000 +0100 -@@ -63,6 +63,7 @@ - #if FRIBIDI_USE_GLIB+0 - # ifndef __FRIBIDI_DOC - # include <glib/gmacros.h> -+# include <glib/gtestutils.h> - # endif /* !__FRIBIDI_DOC */ - # define FRIBIDI_BEGIN_DECLS G_BEGIN_DECLS - # define FRIBIDI_END_DECLS G_END_DECLS diff --git a/src/fribidi-1-fixes.patch b/src/fribidi-1-fixes.patch new file mode 100644 index 0000000..d473094 --- /dev/null +++ b/src/fribidi-1-fixes.patch @@ -0,0 +1,93 @@ +This file is part of MXE. +See index.html for further information. + +From 76bd700b45f139679f16e649354eb23a99317b44 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Tue, 17 Jul 2012 10:07:07 +0200 +Subject: [PATCH] only include glib.h + + +diff --git a/charset/fribidi-char-sets.c b/charset/fribidi-char-sets.c +index 9de05f8..8e8df8b 100644 +--- a/charset/fribidi-char-sets.c ++++ b/charset/fribidi-char-sets.c +@@ -114,7 +114,7 @@ static FriBidiCharSetHandler char_sets[FRIBIDI_CHAR_SETS_NUM + 1] = { + }; + + #if FRIBIDI_USE_GLIB+0 +-# include <glib/gstrfuncs.h> ++# include <glib.h> + # define fribidi_strcasecmp g_ascii_strcasecmp + #else /* !FRIBIDI_USE_GLIB */ + static char +diff --git a/lib/common.h b/lib/common.h +index 7615ccc..f4bf357 100644 +--- a/lib/common.h ++++ b/lib/common.h +@@ -57,7 +57,7 @@ + # define SIZEOF_VOID_P GLIB_SIZEOF_VOID_P + # endif /* !SIZEOF_VOID_P */ + # ifndef __FRIBIDI_DOC +-# include <glib/gmem.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # ifndef fribidi_malloc + # define fribidi_malloc g_try_malloc +@@ -65,12 +65,12 @@ + # endif /* !fribidi_malloc */ + # ifndef fribidi_assert + # ifndef __FRIBIDI_DOC +-# include <glib/gmessages.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # define fribidi_assert g_assert + # endif /* !fribidi_assert */ + # ifndef __FRIBIDI_DOC +-# include <glib/gmacros.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # ifndef FRIBIDI_BEGIN_STMT + # define FRIBIDI_BEGIN_STMT G_STMT_START { +diff --git a/lib/fribidi-common.h b/lib/fribidi-common.h +index 4724913..6010b84 100644 +--- a/lib/fribidi-common.h ++++ b/lib/fribidi-common.h +@@ -62,7 +62,7 @@ + + #if FRIBIDI_USE_GLIB+0 + # ifndef __FRIBIDI_DOC +-# include <glib/gmacros.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # define FRIBIDI_BEGIN_DECLS G_BEGIN_DECLS + # define FRIBIDI_END_DECLS G_END_DECLS +diff --git a/lib/fribidi-types.h b/lib/fribidi-types.h +index 6a72a53..27c9c3d 100644 +--- a/lib/fribidi-types.h ++++ b/lib/fribidi-types.h +@@ -40,8 +40,7 @@ + + #if FRIBIDI_USE_GLIB+0 + # ifndef __FRIBIDI_DOC +-# include <glib/gtypes.h> +-# include <glib/gunicode.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # define FRIBIDI_INT8_LOCAL gint8 + # define FRIBIDI_INT16_LOCAL gint16 +diff --git a/lib/mem.h b/lib/mem.h +index b1208da..60f0a4e 100644 +--- a/lib/mem.h ++++ b/lib/mem.h +@@ -42,7 +42,7 @@ + #if FRIBIDI_USE_GLIB+0 + + #ifndef __FRIBIDI_DOC +-# include <glib/gmem.h> ++# include <glib.h> + #endif /* !__FRIBIDI_DOC */ + + #define FriBidiMemChunk GMemChunk +-- +1.7.10.4 + diff --git a/src/fribidi.mk b/src/fribidi.mk index 1eb6eef..47617f3 100644 --- a/src/fribidi.mk +++ b/src/fribidi.mk @@ -19,6 +19,7 @@ define $(PKG)_BUILD $(SED) -i 's,__declspec(dllimport),,' '$(1)/lib/fribidi-common.h' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-debug \ |