From nobody Sun Feb 06 04:41:55 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 EAA7519A59C1; Sun, 6 Feb 2022 04:41: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 4JrxSh2gd9z4TXm; Sun, 6 Feb 2022 04:41:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644122516; 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=jeyF6RMh/uKknZqzK03Gf0iMI/70AKjyz2nWYP6b4IA=; b=NEZZ8r6ZG0rJNXXmdgGIN7T4PogJwO1ldFum4Nlr5lAOsYXr9MQ5XG6zz+BydwOasSu0ZX ry8hOw+240rR3NB7ts7LyA4pxWliPebey/587jZQQE3qc5Eq5ZqSBqt8mybAQmE0+wC2dA cZ28m/qWokhRUFHbmJhYmBNZQe3V+js2K36TKz6wrT473A02WNShZegD8oaQPlCFyvxgFg pyFZuQGodpSYZb+3ytWjfFAiu2AWOKWY6QNVRGvVvMFXJCo+lvKTKsc3jT5u62U722fSOL bkST5u+BS7yEPQmI/Mm8dF788d+Hh/NaMK+yY084xd/kfXDpsSr4FOEXJOZqNA== 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 D805744AF; Sun, 6 Feb 2022 04:41: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 2164ft9g028224; Sun, 6 Feb 2022 04:41:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2164ftRk028223; Sun, 6 Feb 2022 04:41:55 GMT (envelope-from git) Date: Sun, 6 Feb 2022 04:41:55 GMT Message-Id: <202202060441.2164ftRk028223@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Greg Lewis Subject: git: 0e170396da4d - main - java/openjdk15: Update to 15.0.6 GA 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: glewis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e170396da4d35288e9e05f68c56c295934c82fc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644122516; 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=jeyF6RMh/uKknZqzK03Gf0iMI/70AKjyz2nWYP6b4IA=; b=uKandNXdHT5XhpzXHJaO188CNHTtfOxffPQIhvWRRiA1Z/GOPTepIlckLfxpNuvT7nwnrd 006QbhgqYDQc9dIhpGwTlEIChKLvsUCPc8cbhpv5G9HTrSMmFohZis7P0xnGe10/KWvmgJ 84wVnlyojfbDQsX8LDETa6+f72uVEoOHW3NoU30XslK84j15K0n5rqWnYu02hJVxHaHHh0 Q7wHFNrT6y3L1Q8nlcHBZSjWhm1Ssd9v2ygaQTkfVI8DqseYzxyQEZn0Y0QgM7Zxs8yWAz A5Wr6oJKMlGzo6Ey0TQntDcqTOejBAxXtAfA+TMEM79PvQoOSeS0DZ5F+p5PQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644122516; a=rsa-sha256; cv=none; b=YyHZvLrC++rGvwR84vQyYp8NVqN/QYjFGxSqPCVpdQUwsin3wfryBX/zGpbJPTGW5tU/k2 sNccE2fsIU0IUn38RHLitU0qd53nkJrp78Xoa+CqdEMyznbjlca+PZy1ysRRqF8ZLzYONG SJNl9K22DXmBvIU4ThAvP8NClHjm94liNxhkscwhZgU9mdVAujiIhANyyB0IYpZHOJjiBy D4OoaHID2GspZVfY3cxYIMw+U7wUktDXnhk1AVyuQGFZSIgGAW23JsX61VM4DJu2XXWSCp 3vLs9ySH/f1D2DHXNNkGYHKMNJDuhApoybM334sjqtgK20GsmSFTv7vooPdd5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=0e170396da4d35288e9e05f68c56c295934c82fc commit 0e170396da4d35288e9e05f68c56c295934c82fc Author: Greg Lewis AuthorDate: 2022-02-06 04:40:37 +0000 Commit: Greg Lewis CommitDate: 2022-02-06 04:41:37 +0000 java/openjdk15: Update to 15.0.6 GA --- java/openjdk15/Makefile | 2 +- java/openjdk15/distinfo | 6 +++--- .../files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java/openjdk15/Makefile b/java/openjdk15/Makefile index 1859b88a5931..28e44f2ea369 100644 --- a/java/openjdk15/Makefile +++ b/java/openjdk15/Makefile @@ -57,7 +57,7 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 15 JDK_MINOR_VERSION= 0 JDK_PATCH_VERSION= 6 -JDK_BUILD_NUMBER= 1 +JDK_BUILD_NUMBER= 5 BSD_JDK_VERSION= 1 JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20 diff --git a/java/openjdk15/distinfo b/java/openjdk15/distinfo index 4c2e32f782be..a55b9da6e523 100644 --- a/java/openjdk15/distinfo +++ b/java/openjdk15/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635922805 -SHA256 (battleblow-jdk15u-jdk-15.0.6+1-1_GH0.tar.gz) = e87ef52034ffa679c4b6c6dc7b8ef4992b7309e3701a1ffed95926b5ab167ace -SIZE (battleblow-jdk15u-jdk-15.0.6+1-1_GH0.tar.gz) = 102073958 +TIMESTAMP = 1644121085 +SHA256 (battleblow-jdk15u-jdk-15.0.6+5-1_GH0.tar.gz) = a84430a4188fdbc52c767c5e5140838d26a37721237252cc2c4f6a7686bcde55 +SIZE (battleblow-jdk15u-jdk-15.0.6+5-1_GH0.tar.gz) = 102201140 diff --git a/java/openjdk15/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk b/java/openjdk15/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk index 017b205eb0b3..9e493b64a97f 100644 --- a/java/openjdk15/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk +++ b/java/openjdk15/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk @@ -1,11 +1,11 @@ --- make/modules/java.desktop/lib/Awt2dLibraries.gmk.orig 2020-07-08 21:33:08 UTC +++ make/modules/java.desktop/lib/Awt2dLibraries.gmk -@@ -631,7 +631,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \ +@@ -540,7 +540,7 @@ LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ LDFLAGS_aix := -Wl$(COMMA)-berok, \ LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ - LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ + LIBS_unix := -lfontconfig -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ - LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation \ - -framework CoreGraphics, \ + LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation -framework CoreGraphics, \ LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ + $(WIN_AWT_LIB), \