Date: Mon, 8 Aug 2022 10:03:55 GMT From: =?utf-8?Q?Stefan=20E=C3=9Fer?= <se@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1cf12abc911b - main - java/openjdk11: revert accidental commit 3d803e446071 Message-ID: <202208081003.278A3tMU063755@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=1cf12abc911bc842cafc036039a77deae88278d2 commit 1cf12abc911bc842cafc036039a77deae88278d2 Author: Stefan Eßer <se@FreeBSD.org> AuthorDate: 2022-08-08 09:57:44 +0000 Commit: Stefan Eßer <se@FreeBSD.org> CommitDate: 2022-08-08 09:57:44 +0000 java/openjdk11: revert accidental commit 3d803e446071 Revert part of commit 3d803e446071 that should only have affected the deskutils/calendar port. This patch that has been committed by accident had already been attached to PR 265687 to fix the build issue of openjdk11 on -CURRENT, but it is up to the java@ team to apply this or some other fix. Approved by: portmgr (implicit) --- ...are_native_libharfbuzz_hb-ot-layout-gpos-table.hh | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/java/openjdk11/files/patch-src_java.desktop_share_native_libharfbuzz_hb-ot-layout-gpos-table.hh b/java/openjdk11/files/patch-src_java.desktop_share_native_libharfbuzz_hb-ot-layout-gpos-table.hh deleted file mode 100644 index 786d03c4dd8a..000000000000 --- a/java/openjdk11/files/patch-src_java.desktop_share_native_libharfbuzz_hb-ot-layout-gpos-table.hh +++ /dev/null @@ -1,20 +0,0 @@ ---- src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gpos-table.hh.orig 2022-07-20 05:18:35 UTC -+++ src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gpos-table.hh -@@ -1128,7 +1128,7 @@ struct PairSet - if (record) - { - /* Note the intentional use of "|" instead of short-circuit "||". */ -- if (valueFormats[0].apply_value (c, this, &record->values[0], buffer->cur_pos()) | -+ if ((int)valueFormats[0].apply_value (c, this, &record->values[0], buffer->cur_pos()) | - valueFormats[1].apply_value (c, this, &record->values[len1], buffer->pos[pos])) - buffer->unsafe_to_break (buffer->idx, pos + 1); - if (len2) -@@ -1414,7 +1414,7 @@ struct PairPosFormat2 - - const Value *v = &values[record_len * (klass1 * class2Count + klass2)]; - /* Note the intentional use of "|" instead of short-circuit "||". */ -- if (valueFormat1.apply_value (c, this, v, buffer->cur_pos()) | -+ if ((int)valueFormat1.apply_value (c, this, v, buffer->cur_pos()) | - valueFormat2.apply_value (c, this, v + len1, buffer->pos[skippy_iter.idx])) - buffer->unsafe_to_break (buffer->idx, skippy_iter.idx + 1); -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208081003.278A3tMU063755>