Mercurial > mxe-octave

annotate src/msvc-harfbuzz-1.patch @ 5893:53a6c7df43f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mesa 3D: Update to version 21.1.8. * src/mesa.mk: Update version and checksum. * src/mesa-2-uninitialized.patch: Remove file. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 16 Sep 2021 22:37:45 +0200
parents 4a05b335972b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3171
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur harfbuzz-0.9.19-orig/src/Makefile.in harfbuzz-0.9.19/src/Makefile.in
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- harfbuzz-0.9.19-orig/src/Makefile.in 2013-07-16 16:04:27 -0400
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ harfbuzz-0.9.19/src/Makefile.in 2013-07-22 21:31:44 -0400
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -1749,9 +1749,9 @@
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 %.pc: %.pc.in $(top_builddir)/config.status
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 $(AM_V_GEN) \
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 $(SED) -e 's@%prefix%@$(prefix)@g' \
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 - -e 's@%exec_prefix%@$(exec_prefix)@g' \
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 - -e 's@%libdir%@$(libdir)@g' \
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 - -e 's@%includedir%@$(includedir)@g' \
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 + -e 's@%exec_prefix%@$${prefix}@g' \
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 + -e 's@%libdir%@$${exec_prefix}/lib@g' \
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 + -e 's@%includedir%@$${prefix}/include@g' \
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 -e 's@%VERSION%@$(VERSION)@g' \
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 "$<" \
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 > "$@.tmp" && mv "$@.tmp" "$@" || ( $(RM) "$@.tmp"; false )
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 @@ -1761,7 +1761,6 @@
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18 $(EGREP) '^hb_.* \(' | \
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19 sed -e 's/ (.*//' | \
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20 LANG=C sort; \
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21 - echo LIBRARY libharfbuzz-$(HB_VERSION_MAJOR).dll; \
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22 ) >"$@.tmp"
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23 @ ! grep -q hb_ERROR "$@.tmp" && mv "$@.tmp" "$@" || ($(RM) "$@"; false)
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
24
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25 diff -ur harfbuzz-0.9.19-orig/util/helper-cairo.cc harfbuzz-0.9.19/util/helper-cairo.cc
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26 --- harfbuzz-0.9.19-orig/util/helper-cairo.cc 2013-04-04 21:15:59 -0400
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27 +++ harfbuzz-0.9.19/util/helper-cairo.cc 2013-07-22 21:30:28 -0400
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28 @@ -60,6 +60,10 @@
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
29 # endif
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
30 #endif
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
31
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
32 +#if defined (_MSC_VER) && ! defined (strcasecmp)
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
33 +# define strcasecmp stricmp
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
34 +#endif
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35 +
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
36 cairo_scaled_font_t *
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37 helper_cairo_create_scaled_font (const font_options_t *font_opts,
4a05b335972b [MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38 double font_size)