diff options
| author | Eike Rathke <erack@redhat.com> | 2019-10-29 00:16:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-30 09:14:48 +0100 |
| commit | 369cb79a994dc52de0e1ee02c2d824efcc0c18d3 (patch) | |
| tree | 285abe293afe62739f985054ccb58c507d9cf52f /external/libfreehand | |
| parent | f645993593ff931d1659e701487131e3bd1b40f5 (diff) | |
Upgrade to ICU 65.1
sberg says: On Windows, implicit --enable-extras first causes a build breaker
in workdir/UnpackedTarball/icu/source/extras/scrptrun when linking, because
Windows link.exe doesn't understand -o. But even with a patch
> --- source/extra/scrptrun/Makefile.in
> +++ source/extra/scrptrun/Makefile.in
> @@ -74,7 +74,7 @@
> && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
>
> $(TARGET) : $(OBJECTS)
> - $(LINK.cc) -o $@ $^ $(LIBS)
> + $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
> $(POST_BUILD_STEP)
>
> invoke:
linking would still fail with a missing ../../lib/icuucdd.lib, which is
apparently expanded from $(LIBS) there, but I have no idea where it should be
built but isn't. Lets hope that --disable-extras is sufficient for our needs.
Change-Id: I6d0117b230caa41abf488fcd069028e3474700f8
Reviewed-on: https://gerrit.libreoffice.org/81632
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/libfreehand')
| -rw-r--r-- | external/libfreehand/UnpackedTarball_libfreehand.mk | 8 | ||||
| -rw-r--r-- | external/libfreehand/icu-65-api-macros-with-semicolon.patch.1 | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/external/libfreehand/UnpackedTarball_libfreehand.mk b/external/libfreehand/UnpackedTarball_libfreehand.mk index 222f013c7873..641b470e3b25 100644 --- a/external/libfreehand/UnpackedTarball_libfreehand.mk +++ b/external/libfreehand/UnpackedTarball_libfreehand.mk @@ -13,4 +13,12 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libfreehand,$(FREEHAND_TARBALL))) $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libfreehand)) +$(eval $(call gb_UnpackedTarball_set_patchlevel,libfreehand,0)) + +# icu-65-api-macros-with-semicolon.patch.1 +# See http://site.icu-project.org/download/65 Migration Issues +$(eval $(call gb_UnpackedTarball_add_patches,libfreehand,\ + external/libfreehand/icu-65-api-macros-with-semicolon.patch.1 \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libfreehand/icu-65-api-macros-with-semicolon.patch.1 b/external/libfreehand/icu-65-api-macros-with-semicolon.patch.1 new file mode 100644 index 000000000000..20b0af801a3a --- /dev/null +++ b/external/libfreehand/icu-65-api-macros-with-semicolon.patch.1 @@ -0,0 +1,12 @@ +diff -ur libfreehand.org/src/lib/libfreehand_utils.cpp libfreehand/src/lib/libfreehand_utils.cpp +--- libfreehand.org/src/lib/libfreehand_utils.cpp 2017-09-16 12:28:50.000000000 +0200 ++++ libfreehand/src/lib/libfreehand_utils.cpp 2019-10-28 23:02:38.581354923 +0100 +@@ -162,7 +162,7 @@ + while (j < length) + { + UChar32 c; +- U16_NEXT(s, j, length, c) ++ U16_NEXT(s, j, length, c); + unsigned char outbuf[U8_MAX_LENGTH+1]; + int i = 0; + U8_APPEND_UNSAFE(&outbuf[0], i, c); |