Mercurial > mxe-octave

annotate src/glib-1-fixes.patch @ 2353:99516e73b368

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move doc/index.html -> index.html
author Volker Grabsch <vog@notjusthosting.com>
date Thu, 29 Mar 2012 12:14:15 +0200
parents f653602a0500
children 7e5aaa010a02
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 4693f62d3f01f7b7d26607e6eed843202cbf90f7 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:36:04 +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 1/5] no gtk doc check
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10
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 a821267..2e541d2 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 @@ -2741,8 +2741,6 @@ dnl **************************
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 dnl *** Checks for gtk-doc ***
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 dnl **************************
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 -GTK_DOC_CHECK([1.15])
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 -
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 AC_ARG_ENABLE(man,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 [AC_HELP_STRING([--enable-man],
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 [regenerate man pages from Docbook [default=no]])],enable_man=yes,
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
25 --
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
26 1.7.1
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28
1271
190d15e709cf convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 1219
diff changeset
29 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
30 From: MXE
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
31 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
32 Subject: [PATCH 2/5] optional gettext
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
33
1190
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 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
36 index 2e541d2..18c2dea 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37 --- a/configure.ac
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38 +++ b/configure.ac
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
39 @@ -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
40 GLIB_GNU_GETTEXT
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
42 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
43 - AC_MSG_ERROR([
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
44 -*** 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
45 + AC_MSG_WARN([
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
46 +*** 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
47 *** 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
48 ])
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
49 fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
50 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
51 index c710046..269bfdf 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
52 --- a/glib/gi18n.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
53 +++ b/glib/gi18n.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
54 @@ -22,7 +22,12 @@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
55
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
56 #include <glib.h>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
57
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
58 +#ifdef ENABLE_NLS
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
59 #include <libintl.h>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
60 +#else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
61 +#define gettext(String) (String)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
62 +#endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
63 +
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
64 #include <string.h>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
65
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
66 #define _(String) gettext (String)
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
67 --
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
68 1.7.1
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
69
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
70
1271
190d15e709cf convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 1219
diff changeset
71 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
72 From: MXE
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
73 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
74 Subject: [PATCH 3/5] fix tool paths
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
75
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
76
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
77 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
78 index 3d1ac12..58e1ecf 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
79 --- a/glib-2.0.pc.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
80 +++ b/glib-2.0.pc.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
81 @@ -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
82 libdir=@libdir@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
83 includedir=@includedir@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
84
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
85 -glib_genmarshal=glib-genmarshal
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
86 -gobject_query=gobject-query
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
87 -glib_mkenums=glib-mkenums
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
88 +glib_genmarshal=@bindir@/glib-genmarshal
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
89 +gobject_query=@bindir@/gobject-query
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
90 +glib_mkenums=@bindir@/glib-mkenums
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
91
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
92 Name: GLib
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
93 Description: C Utility Library
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
94 --
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
95 1.7.1
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
96
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
97
1271
190d15e709cf convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 1219
diff changeset
98 From 0e57514812500d5d4dee03e1be8059a25876dd99 Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 1887
diff changeset
99 From: MXE
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
100 Date: Thu, 23 Sep 2010 21:45:50 +0200
1887
fa6d3ae3cfc1 package glib: Mac OSX workarounds no longer applicable to Xcode 4
Tony Theodore <tonyt@logyst.com>
parents: 1271
diff changeset
101 Subject: [PATCH 4/5] fix dependency libs
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
102
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
103
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
104 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
105 index 18c2dea..e472768 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
106 --- a/configure.ac
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
107 +++ b/configure.ac
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
108 @@ -2698,7 +2698,7 @@ case $host in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
109 G_LIBS_EXTRA="-luser32 -lkernel32"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
110 ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
111 *-*-mingw*)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
112 - G_LIBS_EXTRA="-lws2_32 -lole32"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
113 + G_LIBS_EXTRA="-lws2_32 -lole32 -lshlwapi"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
114 ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
115 *)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
116 G_LIBS_EXTRA=""
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
117 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
118 index 58e1ecf..17b2133 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
119 --- a/glib-2.0.pc.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
120 +++ b/glib-2.0.pc.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
121 @@ -11,5 +11,5 @@ Name: GLib
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
122 Description: C Utility Library
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
123 Version: @VERSION@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
124 Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
125 -Libs.private: @ICONV_LIBS@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
126 +Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
127 Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
128 --
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
129 1.7.1
1193
1f5a3eb3bacf package glib: fix dependency on libdnsapi
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
130
1f5a3eb3bacf package glib: fix dependency on libdnsapi
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
131
1271
190d15e709cf convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 1219
diff changeset
132 From 87931c81f6401fb0c25064ec0ba2edca9ec53924 Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 1887
diff changeset
133 From: MXE
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
134 Date: Sat, 25 Sep 2010 00:07:33 +0200
1887
fa6d3ae3cfc1 package glib: Mac OSX workarounds no longer applicable to Xcode 4
Tony Theodore <tonyt@logyst.com>
parents: 1271
diff changeset
135 Subject: [PATCH 5/5] add -ldnsapi to gio-2.0.pc
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
136
1193
1f5a3eb3bacf package glib: fix dependency on libdnsapi
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
137
1f5a3eb3bacf package glib: fix dependency on libdnsapi
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
138 diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
1f5a3eb3bacf package glib: fix dependency on libdnsapi
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
139 index 92cda85..7a4e224 100644
1f5a3eb3bacf package glib: fix dependency on libdnsapi
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
140 --- a/gio-2.0.pc.in
1f5a3eb3bacf package glib: fix dependency on libdnsapi
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
141 +++ b/gio-2.0.pc.in
1f5a3eb3bacf package glib: fix dependency on libdnsapi
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
142 @@ -10,6 +10,6 @@ Name: GIO
1f5a3eb3bacf package glib: fix dependency on libdnsapi
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
143 Description: glib I/O library
1f5a3eb3bacf package glib: fix dependency on libdnsapi
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
144 Version: @VERSION@
1f5a3eb3bacf package glib: fix dependency on libdnsapi
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
145 Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
1f5a3eb3bacf package glib: fix dependency on libdnsapi
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
146 -Libs: -L${libdir} -lgio-2.0
1f5a3eb3bacf package glib: fix dependency on libdnsapi
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
147 +Libs: -L${libdir} -lgio-2.0 -ldnsapi
1f5a3eb3bacf package glib: fix dependency on libdnsapi
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
148 Libs.private: @ZLIB_LIBS@ @LIBASYNCNS_LIBADD@
1f5a3eb3bacf package glib: fix dependency on libdnsapi
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
149 Cflags:
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
150 --
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1193
diff changeset
151 1.7.1