Mercurial > mxe-octave

comparison 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
comparison
equal deleted inserted replaced
2614:1f6e698fb89e 2615:7e5aaa010a02
1 This file is part of MXE. 1 This file is part of MXE.
2 See index.html for further information. 2 See index.html for further information.
3 3
4 Contains ad hoc patches for cross building. 4 Contains ad hoc patches for cross building.
5
6 From 4693f62d3f01f7b7d26607e6eed843202cbf90f7 Mon Sep 17 00:00:00 2001
7 From: MXE
8 Date: Thu, 23 Sep 2010 21:36:04 +0200
9 Subject: [PATCH 1/5] no gtk doc check
10
11
12 diff --git a/configure.ac b/configure.ac
13 index a821267..2e541d2 100644
14 --- a/configure.ac
15 +++ b/configure.ac
16 @@ -2741,8 +2741,6 @@ dnl **************************
17 dnl *** Checks for gtk-doc ***
18 dnl **************************
19
20 -GTK_DOC_CHECK([1.15])
21 -
22 AC_ARG_ENABLE(man,
23 [AC_HELP_STRING([--enable-man],
24 [regenerate man pages from Docbook [default=no]])],enable_man=yes,
25 --
26 1.7.1
27
28 5
29 From 46d0d473e6fb32c5204d063cad5f5073d2a139a5 Mon Sep 17 00:00:00 2001 6 From 46d0d473e6fb32c5204d063cad5f5073d2a139a5 Mon Sep 17 00:00:00 2001
30 From: MXE 7 From: MXE
31 Date: Thu, 23 Sep 2010 21:41:51 +0200 8 Date: Thu, 23 Sep 2010 21:41:51 +0200
32 Subject: [PATCH 2/5] optional gettext 9 Subject: [PATCH 2/5] optional gettext
93 Description: C Utility Library 70 Description: C Utility Library
94 -- 71 --
95 1.7.1 72 1.7.1
96 73
97 74
98 From 0e57514812500d5d4dee03e1be8059a25876dd99 Mon Sep 17 00:00:00 2001
99 From: MXE
100 Date: Thu, 23 Sep 2010 21:45:50 +0200
101 Subject: [PATCH 4/5] fix dependency libs
102
103
104 diff --git a/configure.ac b/configure.ac
105 index 18c2dea..e472768 100644
106 --- a/configure.ac
107 +++ b/configure.ac
108 @@ -2698,7 +2698,7 @@ case $host in
109 G_LIBS_EXTRA="-luser32 -lkernel32"
110 ;;
111 *-*-mingw*)
112 - G_LIBS_EXTRA="-lws2_32 -lole32"
113 + G_LIBS_EXTRA="-lws2_32 -lole32 -lshlwapi"
114 ;;
115 *)
116 G_LIBS_EXTRA=""
117 diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
118 index 58e1ecf..17b2133 100644
119 --- a/glib-2.0.pc.in
120 +++ b/glib-2.0.pc.in
121 @@ -11,5 +11,5 @@ Name: GLib
122 Description: C Utility Library
123 Version: @VERSION@
124 Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
125 -Libs.private: @ICONV_LIBS@
126 +Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@
127 Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
128 --
129 1.7.1
130
131
132 From 87931c81f6401fb0c25064ec0ba2edca9ec53924 Mon Sep 17 00:00:00 2001
133 From: MXE
134 Date: Sat, 25 Sep 2010 00:07:33 +0200
135 Subject: [PATCH 5/5] add -ldnsapi to gio-2.0.pc
136
137
138 diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
139 index 92cda85..7a4e224 100644
140 --- a/gio-2.0.pc.in
141 +++ b/gio-2.0.pc.in
142 @@ -10,6 +10,6 @@ Name: GIO
143 Description: glib I/O library
144 Version: @VERSION@
145 Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
146 -Libs: -L${libdir} -lgio-2.0
147 +Libs: -L${libdir} -lgio-2.0 -ldnsapi
148 Libs.private: @ZLIB_LIBS@ @LIBASYNCNS_LIBADD@
149 Cflags:
150 --
151 1.7.1