Mercurial > mxe-octave

annotate src/fribidi-1-fixes.patch @ 3710:1220a9158bc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make building 64-bit Windows binaries independent from enabling 64-bit indexing in Octave
author John W. Eaton <jwe@octave.org>
date Sun, 07 Sep 2014 06:42:40 -0400
parents 39355c49f6bc
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2663
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
1 This file is part of MXE.
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
2 See index.html for further information.
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
2709
39355c49f6bc update package fribidi
Mark Brand <mabrand@mabrand.nl>
parents: 2663
diff changeset
4 From c4dc7b368af33821eca1be8a4ec88929b44f3d06 Mon Sep 17 00:00:00 2001
2663
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5 From: Mark Brand <mabrand@mabrand.nl>
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
6 Date: Tue, 17 Jul 2012 10:07:07 +0200
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
7 Subject: [PATCH] only include glib.h
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
9
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10 diff --git a/charset/fribidi-char-sets.c b/charset/fribidi-char-sets.c
2709
39355c49f6bc update package fribidi
Mark Brand <mabrand@mabrand.nl>
parents: 2663
diff changeset
11 index 5d45e74..e596dee 100644
2663
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 --- a/charset/fribidi-char-sets.c
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 +++ b/charset/fribidi-char-sets.c
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 @@ -114,7 +114,7 @@ static FriBidiCharSetHandler char_sets[FRIBIDI_CHAR_SETS_NUM + 1] = {
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 };
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 #if FRIBIDI_USE_GLIB+0
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 -# include <glib/gstrfuncs.h>
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 +# include <glib.h>
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 # define fribidi_strcasecmp g_ascii_strcasecmp
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 #else /* !FRIBIDI_USE_GLIB */
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 static char
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 diff --git a/lib/mem.h b/lib/mem.h
2709
39355c49f6bc update package fribidi
Mark Brand <mabrand@mabrand.nl>
parents: 2663
diff changeset
24 index c875e0b..031fcc3 100644
2663
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 --- a/lib/mem.h
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 +++ b/lib/mem.h
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 @@ -42,7 +42,7 @@
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 #if FRIBIDI_USE_GLIB+0
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 #ifndef __FRIBIDI_DOC
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 -# include <glib/gmem.h>
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32 +# include <glib.h>
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 #endif /* !__FRIBIDI_DOC */
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
34
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35 #define FriBidiMemChunk GMemChunk
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
36 --
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37 1.7.10.4
848bc901b232 package fribidi: compatibility with new glib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38