369cb79a99
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>
12 lines
475 B
Groff
12 lines
475 B
Groff
diff -ur harfbuzz.org/src/hb-icu.cc harfbuzz/src/hb-icu.cc
|
|
--- harfbuzz.org/src/hb-icu.cc 2019-06-26 22:30:55.000000000 +0200
|
|
+++ harfbuzz/src/hb-icu.cc 2019-10-28 23:21:42.198460246 +0100
|
|
@@ -53,7 +53,7 @@
|
|
|
|
/* ICU doesn't do-while(0) around their statements. Ugh!
|
|
* https://unicode-org.atlassian.net/browse/CLDR-13027 */
|
|
-#define HB_ICU_STMT(S) do { S } while (0)
|
|
+#define HB_ICU_STMT(S) do { S; } while (0)
|
|
|
|
hb_script_t
|
|
hb_icu_script_to_script (UScriptCode script)
|