diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2022-02-06 04:40:37 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2022-02-06 04:41:37 +0000 |
| commit | 0e170396da4d35288e9e05f68c56c295934c82fc (patch) | |
| tree | 73f69de0bb72b579904ef5c5919633bf1305e642 /java | |
| parent | 5019cfd6679a33aad2c7ce3ab980dcd920269450 (diff) | |
| download | ports-0e170396da4d35288e9e05f68c56c295934c82fc.tar.gz ports-0e170396da4d35288e9e05f68c56c295934c82fc.zip | |
java/openjdk15: Update to 15.0.6 GA
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk15/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk15/distinfo | 6 | ||||
| -rw-r--r-- | java/openjdk15/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), \ |