Mercurial > mxe-octave
annotate src/msvc-pango-1.patch @ 4090:d6f9b54851b5
l: update to v1.11.4
* src/gdal.mk: update version, checksum, install gdal.pc file
author | John Donoghue |
---|---|
date | Mon, 08 Feb 2016 12:53:00 -0500 |
parents | f283b410a60f |
children |
rev | line source |
---|---|
3175
f283b410a60f
[MSVC] remove -lm from pkgconfig files of FFTW and Pango
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3172
diff
changeset
|
1 diff -ur pango-1.34.1-orig/configure pango-1.34.1/configure |
f283b410a60f
[MSVC] remove -lm from pkgconfig files of FFTW and Pango
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3172
diff
changeset
|
2 --- pango-1.34.1-orig/configure 2013-05-13 11:34:47 -0400 |
f283b410a60f
[MSVC] remove -lm from pkgconfig files of FFTW and Pango
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3172
diff
changeset
|
3 +++ pango-1.34.1/configure 2013-07-25 09:47:14 -0400 |
f283b410a60f
[MSVC] remove -lm from pkgconfig files of FFTW and Pango
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3172
diff
changeset
|
4 @@ -19745,7 +19745,7 @@ |
f283b410a60f
[MSVC] remove -lm from pkgconfig files of FFTW and Pango
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3172
diff
changeset
|
5 PKGCONFIG_CAIRO_REQUIRES= |
f283b410a60f
[MSVC] remove -lm from pkgconfig files of FFTW and Pango
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3172
diff
changeset
|
6 |
f283b410a60f
[MSVC] remove -lm from pkgconfig files of FFTW and Pango
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3172
diff
changeset
|
7 if test $enable_explicit_deps = yes ; then |
f283b410a60f
[MSVC] remove -lm from pkgconfig files of FFTW and Pango
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3172
diff
changeset
|
8 - PKGCONFIG_MATH_LIBS=-lm |
f283b410a60f
[MSVC] remove -lm from pkgconfig files of FFTW and Pango
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3172
diff
changeset
|
9 + PKGCONFIG_MATH_LIBS= |
f283b410a60f
[MSVC] remove -lm from pkgconfig files of FFTW and Pango
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3172
diff
changeset
|
10 |
f283b410a60f
[MSVC] remove -lm from pkgconfig files of FFTW and Pango
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3172
diff
changeset
|
11 X_LIBS="$X_LIBS $X_EXTRA_LIBS" |
f283b410a60f
[MSVC] remove -lm from pkgconfig files of FFTW and Pango
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3172
diff
changeset
|
12 |
3172
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
13 diff -ur pango-1.34.1-orig/pango/Makefile.in pango-1.34.1/pango/Makefile.in |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
14 --- pango-1.34.1-orig/pango/Makefile.in 2013-05-13 11:34:50 -0400 |
3175
f283b410a60f
[MSVC] remove -lm from pkgconfig files of FFTW and Pango
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3172
diff
changeset
|
15 +++ pango-1.34.1/pango/Makefile.in 2013-07-25 09:46:13 -0400 |
3172
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
16 @@ -80,7 +80,7 @@ |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
17 POST_UNINSTALL = : |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
18 build_triplet = @build@ |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
19 host_triplet = @host@ |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
20 -@PLATFORM_WIN32_TRUE@am__append_1 = -export-symbols $(srcdir)/pango.def -Wl,pango-win32-res.o |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
21 +@PLATFORM_WIN32_TRUE@am__append_1 = -export-symbols-regex "xXx" -Wl,$(srcdir)/pango.def -Wl,pango-win32-res.o |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
22 @PLATFORM_WIN32_TRUE@am__append_2 = pango-win32-res.o pango.def |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
23 @HAVE_CAIRO_FREETYPE_TRUE@am__append_3 = freetype2 |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
24 |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
25 @@ -88,21 +88,21 @@ |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
26 @HAVE_FREETYPE_TRUE@am__append_4 = $(pangoft2_headers) |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
27 @HAVE_FREETYPE_TRUE@am__append_5 = libpangoft2-1.0.la |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
28 @HAVE_FREETYPE_TRUE@am__append_6 = PangoFT2-1.0.gir |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
29 -@PLATFORM_WIN32_TRUE@am__append_7 = -export-symbols $(srcdir)/pangoft2.def -Wl,pangoft2-win32-res.o |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
30 +@PLATFORM_WIN32_TRUE@am__append_7 = -export-symbols-regex "xXx" -Wl,$(srcdir)/pangoft2.def -Wl,pangoft2-win32-res.o |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
31 @PLATFORM_WIN32_TRUE@am__append_8 = pangoft2-win32-res.o pangoft2.def |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
32 |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
33 # ------------------- libpangoxft ------------------- |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
34 @HAVE_XFT_TRUE@am__append_9 = $(pangoxft_headers) |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
35 @HAVE_XFT_TRUE@am__append_10 = libpangoxft-1.0.la |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
36 @HAVE_XFT_TRUE@am__append_11 = PangoXft-1.0.gir |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
37 -@PLATFORM_WIN32_TRUE@am__append_12 = -export-symbols $(srcdir)/pangoxft.def -Wl,pangoxft-win32-res.o |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
38 +@PLATFORM_WIN32_TRUE@am__append_12 = -export-symbols-regex "xXx" -Wl,$(srcdir)/pangoxft.def -Wl,pangoxft-win32-res.o |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
39 @PLATFORM_WIN32_TRUE@am__append_13 = pangoxft-win32-res.o pangoxft.def |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
40 |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
41 # ------------------- libpangocairo ------------------- |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
42 @HAVE_CAIRO_TRUE@am__append_14 = $(pangocairo_headers) |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
43 @HAVE_CAIRO_TRUE@am__append_15 = libpangocairo-1.0.la |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
44 @HAVE_CAIRO_TRUE@am__append_16 = PangoCairo-1.0.gir |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
45 -@HAVE_CAIRO_WIN32_TRUE@@PLATFORM_WIN32_TRUE@am__append_17 = -export-symbols $(srcdir)/pangocairo.def -Wl,pangocairo-win32-res.o |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
46 +@HAVE_CAIRO_WIN32_TRUE@@PLATFORM_WIN32_TRUE@am__append_17 = -export-symbols-regex "xXx" -Wl,$(srcdir)/pangocairo.def -Wl,pangocairo-win32-res.o |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
47 @HAVE_CAIRO_WIN32_TRUE@@PLATFORM_WIN32_TRUE@am__append_18 = pangocairo-win32-res.o pangocairo.def |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
48 @HAVE_CAIRO_WIN32_TRUE@am__append_19 = libpangowin32-$(PANGO_API_VERSION).la $(WIN32_LIBS) |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
49 @HAVE_CAIRO_WIN32_TRUE@am__append_20 = libpangowin32-$(PANGO_API_VERSION).la |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
50 @@ -135,7 +135,7 @@ |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
51 # ------------------- libpangowin32 ------------------- |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
52 @HAVE_WIN32_TRUE@am__append_31 = pangowin32.h |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
53 @HAVE_WIN32_TRUE@am__append_32 = libpangowin32-1.0.la |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
54 -@PLATFORM_WIN32_TRUE@am__append_33 = -export-symbols $(srcdir)/pangowin32.def -Wl,pangowin32-win32-res.o |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
55 +@PLATFORM_WIN32_TRUE@am__append_33 = -export-symbols-regex "xXx" -Wl,$(srcdir)/pangowin32.def -Wl,pangowin32-win32-res.o |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
56 @PLATFORM_WIN32_TRUE@am__append_34 = pangowin32-win32-res.o pangowin32.def |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
57 bin_PROGRAMS = pango-querymodules$(EXEEXT) |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
58 @HAVE_XFT_TRUE@am__append_35 = libpangoxft-$(PANGO_API_VERSION).la |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
59 diff -ur pango-1.34.1-orig/pango-view/viewer-cairo.c pango-1.34.1/pango-view/viewer-cairo.c |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
60 --- pango-1.34.1-orig/pango-view/viewer-cairo.c 2012-08-24 15:08:22 -0400 |
3175
f283b410a60f
[MSVC] remove -lm from pkgconfig files of FFTW and Pango
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3172
diff
changeset
|
61 +++ pango-1.34.1/pango-view/viewer-cairo.c 2013-07-25 09:46:13 -0400 |
3172
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
62 @@ -76,7 +76,9 @@ |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
63 #endif /* HAVE_XFT */ |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
64 #endif /* HAVE_CAIRO_XLIB */ |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
65 |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
66 - |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
67 +#if defined (_MSC_VER) && ! defined (strcasecmp) |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
68 +# define strcasecmp stricmp |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
69 +#endif |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
70 |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
71 |
8d294e37ce65
[MSVC] enable Pango compilation (and bump version to 1.34.1)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
72 static cairo_surface_t * |