From nobody Sun Aug 28 14:55:24 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MFxSr5vt0z4Zm44; Sun, 28 Aug 2022 14:55:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MFxSr5DJjz3Fm5; Sun, 28 Aug 2022 14:55:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661698524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aJPgaCtNlnb6bjZtW7WbhUVMuMobIOpYmzyHJ3APQk0=; b=i7IEcsJxC8B8OR9+tVvyZwOG2utRArN+1B6MEyy0AnA3nDA8yYwnC311mLAd3AkPsdMpco r1I4+Rb2PmuHUNbTEob5osifC3Zy2XRf60Vt5453T87zepyEfCDgZSBhN0kR1qJfBuTrll uZiWvdMnXvuRhUPYxWoaOGNt2345003pVqTZuB40p5OTHsZZvkiPi60on/t7zR9XwWiTLn ho/NmrzNXK/0vyB/ySHW8b+uxGsXvqd1kgcbzX7hH2VzIUOwhQrKvA71l6tVBNTLTfzpQr Zj+uhxOTRsdVNLGdOgTSsDlSsmHuAFEWx8pWr2XSEsvUd/IAo+xD8UGgS28Zag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MFxSr43Mvz16Vf; Sun, 28 Aug 2022 14:55:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27SEtOFS062641; Sun, 28 Aug 2022 14:55:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27SEtOqd062640; Sun, 28 Aug 2022 14:55:24 GMT (envelope-from git) Date: Sun, 28 Aug 2022 14:55:24 GMT Message-Id: <202208281455.27SEtOqd062640@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan=20E=C3=9Fer?= Subject: git: 3d41392b6e04 - main - java/openjdk11: fix build on 13.1 and -CURRENT List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d41392b6e049ff56d2abf91749a82573eb3198d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661698524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aJPgaCtNlnb6bjZtW7WbhUVMuMobIOpYmzyHJ3APQk0=; b=spUKWLQSKvXSko9GwSuD8OozuFYAQzIzytoHYbkZvXc1dNTcpV78oWUdouVhOjMLEWkAsz v+lx9r5+c5DaxKxvPDNDNyWDO63RpCncbm/tz9940iGWSvE5zfQLakmxlb4r5SqG95DSkn CWxkOU1gFIqo+iewqcrZ/wioAv/rzh7fOh8rAdsyvSv/4x4Nuh8iJBqRpzACSLy2b/P4ly sbHl346iZfGb7oaoxbpQAiAjExTCL1PHKTOKKgE43RobWcVeqME3kbfGkdsK6FLQLX1/y8 0q8OlpBoDUilfWjnNiFhoaqSng3Ooy7O6z46TZxUfCjyVWlz80genbJKiNZ9XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661698524; a=rsa-sha256; cv=none; b=riVR5J17imJac8q0HUOfpMeC3gbIXlAfXO1oabCO8jx6vItnh0dYzaf88izI6usojG7IR5 QO13cWK+piOXH8qLjrmyIRd1AiMezb+V6NtYDaoZowd9/wxvn9/7PHdna+XC8CeJ1YFgOw Ei4bH8JM1q+Z7M1A/PQLqqtIPoVnRuGbVTvLK9rYDAi8XbpgxBiodI1Udyi0w7kCb9HnOr rE6S1lxCmdu67Z5f69ER+C7EhB6HqpGPtq45lvcHyQx6suW57lTv5mL+GCMVSFQMKJ2Xyg LSOm+BoHgst0MhuaHMrKMH2pK3syGsqLRDJEl5/liZjgCFYHbXsYvI4WHf3sZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d41392b6e049ff56d2abf91749a82573eb3198d commit 3d41392b6e049ff56d2abf91749a82573eb3198d Author: Stefan Eßer AuthorDate: 2022-08-28 14:40:46 +0000 Commit: Stefan Eßer CommitDate: 2022-08-28 14:54:31 +0000 java/openjdk11: fix build on 13.1 and -CURRENT Recent LLVM versions issue warnings for "|" being used with boolean operands. Such operations exist in OpenJDK and the source lines are marked with comments to not use logical operations instead. This breaks the build on 13.1 and -CURRENT when building with LLVM-13 or newer due to the -Werror option being passed to the compiler. Fix this issue by casting one of the boolean operands to int, as suggested by the compiler in the error message for the case that the "|" operation should actually be used on purpose. I had submitted this patch as an attachment to PR 265687 on 2022-08-07, but it has been ignored by the maintainer (java team). PR: 265687 Approved by: portmgr (implicit) --- ...are_native_libharfbuzz_hb-ot-layout-gpos-table.hh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) 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 new file mode 100644 index 000000000000..786d03c4dd8a --- /dev/null +++ b/java/openjdk11/files/patch-src_java.desktop_share_native_libharfbuzz_hb-ot-layout-gpos-table.hh @@ -0,0 +1,20 @@ +--- 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); +