Mercurial > mxe-octave
annotate src/pango-1-fixes.patch @ 2818:c9c16664efca
update package pango
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Fri, 12 Oct 2012 12:14:25 +0200 |
| parents | 6e851800cb27 |
| children |
| rev | line source |
|---|---|
| 2818 | 1 This file is part of MXE. |
| 2 See index.html for further information. | |
| 1213 | 3 |
| 2818 | 4 From 6dc99b57932d52db33413b9f054ef8843f697ec0 Mon Sep 17 00:00:00 2001 |
| 5 From: Mark Brand <mabrand@mabrand.nl> | |
| 6 Date: Wed, 29 Sep 2010 00:52:59 +0200 | |
| 7 Subject: [PATCH 1/4] s,DllMain,static _disabled_DllMain, | |
| 8 | |
| 1213 | 9 |
| 10 diff --git a/pango/pango-utils.c b/pango/pango-utils.c | |
| 2818 | 11 index 18ffa26..aac59ab 100644 |
| 1213 | 12 --- a/pango/pango-utils.c |
| 13 +++ b/pango/pango-utils.c | |
| 2818 | 14 @@ -691,12 +691,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 */ | |
| 2818 | 19 +/* static _disabled_DllMain function needed to tuck away the DLL handle */ |
| 1213 | 20 |
| 2818 | 21 static HMODULE pango_dll; /* MT-safe */ |
| 1213 | 22 |
| 23 BOOL WINAPI | |
| 24 -DllMain (HINSTANCE hinstDLL, | |
| 2818 | 25 +static _disabled_DllMain (HINSTANCE hinstDLL, |
| 1213 | 26 DWORD fdwReason, |
| 27 LPVOID lpvReserved) | |
| 28 { | |
| 1219 | 29 -- |
| 2818 | 30 1.7.10.4 |
| 1219 | 31 |
| 1213 | 32 |
| 2818 | 33 From e5359406f68e5bb4bd5f1b9516f9d28f41e8b38e 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 |
| 38 | |
| 39 diff --git a/pango.pc.in b/pango.pc.in | |
| 2623 | 40 index 17a8b7a..16c5981 100644 |
| 1213 | 41 --- a/pango.pc.in |
| 42 +++ b/pango.pc.in | |
| 2623 | 43 @@ -10,5 +10,5 @@ Description: Internationalized text handling |
| 1213 | 44 Version: @VERSION@ |
| 2623 | 45 Requires: glib-2.0 gobject-2.0 |
| 46 Requires.private: gmodule-no-export-2.0 | |
| 1213 | 47 -Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ |
| 48 +Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ -lusp10 | |
| 49 Cflags: -I${includedir}/pango-1.0 | |
| 1219 | 50 -- |
| 2818 | 51 1.7.10.4 |
| 2623 | 52 |
| 53 | |
| 2818 | 54 From 8a4c71a44d76896fcdb610f50eaa07be3d108c3d Mon Sep 17 00:00:00 2001 |
| 2623 | 55 From: Mark Brand <mabrand@mabrand.nl> |
| 56 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
|
57 Subject: [PATCH 3/4] do not force shared for win32 |
| 2623 | 58 |
| 1219 | 59 |
| 2623 | 60 diff --git a/configure.in b/configure.in |
| 2818 | 61 index a0e0057..fe1f7fe 100644 |
| 2623 | 62 --- a/configure.in |
| 63 +++ b/configure.in | |
| 2818 | 64 @@ -142,20 +142,6 @@ AC_CHECK_HEADERS(unistd.h sys/mman.h) |
| 2623 | 65 # Win32 stuff |
| 66 # | |
| 67 | |
| 68 -AC_LIBTOOL_WIN32_DLL | |
| 69 -AM_DISABLE_STATIC | |
| 70 - | |
| 71 -if test "$pango_os_win32" = "yes"; then | |
| 72 - if test x$enable_static = xyes -o x$enable_static = x; then | |
| 73 - AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) | |
| 74 - enable_static=no | |
| 75 - fi | |
| 76 - if test x$enable_shared = xno; then | |
| 77 - AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) | |
| 78 - fi | |
| 79 - enable_shared=yes | |
| 80 -fi | |
| 81 - | |
| 82 AM_PROG_LIBTOOL | |
| 83 dnl when using libtool 2.x create libtool early, because it's used in configure | |
| 84 m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) | |
| 85 diff --git a/modules/Makefile.am b/modules/Makefile.am | |
| 2818 | 86 index 73b42f4..19c5a4f 100644 |
| 2623 | 87 --- a/modules/Makefile.am |
| 88 +++ b/modules/Makefile.am | |
| 2818 | 89 @@ -21,22 +21,7 @@ RUN_QUERY_MODULES_TEST=true |
| 2623 | 90 all-local: pango.modules |
| 91 endif | |
| 92 | |
| 93 -install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT) | |
| 94 - @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \ | |
| 95 - echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \ | |
| 96 - $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ | |
| 97 - \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ | |
| 98 - $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \ | |
| 99 - $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ | |
| 100 - > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ | |
| 101 - else \ | |
| 102 - echo "***" ; \ | |
| 103 - echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \ | |
| 104 - echo "*** not created" ; \ | |
| 105 - echo "*** Generate this file on the target system" ; \ | |
| 106 - echo "*** using pango-querymodules" ; \ | |
| 107 - echo "***" ; \ | |
| 108 - fi | |
| 109 +install-data-local: | |
| 110 | |
| 111 uninstall-local: | |
| 112 $(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules | |
| 113 -- | |
| 2818 | 114 1.7.10.4 |
| 2623 | 115 |
|
2636
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
116 |
| 2818 | 117 From ed84a78833202e38407f47e1fcd28fa8e612d536 Mon Sep 17 00:00:00 2001 |
|
2636
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
118 From: Mark Brand <mabrand@mabrand.nl> |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
119 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
|
120 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
|
121 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
122 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
123 diff --git a/Makefile.am b/Makefile.am |
| 2818 | 124 index 1ac018a..1999723 100644 |
|
2636
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
125 --- a/Makefile.am |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
126 +++ b/Makefile.am |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
127 @@ -1,6 +1,6 @@ |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
128 ## 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
|
129 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
130 -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
|
131 +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
|
132 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
133 EXTRA_DIST = \ |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
134 autogen.sh \ |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
135 diff --git a/autogen.sh b/autogen.sh |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
136 index bc7c59c..4e1918c 100755 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
137 --- a/autogen.sh |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
138 +++ b/autogen.sh |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
139 @@ -7,14 +7,6 @@ test -n "$srcdir" || srcdir=. |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
140 olddir=`pwd` |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
141 cd "$srcdir" |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
142 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
143 -GTKDOCIZE=`which gtkdocize` |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
144 -if test -z $GTKDOCIZE; then |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
145 - echo "*** No GTK-Doc found, please install it ***" |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
146 - exit 1 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
147 -else |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
148 - gtkdocize || exit $? |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
149 -fi |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
150 - |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
151 AUTORECONF=`which autoreconf` |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
152 if test -z $AUTORECONF; then |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
153 echo "*** No autoreconf found, please install it ***" |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
154 diff --git a/configure.in b/configure.in |
| 2818 | 155 index fe1f7fe..23c4311 100644 |
|
2636
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
156 --- a/configure.in |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
157 +++ b/configure.in |
| 2818 | 158 @@ -568,14 +568,7 @@ dnl ************************** |
|
2636
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
159 dnl *** Checks for gtk-doc *** |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
160 dnl ************************** |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
161 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
162 -if $have_cairo ; then : ; else |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
163 - if test x$enable_gtk_doc = xyes ; then |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
164 - 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
|
165 - enable_gtk_doc=no |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
166 - fi |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
167 -fi |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
168 - |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
169 -GTK_DOC_CHECK([1.0]) |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
170 +enable_gtk_doc=no |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
171 |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
172 AC_ARG_ENABLE(man, |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
173 AC_HELP_STRING([--enable-man], |
|
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
174 -- |
| 2818 | 175 1.7.10.4 |
|
2636
059460e131a5
package pango: kill gtk-doc dependenc
Mark Brand <mabrand@mabrand.nl>
parents:
2623
diff
changeset
|
176 |