diff --git a/ports/libunibreak/fix_export.patch b/ports/libunibreak/fix_export.patch index aafa6b4cbc..bc935fc930 100644 --- a/ports/libunibreak/fix_export.patch +++ b/ports/libunibreak/fix_export.patch @@ -1,23 +1,24 @@ -diff --git a/src/eastasianwidthdef.h b/src/eastasianwidthdef.h -index 67a41aa..c081a02 100644 ---- a/src/eastasianwidthdef.h -+++ b/src/eastasianwidthdef.h -@@ -26,6 +26,9 @@ - - #include "unibreakdef.h" - -+#ifdef __cplusplus -+extern "C" { -+#endif - /** - * East Asian Width (ea) class. This is defined in Unicode Standard - * Annex 11. -@@ -52,5 +55,8 @@ struct EastAsianWidthProperties - }; - - enum EastAsianWidthClass ub_get_char_eaw_class(utf32_t ch); -+#ifdef __cplusplus -+} -+#endif - - #endif /* EASTASIANWIDTHDEF_H */ +diff --git a/src/eastasianwidthdef.h b/src/eastasianwidthdef.h +index ba89040..0f82d37 100644 +--- a/src/eastasianwidthdef.h ++++ b/src/eastasianwidthdef.h +@@ -26,6 +26,10 @@ + + #include "unibreakdef.h" + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + /** + * East Asian Width (ea) class. This is defined in Unicode Standard + * Annex 11. +@@ -64,4 +68,8 @@ enum EastAsianWidthClass ub_get_char_eaw_class(utf32_t ch); + */ + bool ub_is_op_east_asian(utf32_t ch); + ++#ifdef __cplusplus ++} ++#endif ++ + #endif /* EASTASIANWIDTHDEF_H */ diff --git a/ports/libunibreak/portfile.cmake b/ports/libunibreak/portfile.cmake index 339ace020e..7010820c5e 100644 --- a/ports/libunibreak/portfile.cmake +++ b/ports/libunibreak/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO adah1972/libunibreak REF "libunibreak_${MAJOR}_${MINOR}" - SHA512 a85333d59c78b67b1c05d33ab99c069ba493780d6a98ad5ab00e33235c454b8b33515cac4e815de35533f235be7cf5473550b3a6389f7581ba2f6216d42d38e1 + SHA512 50271605be1645698df7ef5b97ae6bbc75b7228ea1aa26a261f33afd8e264e63c37c190d8d7f3a93f87d60b627a68ec90f2f7f55ef08486e5a8bd667c4a372f6 HEAD_REF master PATCHES fix_export.patch diff --git a/ports/libunibreak/vcpkg.json b/ports/libunibreak/vcpkg.json index e1aea08503..924d4f072b 100644 --- a/ports/libunibreak/vcpkg.json +++ b/ports/libunibreak/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libunibreak", - "version": "6.1", - "port-version": 1, + "version": "7.0", "description": "an implementation of the line breaking and word breaking algorithms as described in [Unicode Standard Annex 14] 1 and [Unicode Standard Annex 29] 2. Check the project's [home page] 3 for up-to-date information.", "homepage": "https://github.com/adah1972/libunibreak", "license": "zlib-acknowledgement", diff --git a/versions/baseline.json b/versions/baseline.json index f11e03d2d0..05ce60fa1b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5733,8 +5733,8 @@ "port-version": 3 }, "libunibreak": { - "baseline": "6.1", - "port-version": 1 + "baseline": "7.0", + "port-version": 0 }, "libunifex": { "baseline": "0.4.0", diff --git a/versions/l-/libunibreak.json b/versions/l-/libunibreak.json index f421be5d02..2b02921ef2 100644 --- a/versions/l-/libunibreak.json +++ b/versions/l-/libunibreak.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "97f6b21863acad08c46802c7e5c0e849148c6b83", + "version": "7.0", + "port-version": 0 + }, { "git-tree": "4970494282744de3fbdc2e964fa9d96ad3ddc27e", "version": "6.1",