From owner-svn-ports-head@freebsd.org Sat Feb 11 21:28:04 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B1778CDA845; Sat, 11 Feb 2017 21:28:04 +0000 (UTC) (envelope-from bapt@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 mx1.freebsd.org (Postfix) with ESMTPS id 726B4157C; Sat, 11 Feb 2017 21:28:04 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1BLS3ks079392; Sat, 11 Feb 2017 21:28:03 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1BLS3mq079390; Sat, 11 Feb 2017 21:28:03 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201702112128.v1BLS3mq079390@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 11 Feb 2017 21:28:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433916 - head/java/jlint/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2017 21:28:04 -0000 Author: bapt Date: Sat Feb 11 21:28:03 2017 New Revision: 433916 URL: https://svnweb.freebsd.org/changeset/ports/433916 Log: Actually add the patch Reported by: antoine Added: head/java/jlint/files/patch-jlint.cc (contents, props changed) head/java/jlint/files/patch-method__desc.cc (contents, props changed) head/java/jlint/files/patch-method__desc.hh (contents, props changed) Added: head/java/jlint/files/patch-jlint.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/jlint/files/patch-jlint.cc Sat Feb 11 21:28:03 2017 (r433916) @@ -0,0 +1,31 @@ +--- jlint.cc.orig 2011-01-11 02:42:33 UTC ++++ jlint.cc +@@ -41,7 +41,7 @@ bool source_path_redefined = false; + int reported_message_mask = cat_all; + FILE* history; + string_pool stringPool; +-field_desc* is_const; ++field_desc* jlint_is_const; + + message_descriptor msg_table[] = + { +@@ -401,8 +401,8 @@ bool parse_class_file(byte* fp) + is_this->equals = is_this; + is_this->cls = this_class; + +- // init. is_const +- field_desc* is_const = new field_desc(utf_string(""), NULL, NULL); ++ // init. jlint_is_const ++ field_desc* jlint_is_const = new field_desc(utf_string(""), NULL, NULL); + + this_class->attr = access_flags; + if (super_class_name == 0) { // Object class +@@ -627,7 +627,7 @@ bool parse_class_file(byte* fp) + delete[] constant_pool; + delete is_this->name_and_type; + //delete is_this; +- delete is_const; ++ delete jlint_is_const; + + monitor_stack::const_iterator it; + for (it = this_class->usedLocks.begin(); Added: head/java/jlint/files/patch-method__desc.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/jlint/files/patch-method__desc.cc Sat Feb 11 21:28:03 2017 (r433916) @@ -0,0 +1,20 @@ +--- method_desc.cc.orig 2003-06-09 09:29:14 UTC ++++ method_desc.cc +@@ -767,7 +767,7 @@ void method_desc::parse_code(constant** + sp->mask = var_desc::vs_not_null; + } + sp->index = NO_ASSOC_VAR; +- sp->equals = is_const; ++ sp->equals = jlint_is_const; + sp += 1; + } + break; +@@ -2381,7 +2381,7 @@ void method_desc::parse_code(constant** + aux->name_and_type = nt; + sp->equals = aux; + equal_descs.push_back(aux);*/ +- sp->equals = is_const; ++ sp->equals = jlint_is_const; + } + } + field->equals = sp->equals; Added: head/java/jlint/files/patch-method__desc.hh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/jlint/files/patch-method__desc.hh Sat Feb 11 21:28:03 2017 (r433916) @@ -0,0 +1,9 @@ +--- method_desc.hh.orig 2001-02-09 23:40:33 UTC ++++ method_desc.hh +@@ -147,5 +147,5 @@ private: + + const char* compound_name(const char* first, const char* second); + extern string_pool stringPool; // declared in jlint.cc +-extern field_desc* is_const; ++extern field_desc* jlint_is_const; + #endif