Mercurial > mxe-octave

comparison src/pango-1-fixes.patch @ 2623:7e078ab846b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package pango
author Mark Brand <mabrand@mabrand.nl>
date Fri, 15 Jun 2012 16:01:45 +0200
parents 8ffc6695280d
children 059460e131a5
comparison
equal deleted inserted replaced
2622:946d2c2f08b5 2623:7e078ab846b8
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 5
6 From 987d02305fd8187bd10bfd292db38f7da705a7f3 Mon Sep 17 00:00:00 2001 6 From 2227d3bd55d64510cdb9761a55dfcfa86c594ae4 Mon Sep 17 00:00:00 2001
7 From: MXE 7 From: Mark Brand <mabrand@mabrand.nl>
8 Date: Wed, 29 Sep 2010 00:52:59 +0200 8 Date: Wed, 29 Sep 2010 00:52:59 +0200
9 Subject: [PATCH 1/4] s,DllMain,static _disabled_DllMain, 9 Subject: [PATCH 1/3] s,DllMain,static _disabled_DllMain,
10 10
11 ---
12 pango/pango-utils.c | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
11 14
12 diff --git a/pango/pango-utils.c b/pango/pango-utils.c 15 diff --git a/pango/pango-utils.c b/pango/pango-utils.c
13 index 44ec353..72e13f1 100644 16 index c68e2d4..e55b71d 100644
14 --- a/pango/pango-utils.c 17 --- a/pango/pango-utils.c
15 +++ b/pango/pango-utils.c 18 +++ b/pango/pango-utils.c
16 @@ -658,12 +658,12 @@ pango_config_key_get (const char *key) 19 @@ -692,12 +692,12 @@ pango_config_key_get (const char *key)
17 20
18 #ifdef G_OS_WIN32 21 #ifdef G_OS_WIN32
19 22
20 -/* DllMain function needed to tuck away the DLL handle */ 23 -/* DllMain function needed to tuck away the DLL handle */
21 +/* static _disabled_DllMain function needed to tuck away the DLL handle */ 24 +/* static _disabled_DllMain function needed to tuck away the DLL handle */
22 25
23 static HMODULE pango_dll; 26 static HMODULE pango_dll;
24 27
25 BOOL WINAPI 28 BOOL WINAPI
26 -DllMain (HINSTANCE hinstDLL, 29 -DllMain (HINSTANCE hinstDLL,
27 +pango_DllMain (HINSTANCE hinstDLL, 30 +static _disabled_DllMain (HINSTANCE hinstDLL,
28 DWORD fdwReason, 31 DWORD fdwReason,
29 LPVOID lpvReserved) 32 LPVOID lpvReserved)
30 { 33 {
31 -- 34 --
32 1.7.7.3 35 1.7.10.4
33 36
34 37
35 From f0c5d358e54fd9d69133eeff972fdb05592789f3 Mon Sep 17 00:00:00 2001 38 From f168a8e1bf39a2605850ba2619992b6de99c58ba Mon Sep 17 00:00:00 2001
36 From: MXE 39 From: Mark Brand <mabrand@mabrand.nl>
37 Date: Wed, 29 Sep 2010 00:55:07 +0200 40 Date: Wed, 29 Sep 2010 00:50:08 +0200
38 Subject: [PATCH 2/4] static, not shared 41 Subject: [PATCH 2/3] add missing lib to pango.pc for static linking
39 42
40 43 ---
41 diff --git a/configure b/configure 44 pango.pc.in | 2 +-
42 index fb173ce..beb3290 100755 45 1 file changed, 1 insertion(+), 1 deletion(-)
43 --- a/configure
44 +++ b/configure
45 @@ -5832,9 +5832,9 @@ if test "${enable_static+set}" = set; then :
46 enableval=$enable_static; p=${PACKAGE-default}
47 case $enableval in
48 yes) enable_static=yes ;;
49 - no) enable_static=no ;;
50 + no) enable_static=yes ;;
51 *)
52 - enable_static=no
53 + enable_static=yes
54 # Look at the argument we got. We use all the common list separators.
55 lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
56 for pkg in $enableval; do
57 @@ -5847,7 +5847,7 @@ if test "${enable_static+set}" = set; then :
58 ;;
59 esac
60 else
61 - enable_static=no
62 + enable_static=yes
63 fi
64
65
66 @@ -5861,15 +5861,15 @@ fi
67
68 if test "$pango_os_win32" = "yes"; then
69 if test x$enable_static = xyes -o x$enable_static = x; then
70 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling static library build, must build as DLL on Windows." >&5
71 -$as_echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;}
72 - enable_static=no
73 + { $as_echo "(disabled warning)" >&5
74 +$as_echo "(disabled warning)" >&2;}
75 + enable_static=yes
76 fi
77 if test x$enable_shared = xno; then
78 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling shared library build, must build as DLL on Windows." >&5
79 -$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;}
80 + { $as_echo "(disabled warning)" >&5
81 +$as_echo "(disabled warning)" >&2;}
82 fi
83 - enable_shared=yes
84 + enable_shared=no
85 fi
86
87 case `pwd` in
88 @@ -8968,7 +8968,7 @@ func_stripname_cnf ()
89 if test "${enable_shared+set}" = set; then :
90 enableval=$enable_shared; p=${PACKAGE-default}
91 case $enableval in
92 - yes) enable_shared=yes ;;
93 + yes) enable_shared=no ;;
94 no) enable_shared=no ;;
95 *)
96 enable_shared=no
97 @@ -8977,14 +8977,14 @@ if test "${enable_shared+set}" = set; then :
98 for pkg in $enableval; do
99 IFS="$lt_save_ifs"
100 if test "X$pkg" = "X$p"; then
101 - enable_shared=yes
102 + enable_shared=no
103 fi
104 done
105 IFS="$lt_save_ifs"
106 ;;
107 esac
108 else
109 - enable_shared=yes
110 + enable_shared=no
111 fi
112
113
114 @@ -12848,7 +12848,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
115 # are all built from PIC.
116 case $host_os in
117 aix3*)
118 - test "$enable_shared" = yes && enable_static=no
119 + test "$enable_shared" = yes && enable_static=yes
120 if test -n "$RANLIB"; then
121 archive_cmds="$archive_cmds~\$RANLIB \$lib"
122 postinstall_cmds='$RANLIB $lib'
123 @@ -12857,7 +12857,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
124
125 aix[4-9]*)
126 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
127 - test "$enable_shared" = yes && enable_static=no
128 + test "$enable_shared" = yes && enable_static=yes
129 fi
130 ;;
131 esac
132 --
133 1.7.7.3
134
135
136 From 08292532296e3a0f135f6bcd683851d2f41836c6 Mon Sep 17 00:00:00 2001
137 From: MXE
138 Date: Wed, 29 Sep 2010 00:57:12 +0200
139 Subject: [PATCH 3/4] no pango-querymodules
140
141
142 diff --git a/modules/Makefile.in b/modules/Makefile.in
143 index 49813f7..afc29c5 100644
144 --- a/modules/Makefile.in
145 +++ b/modules/Makefile.in
146 @@ -647,7 +647,7 @@ uninstall-am: uninstall-local
147
148 @CROSS_COMPILING_FALSE@all-local: pango.modules
149
150 -install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
151 +install-data-local:
152 @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \
153 echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \
154 $(top_builddir)/pango/pango-querymodules$(EXEEXT) \
155 --
156 1.7.7.3
157
158
159 From c646ee7869c20a1e093f63ec8de8e83e7ca88b27 Mon Sep 17 00:00:00 2001
160 From: MXE
161 Date: Wed, 29 Sep 2010 00:50:08 +0200
162 Subject: [PATCH 4/4] add missing lib to pango.pc for static linking
163
164 46
165 diff --git a/pango.pc.in b/pango.pc.in 47 diff --git a/pango.pc.in b/pango.pc.in
166 index 5cc3ef8..745b8f0 100644 48 index 17a8b7a..16c5981 100644
167 --- a/pango.pc.in 49 --- a/pango.pc.in
168 +++ b/pango.pc.in 50 +++ b/pango.pc.in
169 @@ -9,5 +9,5 @@ Name: Pango 51 @@ -10,5 +10,5 @@ Description: Internationalized text handling
170 Description: Internationalized text handling
171 Version: @VERSION@ 52 Version: @VERSION@
172 Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0 53 Requires: glib-2.0 gobject-2.0
54 Requires.private: gmodule-no-export-2.0
173 -Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ 55 -Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@
174 +Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ -lusp10 56 +Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ -lusp10
175 Cflags: -I${includedir}/pango-1.0 57 Cflags: -I${includedir}/pango-1.0
176 -- 58 --
177 1.7.7.3 59 1.7.10.4
178 60
61
62 From 6a9d9d2b6151f93a6a0a1a1e3cf8381d47da59a1 Mon Sep 17 00:00:00 2001
63 From: Mark Brand <mabrand@mabrand.nl>
64 Date: Fri, 15 Jun 2012 16:21:40 +0200
65 Subject: [PATCH 3/3] do not force shared for win32
66
67 ---
68 configure.in | 14 --------------
69 modules/Makefile.am | 17 +----------------
70 2 files changed, 1 insertion(+), 30 deletions(-)
71
72 diff --git a/configure.in b/configure.in
73 index 8362280..6a000cc 100644
74 --- a/configure.in
75 +++ b/configure.in
76 @@ -147,20 +147,6 @@ CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
77 # Win32 stuff
78 #
79
80 -AC_LIBTOOL_WIN32_DLL
81 -AM_DISABLE_STATIC
82 -
83 -if test "$pango_os_win32" = "yes"; then
84 - if test x$enable_static = xyes -o x$enable_static = x; then
85 - AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
86 - enable_static=no
87 - fi
88 - if test x$enable_shared = xno; then
89 - AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
90 - fi
91 - enable_shared=yes
92 -fi
93 -
94 AM_PROG_LIBTOOL
95 dnl when using libtool 2.x create libtool early, because it's used in configure
96 m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
97 diff --git a/modules/Makefile.am b/modules/Makefile.am
98 index dc8a2c8..dc22e59 100644
99 --- a/modules/Makefile.am
100 +++ b/modules/Makefile.am
101 @@ -26,22 +26,7 @@ RUN_QUERY_MODULES_TEST=true
102 all-local: pango.modules
103 endif
104
105 -install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
106 - @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \
107 - echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \
108 - $(top_builddir)/pango/pango-querymodules$(EXEEXT) \
109 - \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
110 - $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
111 - $(top_builddir)/pango/pango-querymodules$(EXEEXT) \
112 - > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
113 - else \
114 - echo "***" ; \
115 - echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \
116 - echo "*** not created" ; \
117 - echo "*** Generate this file on the target system" ; \
118 - echo "*** using pango-querymodules" ; \
119 - echo "***" ; \
120 - fi
121 +install-data-local:
122
123 uninstall-local:
124 $(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules
125 --
126 1.7.10.4
127