Mercurial > mxe-octave
annotate src/pango-1-fixes.patch @ 2639:6e851800cb27
package pango: split DllMain patch and make it callable
This allows users of this library to explicitly call the DllMain
to run the necessary initialization.
| author | Matthias Gehre <M.Gehre@gmx.de> |
|---|---|
| date | Tue, 19 Jun 2012 12:06:07 +0200 |
| parents | 059460e131a5 |
| children | c9c16664efca |
| rev | line source |
|---|---|
|
2639
6e851800cb27
package pango: split DllMain patch and make it callable
Matthias Gehre <M.Gehre@gmx.de>
parents:
2636
diff
changeset
|
1 From 971738e2fc2bc3faae52952dd08ee08b34ff4b86 Mon Sep 17 00:00:00 2001 |
|
6e851800cb27
package pango: split DllMain patch and make it callable
Matthias Gehre <M.Gehre@gmx.de>
parents:
2636
diff
changeset
|
2 From: Matthias Gehre <M.Gehre@gmx.de> |
|
6e851800cb27
package pango: split DllMain patch and make it callable
Matthias Gehre <M.Gehre@gmx.de>
parents:
2636
diff
changeset
|
3 Date: Mon, 9 Jul 2012 13:13:49 +0200 |
|
6e851800cb27
package pango: split DllMain patch and make it callable
Matthias Gehre <M.Gehre@gmx.de>
parents:
2636
diff
changeset
|
4 Subject: [PATCH 1/4] Rename DllMain to pango_DllMain |
| 1213 | 5 |
| 2623 | 6 --- |
| 7 pango/pango-utils.c | 4 ++-- | |
| 8 1 file changed, 2 insertions(+), 2 deletions(-) | |
| 1213 | 9 |
| 10 diff --git a/pango/pango-utils.c b/pango/pango-utils.c | |
|
2639
6e851800cb27
package pango: split DllMain patch and make it callable
Matthias Gehre <M.Gehre@gmx.de>
parents:
2636
diff
changeset
|
11 index c68e2d4..47ca433 100644 |
| 1213 | 12 --- a/pango/pango-utils.c |
| 13 +++ b/pango/pango-utils.c | |
| 2623 | 14 @@ -692,12 +692,12 @@ pango_config_key_get (const char *key) |
| 1213 | 15 |
| 16 #ifdef G_OS_WIN32 | |
| 17 | |
| 18 -/* DllMain function needed to tuck away the DLL handle */ | |
|
2639
6e851800cb27
package pango: split DllMain patch and make it callable
Matthias Gehre <M.Gehre@gmx.de>
parents:
2636
diff
changeset
|
19 +/* pango_DllMain function needed to tuck away the DLL handle */ |
| 1213 | 20 |
| 21 static HMODULE pango_dll; | |
| 22 | |
| 23 BOOL WINAPI | |
| 24 -DllMain (HINSTANCE hinstDLL, | |
|
2639
6e851800cb27
package pango: split DllMain patch and make it callable
Matthias Gehre <M.Gehre@gmx.de>
parents:
2636
diff
changeset
|
25 +pango_DllMain (HINSTANCE hinstDLL, |
| 1213 | 26 DWORD fdwReason, |
| 27 LPVOID lpvReserved) | |
| 28 { | |
| 1219 | 29 -- |
|
2639
6e851800cb27
package pango: split DllMain patch and make it callable
Matthias Gehre <M.Gehre@gmx.de>
parents:
2636
diff
changeset
|
30 1.7.9.5 |
| 1219 | 31 |
| 1213 | 32 |
|
2639
6e851800cb27
package pango: split DllMain patch and make it callable
Matthias Gehre <M.Gehre@gmx.de>
parents:
2636
diff
changeset
|
33 From 779c533bf4354cbc747d82532f4798e6ef006d1b Mon Sep 17 00:00:00 2001 |
| 2623 | 34 From: Mark Brand <mabrand@mabrand.nl> |
| 35 Date: Wed, 29 Sep 2010 00:50:08 +0200 | |
|
2636
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
36 Subject: [PATCH 2/4] add missing lib to pango.pc for static linking |
| 1213 | 37 |
| 2623 | 38 --- |
| 39 pango.pc.in | 2 +- | |
| 40 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 1213 | 41 |
| 42 diff --git a/pango.pc.in b/pango.pc.in | |
| 2623 | 43 index 17a8b7a..16c5981 100644 |
| 1213 | 44 --- a/pango.pc.in |
| 45 +++ b/pango.pc.in | |
| 2623 | 46 @@ -10,5 +10,5 @@ Description: Internationalized text handling |
| 1213 | 47 Version: @VERSION@ |
| 2623 | 48 Requires: glib-2.0 gobject-2.0 |
| 49 Requires.private: gmodule-no-export-2.0 | |
| 1213 | 50 -Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ |
| 51 +Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ -lusp10 | |
| 52 Cflags: -I${includedir}/pango-1.0 | |
| 1219 | 53 -- |
|
2639
6e851800cb27
package pango: split DllMain patch and make it callable
Matthias Gehre <M.Gehre@gmx.de>
parents:
2636
diff
changeset
|
54 1.7.9.5 |
| 2623 | 55 |
| 56 | |
|
2639
6e851800cb27
package pango: split DllMain patch and make it callable
Matthias Gehre <M.Gehre@gmx.de>
parents:
2636
diff
changeset
|
57 From 4340125c6b7f26106f7f021ec4c9612f7384e6c1 Mon Sep 17 00:00:00 2001 |
| 2623 | 58 From: Mark Brand <mabrand@mabrand.nl> |
| 59 Date: Fri, 15 Jun 2012 16:21:40 +0200 | |
|
2636
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
60 Subject: [PATCH 3/4] do not force shared for win32 |
| 2623 | 61 |
| 62 --- | |
| 63 configure.in | 14 -------------- | |
| 64 modules/Makefile.am | 17 +---------------- | |
| 65 2 files changed, 1 insertion(+), 30 deletions(-) | |
| 1219 | 66 |
| 2623 | 67 diff --git a/configure.in b/configure.in |
| 68 index 8362280..6a000cc 100644 | |
| 69 --- a/configure.in | |
| 70 +++ b/configure.in | |
| 71 @@ -147,20 +147,6 @@ CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" | |
| 72 # Win32 stuff | |
| 73 # | |
| 74 | |
| 75 -AC_LIBTOOL_WIN32_DLL | |
| 76 -AM_DISABLE_STATIC | |
| 77 - | |
| 78 -if test "$pango_os_win32" = "yes"; then | |
| 79 - if test x$enable_static = xyes -o x$enable_static = x; then | |
| 80 - AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) | |
| 81 - enable_static=no | |
| 82 - fi | |
| 83 - if test x$enable_shared = xno; then | |
| 84 - AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) | |
| 85 - fi | |
| 86 - enable_shared=yes | |
| 87 -fi | |
| 88 - | |
| 89 AM_PROG_LIBTOOL | |
| 90 dnl when using libtool 2.x create libtool early, because it's used in configure | |
| 91 m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) | |
| 92 diff --git a/modules/Makefile.am b/modules/Makefile.am | |
| 93 index dc8a2c8..dc22e59 100644 | |
| 94 --- a/modules/Makefile.am | |
| 95 +++ b/modules/Makefile.am | |
| 96 @@ -26,22 +26,7 @@ RUN_QUERY_MODULES_TEST=true | |
| 97 all-local: pango.modules | |
| 98 endif | |
| 99 | |
| 100 -install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT) | |
| 101 - @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \ | |
| 102 - echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \ | |
| 103 - $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ | |
| 104 - \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ | |
| 105 - $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \ | |
| 106 - $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ | |
| 107 - > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ | |
| 108 - else \ | |
| 109 - echo "***" ; \ | |
| 110 - echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \ | |
| 111 - echo "*** not created" ; \ | |
| 112 - echo "*** Generate this file on the target system" ; \ | |
| 113 - echo "*** using pango-querymodules" ; \ | |
| 114 - echo "***" ; \ | |
| 115 - fi | |
| 116 +install-data-local: | |
| 117 | |
| 118 uninstall-local: | |
| 119 $(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules | |
| 120 -- | |
|
2639
6e851800cb27
package pango: split DllMain patch and make it callable
Matthias Gehre <M.Gehre@gmx.de>
parents:
2636
diff
changeset
|
121 1.7.9.5 |
| 2623 | 122 |
|
2636
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
123 |
|
2639
6e851800cb27
package pango: split DllMain patch and make it callable
Matthias Gehre <M.Gehre@gmx.de>
parents:
2636
diff
changeset
|
124 From ff735b2f71b07e7216856a473ed283eb24dd012a Mon Sep 17 00:00:00 2001 |
|
2636
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
125 From: Mark Brand <mabrand@mabrand.nl> |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
126 Date: Mon, 18 Jun 2012 21:36:53 +0200 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
127 Subject: [PATCH 4/4] kill gtk-doc (MXE specific) |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
128 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
129 --- |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
130 Makefile.am | 2 +- |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
131 autogen.sh | 8 -------- |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
132 configure.in | 9 +-------- |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
133 3 files changed, 2 insertions(+), 17 deletions(-) |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
134 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
135 diff --git a/Makefile.am b/Makefile.am |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
136 index b0b56ec..663503c 100644 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
137 --- a/Makefile.am |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
138 +++ b/Makefile.am |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
139 @@ -1,6 +1,6 @@ |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
140 ## Process this file with automake to create Makefile.in. |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
141 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
142 -SUBDIRS= pango modules pango-view examples docs tools tests build |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
143 +SUBDIRS= pango modules pango-view examples tools tests build |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
144 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
145 EXTRA_DIST = \ |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
146 autogen.sh \ |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
147 diff --git a/autogen.sh b/autogen.sh |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
148 index bc7c59c..4e1918c 100755 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
149 --- a/autogen.sh |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
150 +++ b/autogen.sh |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
151 @@ -7,14 +7,6 @@ test -n "$srcdir" || srcdir=. |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
152 olddir=`pwd` |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
153 cd "$srcdir" |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
154 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
155 -GTKDOCIZE=`which gtkdocize` |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
156 -if test -z $GTKDOCIZE; then |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
157 - echo "*** No GTK-Doc found, please install it ***" |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
158 - exit 1 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
159 -else |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
160 - gtkdocize || exit $? |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
161 -fi |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
162 - |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
163 AUTORECONF=`which autoreconf` |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
164 if test -z $AUTORECONF; then |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
165 echo "*** No autoreconf found, please install it ***" |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
166 diff --git a/configure.in b/configure.in |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
167 index 6a000cc..e7538f6 100644 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
168 --- a/configure.in |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
169 +++ b/configure.in |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
170 @@ -615,14 +615,7 @@ dnl ************************** |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
171 dnl *** Checks for gtk-doc *** |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
172 dnl ************************** |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
173 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
174 -if $have_cairo ; then : ; else |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
175 - if test x$enable_gtk_doc = xyes ; then |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
176 - AC_MSG_WARN([Cairo not present, disabling doc building]) |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
177 - enable_gtk_doc=no |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
178 - fi |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
179 -fi |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
180 - |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
181 -GTK_DOC_CHECK([1.0]) |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
182 +enable_gtk_doc=no |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
183 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
184 AC_ARG_ENABLE(man, |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
185 AC_HELP_STRING([--enable-man], |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
186 -- |
|
2639
6e851800cb27
package pango: split DllMain patch and make it callable
Matthias Gehre <M.Gehre@gmx.de>
parents:
2636
diff
changeset
|
187 1.7.9.5 |
|
2636
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
188 |