diff -Naurp libreoffice-24.8.2.1.orig/external/firebird/firebird-icu76.patch libreoffice-24.8.2.1/external/firebird/firebird-icu76.patch
old
|
new
|
|
| 1 | diff -Naurp src.orig/common/unicode_util.cpp src/common/unicode_util.cpp |
| 2 | --- src.orig/common/unicode_util.cpp 2020-10-20 03:40:05.000000000 -0500 |
| 3 | +++ src/common/unicode_util.cpp 2024-11-01 11:55:44.683926741 -0500 |
| 4 | @@ -40,6 +40,9 @@ |
| 5 | #include "../common/StatusHolder.h" |
| 6 | #include "../common/os/path_utils.h" |
| 7 | |
| 8 | +#define U_SHOW_CPLUSPLUS_API 0 |
| 9 | +#define U_SHOW_CPLUSPLUS_HEADER_API 0 |
| 10 | + |
| 11 | #include <unicode/ustring.h> |
| 12 | #include <unicode/utrans.h> |
| 13 | #include <unicode/uchar.h> |
diff -Naurp libreoffice-24.8.2.1.orig/external/firebird/UnpackedTarball_firebird.mk libreoffice-24.8.2.1/external/firebird/UnpackedTarball_firebird.mk
old
|
new
|
$(eval $(call gb_UnpackedTarball_add_pat
|
51 | 51 | external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 \ |
52 | 52 | external/firebird/configure-c99.patch \ |
53 | 53 | external/firebird/Wincompatible-function-pointer-types.patch \ |
| 54 | external/firebird/firebird-icu76.patch \ |
54 | 55 | external/firebird/c++26.patch \ |
55 | 56 | external/firebird/c++20.patch \ |
56 | 57 | )) |
diff -Naurp libreoffice-24.8.2.1.orig/external/libcdr/ExternalProject_libcdr.mk libreoffice-24.8.2.1/external/libcdr/ExternalProject_libcdr.mk
old
|
new
|
$(call gb_ExternalProject_get_state_targ
|
27 | 27 | $(call gb_Trace_StartRange,libcdr,EXTERNAL) |
28 | 28 | $(call gb_ExternalProject_run,build,\ |
29 | 29 | export PKG_CONFIG="" \ |
| 30 | export ICU_LIBS="-licui18n -licuuc -licudata" \ |
30 | 31 | && unset MSYS_NO_PATHCONV && MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \ |
31 | 32 | --with-pic \ |
32 | 33 | --enable-static \ |