From owner-svn-ports-all@freebsd.org Mon Jun 3 16:01:50 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2E93115B57D0; Mon, 3 Jun 2019 16:01:50 +0000 (UTC) (envelope-from swills@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C7C6D87E97; Mon, 3 Jun 2019 16:01:49 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A041985F0; Mon, 3 Jun 2019 16:01:49 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x53G1na8093158; Mon, 3 Jun 2019 16:01:49 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x53G1n6o093157; Mon, 3 Jun 2019 16:01:49 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201906031601.x53G1n6o093157@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Mon, 3 Jun 2019 16:01:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r503400 - head/java/openjdk7/files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: head/java/openjdk7/files X-SVN-Commit-Revision: 503400 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C7C6D87E97 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.969,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jun 2019 16:01:50 -0000 Author: swills Date: Mon Jun 3 16:01:49 2019 New Revision: 503400 URL: https://svnweb.freebsd.org/changeset/ports/503400 Log: java/openjdk7: fix build with freetype2 2.10.0 PR: 238225 Added: head/java/openjdk7/files/patch-jdk_make_tools_freetypecheck_freetypecheck.c (contents, props changed) Added: head/java/openjdk7/files/patch-jdk_make_tools_freetypecheck_freetypecheck.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk7/files/patch-jdk_make_tools_freetypecheck_freetypecheck.c Mon Jun 3 16:01:49 2019 (r503400) @@ -0,0 +1,78 @@ +--- ./jdk/make/tools/freetypecheck/freetypecheck.c.orig 2013-09-06 14:27:43.000000000 -0400 ++++ ./jdk/make/tools/freetypecheck/freetypecheck.c 2019-05-29 18:16:30.696642000 -0400 +@@ -74,26 +74,65 @@ + #define QUOTEMACRO(x) QUOTEME(x) + #define QUOTEME(x) #x + ++int compare_versions(FT_Int req_major, FT_Int req_minor, FT_Int req_patch, ++ FT_Int major, FT_Int minor, FT_Int patch) { ++ if (major > req_major) { ++ printf("Major version %d greater than required major version %d\n", ++ major, req_major); ++ return 0; ++ } ++ if (major < req_major) { ++ printf("Major version %d less than required major version %d\n", ++ major, req_major); ++ return -1; ++ } ++ printf("Major version %d equal to required major version %d\n", ++ major, req_major); ++ if (minor > req_minor) { ++ printf("Minor version %d greater than required minor version %d\n", ++ minor, req_minor); ++ return 0; ++ } ++ if (minor < req_minor) { ++ printf("Minor version %d less than required minor version %d\n", ++ minor, req_minor); ++ return -2; ++ } ++ printf("Minor version %d equal to required minor version %d\n", ++ minor, req_minor); ++ if (patch >= req_patch) { ++ printf("Patch version %d greater than or equal to required patch version %d\n", ++ patch, req_patch); ++ return 0; ++ } ++ printf("Patch version %d less than required patch version %d\n", ++ patch, req_patch); ++ return -3; ++} ++ + int main(int argc, char** argv) { +- char v[50]; +- FT_Int major, minor, patch; ++ FT_Int major, minor, patch, req_major, req_minor, req_patch; + FT_Library library; +- sprintf(v, "%d.%d.%d", FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH); + +- printf("Required version of freetype: %s\n", +- QUOTEMACRO(REQUIRED_FREETYPE_VERSION)); ++ sscanf(QUOTEMACRO(REQUIRED_FREETYPE_VERSION), ++ "%d.%d.%d", &req_major, &req_minor, &req_patch); ++ printf("Required version of freetype: %d.%d.%d\n", ++ req_major, req_minor, req_patch); + +- printf("Detected freetype headers: %s\n", v); +- if (strcmp(v, QUOTEMACRO(REQUIRED_FREETYPE_VERSION)) < 0) { ++ printf("Detected freetype headers: %d.%d.%d\n", ++ FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH); ++ if (compare_versions(req_major, req_minor, req_patch, ++ FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH) < 0) { + printf("Failed: headers are too old.\n"); + } + + FT_Init_FreeType(&library); + FT_Library_Version(library, &major, &minor, &patch); +- sprintf(v, "%d.%d.%d", major, minor, patch); + +- printf("Detected freetype library: %s\n", v); +- if (strcmp(v, QUOTEMACRO(REQUIRED_FREETYPE_VERSION)) < 0) { ++ printf("Detected freetype library: %d.%d.%d\n", ++ major, minor, patch); ++ if (compare_versions(req_major, req_minor, req_patch, ++ major, minor, patch) < 0) { + printf("Failed: too old library.\n"); + } +