mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00
Code Issues Releases Activity

print/harfbuzz-icu: unbreak build with ICU 75

Browse Source 
In file included from ../src/hb-icu.cc:39:
In file included from /usr/local/include/unicode/unorm2.h:35:
In file included from /usr/local/include/unicode/uset.h:36:
/usr/local/include/unicode/localpointer.h:561:26: error: 'auto' not allowed in template parameter until C++17
template <typename Type, auto closeFunction>
                         ^~~~
In file included from ../src/hb-icu.cc:39:
In file included from /usr/local/include/unicode/unorm2.h:35:
/usr/local/include/unicode/uset.h:358:53: error: value of type 'void (USet *)' is not implicitly convertible to 'int'
U_DEFINE_LOCAL_OPEN_POINTER(LocalUSetPointer, USet, uset_close);
                                                    ^~~~~~~~~~
/usr/local/include/unicode/localpointer.h:551:68: note: expanded from macro 'U_DEFINE_LOCAL_OPEN_POINTER'
    using LocalPointerClassName = internal::LocalOpenPointer<Type, closeFunction>
                                                                   ^~~~~~~~~~~~~
In file included from ../src/hb-icu.cc:39:
/usr/local/include/unicode/unorm2.h:286:69: error: value of type 'void (UNormalizer2 *)' is not implicitly convertible to 'int'
U_DEFINE_LOCAL_OPEN_POINTER(LocalUNormalizer2Pointer, UNormalizer2, unorm2_close);
                                                                    ^~~~~~~~~~~~
/usr/local/include/unicode/localpointer.h:551:68: note: expanded from macro 'U_DEFINE_LOCAL_OPEN_POINTER'
    using LocalPointerClassName = internal::LocalOpenPointer<Type, closeFunction>
                                                                   ^~~~~~~~~~~~~
PR:		278420
Reported by:	antoine (via exp-run)
This commit is contained in:
Jan Beich 2024-04-20 23:49:22 +02:00
parent ac847dd735
commit 4816cd4921
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
print/harfbuzz-icu/Makefile
View File

@ -1,4 +1,4 @@
PORTREVISION= 0
PORTREVISION= 1
PKGNAMESUFFIX= -icu
COMMENT= Harfbuzz ICU support

1
print/harfbuzz/Makefile
View File

@ -39,6 +39,7 @@ DOCS_MESON_ENABLED= docs
MESON_ARGS+= -Dicu=disabled -Dcairo=disabled
.elif ${HARFBUZZ_SLAVE} == icu
MESON_ARGS+= -Dicu=enabled -Dcairo=disabled -Ddocs=disabled
MESON_ARGS+= -Dcpp_std=c++17 # https://github.com/harfbuzz/harfbuzz/issues/4671
LIB_DEPENDS+= libharfbuzz.so:print/harfbuzz \
libicudata.so:devel/icu