From owner-svn-ports-all@FreeBSD.ORG Sat Aug 17 17:37:04 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B5263A58; Sat, 17 Aug 2013 17:37:04 +0000 (UTC) (envelope-from gnn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 89FC522EE; Sat, 17 Aug 2013 17:37:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7HHb4aS040486; Sat, 17 Aug 2013 17:37:04 GMT (envelope-from gnn@svn.freebsd.org) Received: (from gnn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7HHb4qY040484; Sat, 17 Aug 2013 17:37:04 GMT (envelope-from gnn@svn.freebsd.org) Message-Id: <201308171737.r7HHb4qY040484@svn.freebsd.org> From: "George V. Neville-Neil" Date: Sat, 17 Aug 2013 17:37:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324860 - in head/java/eclipse-devel: . 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-all@freebsd.org X-Mailman-Version: 2.1.14 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: Sat, 17 Aug 2013 17:37:04 -0000 Author: gnn (src,doc committer) Date: Sat Aug 17 17:37:03 2013 New Revision: 324860 URL: http://svnweb.freebsd.org/changeset/ports/324860 Log: Apply a patch for a bug that effects the Keys preference, wherein switching to and from Emacs and Default keybindings pollutes both sets with duplicates. Bump the port revision. Added: head/java/eclipse-devel/files/BindingModel.java.patch (contents, props changed) Modified: head/java/eclipse-devel/Makefile Modified: head/java/eclipse-devel/Makefile ============================================================================== --- head/java/eclipse-devel/Makefile Sat Aug 17 17:19:06 2013 (r324859) +++ head/java/eclipse-devel/Makefile Sat Aug 17 17:37:03 2013 (r324860) @@ -3,7 +3,7 @@ PORTNAME= eclipse-devel PORTVERSION= 4.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java devel MASTER_SITES= http://download.eclipse.org/technology/linuxtools/eclipse-build/4.2.x/:1 \ http://download.eclipse.org/tools/orbit/downloads/drops/R20120119162704/repository/plugins/:2 \ @@ -273,6 +273,11 @@ post-patch: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyTestPatches) .endif +pre-build: + @${CP} ${BUILD_WRKSRC}/build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.ui.workbench/Eclipse\ UI/org/eclipse/ui/internal/keys/model/BindingModel.java ${PATCHDIR} + @${PATCH} -d ${PATCHDIR} -E -p0 -i ${PATCHDIR}/BindingModel.java.patch + @${CP} ${PATCHDIR}/BindingModel.java ${BUILD_WRKSRC}/build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.ui.workbench/Eclipse\ UI/org/eclipse/ui/internal/keys/model/BindingModel.java + do-install: @${RM} -rf ${PORTDESTDIR} @${MKDIR} ${PORTDESTDIR} Added: head/java/eclipse-devel/files/BindingModel.java.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/eclipse-devel/files/BindingModel.java.patch Sat Aug 17 17:37:03 2013 (r324860) @@ -0,0 +1,14 @@ +--- BindingModel.java 2013-08-13 13:47:55.000000000 -0400 ++++ BindingModel.java 2013-08-13 13:48:48.000000000 -0400 +@@ -237,7 +237,10 @@ + if (obj instanceof Binding) { + Binding b = (Binding) obj; + if (!activeManagerBindings.contains(b)) { +- be.fill(b.getParameterizedCommand()); ++ ParameterizedCommand cmd = b.getParameterizedCommand(); ++ if (cmd != null) { ++ commandToElement.remove(cmd); ++ } + bindingToElement.remove(b); + i.remove(); + controller.firePropertyChange(this, PROP_BINDING_REMOVE,