Mercurial > mxe-octave

annotate src/glib-1-fixes.patch @ 2615:7e5aaa010a02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package glib
author Hans Petter Jansson <hpj@cl.no>
date Mon, 04 Jun 2012 18:02:11 +0200
parents 99516e73b368
children 54ebb3d54d97
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 1887
diff changeset
1 This file is part of MXE.
2353
99516e73b368 Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents: 2333
diff changeset
2 See index.html for further information.
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5
1271
190d15e709cf convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 1219
diff changeset
6 From 46d0d473e6fb32c5204d063cad5f5073d2a139a5 Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 1887
diff changeset
7 From: MXE
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
8 Date: Thu, 23 Sep 2010 21:41:51 +0200
1887
fa6d3ae3cfc1 package glib: Mac OSX workarounds no longer applicable to Xcode 4
Tony Theodore <tonyt@logyst.com>
parents: 1271
diff changeset
9 Subject: [PATCH 2/5] optional gettext
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
10
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 diff --git a/configure.ac b/configure.ac
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 index 2e541d2..18c2dea 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 --- a/configure.ac
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 +++ b/configure.ac
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 @@ -464,8 +464,8 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 GLIB_GNU_GETTEXT
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 if test "$gt_cv_have_gettext" != "yes" ; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 - AC_MSG_ERROR([
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 -*** You must have either have gettext support in your C library, or use the
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 + AC_MSG_WARN([
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 +*** You should have either have gettext support in your C library, or use the
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 *** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 ])
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 diff --git a/glib/gi18n.h b/glib/gi18n.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 index c710046..269bfdf 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 --- a/glib/gi18n.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 +++ b/glib/gi18n.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 @@ -22,7 +22,12 @@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 #include <glib.h>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
34
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35 +#ifdef ENABLE_NLS
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
36 #include <libintl.h>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37 +#else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38 +#define gettext(String) (String)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
39 +#endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
40 +
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41 #include <string.h>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
42
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
43 #define _(String) gettext (String)
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
44 --
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
45 1.7.1
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
46
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
47
1271
190d15e709cf convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 1219
diff changeset
48 From 3473b5183b2e59d247cd1db053efc6c9ecaf2aab Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 1887
diff changeset
49 From: MXE
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
50 Date: Thu, 23 Sep 2010 21:42:46 +0200
1887
fa6d3ae3cfc1 package glib: Mac OSX workarounds no longer applicable to Xcode 4
Tony Theodore <tonyt@logyst.com>
parents: 1271
diff changeset
51 Subject: [PATCH 3/5] fix tool paths
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
52
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
53
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
54 diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
55 index 3d1ac12..58e1ecf 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
56 --- a/glib-2.0.pc.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
57 +++ b/glib-2.0.pc.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
58 @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
59 libdir=@libdir@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
60 includedir=@includedir@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
61
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
62 -glib_genmarshal=glib-genmarshal
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
63 -gobject_query=gobject-query
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
64 -glib_mkenums=glib-mkenums
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
65 +glib_genmarshal=@bindir@/glib-genmarshal
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
66 +gobject_query=@bindir@/gobject-query
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
67 +glib_mkenums=@bindir@/glib-mkenums
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
68
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
69 Name: GLib
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
70 Description: C Utility Library
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
71 --
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
72 1.7.1
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
73
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
74