From nobody Mon Aug 08 10:03:55 2022 X-Original-To: dev-commits-ports-all@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 4M1Wxm154Rz4YjV4; Mon, 8 Aug 2022 10:03:56 +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 4M1Wxm0Zkbz3V65; Mon, 8 Aug 2022 10:03:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659953036; 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=m5YxKFwwnPnOI4MCLuwm+TOXHGPHrz5RikfLXQfdcQg=; b=X4hnvoihtMmcup3Yl4eACZ5pJgX9F0RtmLF6mHBxeiMkz4XTgfURYx2oc4Z0o1tBx2Y8nt Un4XyMmIlgG+cdP+jWGT8ktDI9BuLD01tKM+7AKGSr9jXaqa8DeBKaFtjvwk5Tc0SlmQZy BQEu5214gD33S2M2xROsGh7JOu5kKAZ8/JjUTMCbK+I9Ah44OGFSrgs3e1hT1IYT0EqQ+F +sa3JKKdsJPf2lI0CaOVZoBTF08NMVCCC+uxgJrfuIpqPks+BF2Ns7pVW6lxCa7ioXK4NX wf2KrcRBh8jy+Ez+W5bYgRmOYhT2G1OzXeVEgXXCkhOU6fZKj1oL2D4EiPX+6g== 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 4M1Wxl6lkhzns1; Mon, 8 Aug 2022 10:03:55 +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 278A3t62063757; Mon, 8 Aug 2022 10:03:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 278A3tMU063755; Mon, 8 Aug 2022 10:03:55 GMT (envelope-from git) Date: Mon, 8 Aug 2022 10:03:55 GMT Message-Id: <202208081003.278A3tMU063755@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: 1cf12abc911b - main - java/openjdk11: revert accidental commit 3d803e446071 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 1cf12abc911bc842cafc036039a77deae88278d2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659953036; 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=m5YxKFwwnPnOI4MCLuwm+TOXHGPHrz5RikfLXQfdcQg=; b=L4jkIK4ufJrnWfkiSmkiHtDZ/QbjWQQVDNCRyKanBZXhHT+RxDYvqQr5f2wctn/UJaG3Mv MoxHxPLjax/AegsZ3qjdIK7BJxTRLPtIwSIkr4NUHuhx0F1XY6tWzDBKfGyttPB76rp3nl dSUY0NUjbNbvLzOK3i49TlVMQiWMDFIEZMtNu+qqykJRHJleKNLCqtVvFBb4tT9hVu/Nt5 EfChsY2BVW1BwbfUIGHy+nOMOybGsO70rsqHo2VUl0DUxbwRmpkn9QUAGB0Ce/hPituuCE XFM78N2Kd5jKw2dFqjmevj50wv9ZAX2psAzOO/1aOH9KeuWHsmaw2t/83QpN4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659953036; a=rsa-sha256; cv=none; b=L0X7rUpWVTPunGlQECIUFGtdK7po6SuVRsN3PuI3mcyzzlVYRfQ6wzeU0jyBAh2Y218RYD pUCigAr5L4mzUzRizjslLeJah5pdVVyKHcTXkg9+Go/nyq1sHMsGNwuWgnfO1kHJKH60Dv LVrYGegCmtudIEqqHTUIGkXtQgl05CVCtdF42In352FZU13R9iG4qCpRRR+anii8lT42nB Kp1bEd35dofX80VUTjJQdsx1gJFdDfdIX5GsCOXqzLkvfwi8SP34qlhg3sRV6N5MQz9Kj3 UjjAqOkt1Y1MmTTzG/RVP2h3Ym+wRCc/yLD6rF3ee70Jljx5KQOBl02GpqjJiQ== 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=1cf12abc911bc842cafc036039a77deae88278d2 commit 1cf12abc911bc842cafc036039a77deae88278d2 Author: Stefan Eßer AuthorDate: 2022-08-08 09:57:44 +0000 Commit: Stefan Eßer 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); -