Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1578229315295930"
MIME-Version: 1.0
Date: Sun, 5 Jan 2020 13:01:55 +0000
From: "Olaf Seibert" <rhialto@netbsd.org>
Subject: CVS commit: pkgsrc/lang/openjdk11
To: pkgsrc-changes@NetBSD.org
Reply-To: rhialto@netbsd.org
Message-Id: <20200105130156.06AB0FA97@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1578229315295930
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	rhialto
Date:		Sun Jan  5 13:01:55 UTC 2020

Modified Files:
	pkgsrc/lang/openjdk11: Makefile distinfo
Added Files:
	pkgsrc/lang/openjdk11/patches:
	    patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc

Log Message:
lang/openjdk11: add patch for harfbuzz with gcc-7.

See added patch file for the longer explanation; reported upstream via
https://github.com/harfbuzz/harfbuzz/issues/2084 .


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/openjdk11/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/openjdk11/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1578229315295930
Content-Disposition: inline
Content-Length: 3857
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/openjdk11/Makefile
diff -u pkgsrc/lang/openjdk11/Makefile:1.9 pkgsrc/lang/openjdk11/Makefile:1.10
--- pkgsrc/lang/openjdk11/Makefile:1.9	Wed Dec 18 13:14:50 2019
+++ pkgsrc/lang/openjdk11/Makefile	Sun Jan  5 13:01:55 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2019/12/18 13:14:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2020/01/05 13:01:55 rhialto Exp $
 
 DISTNAME=	openjdk-jdk11u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=	openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=battleblow/}
 GITHUB_PROJECT=	openjdk-jdk11u

Index: pkgsrc/lang/openjdk11/distinfo
diff -u pkgsrc/lang/openjdk11/distinfo:1.5 pkgsrc/lang/openjdk11/distinfo:1.6
--- pkgsrc/lang/openjdk11/distinfo:1.5	Wed Dec  4 12:19:52 2019
+++ pkgsrc/lang/openjdk11/distinfo	Sun Jan  5 13:01:55 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2019/12/04 12:19:52 tnn Exp $
+$NetBSD: distinfo,v 1.6 2020/01/05 13:01:55 rhialto Exp $
 
 SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = d76599619b8bea879b8202b3efc38a82335d2e8c
 RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = a1b998e4e7edfb73ec35b0cc94895d9af16a8cd8
@@ -37,4 +37,5 @@ SHA1 (patch-src_java.base_bsd_native_lib
 SHA1 (patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.c) = 39c7afb3c36fa9557d2a660c4b4068b5684c552f
 SHA1 (patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.h) = 121357cb76b4a96c06cc2bf670579e0b27f66fc1
 SHA1 (patch-src_java.base_unix_native_libjsig_jsig.c) = 82e3a8bad9ca18478cad85ada8544712ff117459
+SHA1 (patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc) = 0a78e7e8db513ddc06a75f6e504f8ce6132b97ec
 SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = c27a058dbcc836fa5a9f979f193284a706a7c50b

Added files:

Index: pkgsrc/lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc
diff -u /dev/null pkgsrc/lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc:1.1
--- /dev/null	Sun Jan  5 13:01:55 2020
+++ pkgsrc/lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc	Sun Jan  5 13:01:55 2020
@@ -0,0 +1,34 @@
+$NetBSD: patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc,v 1.1 2020/01/05 13:01:55 rhialto Exp $
+
+Completely remove _POSIX_C_SOURCE; with g++7 it causes errors about undeclared
+symbols such as
+
+In file included from /usr/pkg/gcc7/include/c++/math.h:36:0,
+                 from /pkg_comp/obj/pkgsrc/lang/openjdk11/default/openjdk-jdk11u-jdk-11.0.5-10-1/src/java.desktop/share/native/libfontmanager/harfbuzz/hb.hh:171,
+                 from /pkg_comp/obj/pkgsrc/lang/openjdk11/default/openjdk-jdk11u-jdk-11.0.5-10-1/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc:40:
+/usr/pkg/gcc7/include/c++/cmath:1084:11: error: '::acosh' has not been declared 
+   using ::acosh;
+           ^~~~~ 
+
+Very briefly: defining _POSIX_C_SOURCE only removes features, and therefore is
+almost never the correct thing to do.
+
+Filed upstream report to harfbuzz to patch this the same way:
+https://github.com/harfbuzz/harfbuzz/issues/2084
+
+
+--- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc.orig	2019-10-16 18:31:09.000000000 +0000
++++ src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc
+@@ -30,12 +30,6 @@
+  * http://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html
+  * https://www.oracle.com/technetwork/articles/servers-storage-dev/standardheaderfiles-453865.html
+  */
+-#ifndef _POSIX_C_SOURCE
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wunused-macros"
+-#define _POSIX_C_SOURCE 200809L
+-#pragma GCC diagnostic pop
+-#endif
+ 
+ #include "hb.hh"
+ #include "hb-blob.hh"


--_----------=_1578229315295930--