From owner-freebsd-eclipse@FreeBSD.ORG Tue Aug 13 20:34:43 2013 Return-Path: Delivered-To: eclipse@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 5955649E for ; Tue, 13 Aug 2013 20:34:43 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from vps.hungerhost.com (vps.hungerhost.com [216.38.53.176]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2C72A2390 for ; Tue, 13 Aug 2013 20:34:42 +0000 (UTC) Received: from [209.249.190.124] (port=40880 helo=punk.neville-neil.com) by vps.hungerhost.com with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1V9LIc-00036M-Ck for eclipse@freebsd.org; Tue, 13 Aug 2013 16:34:40 -0400 Message-ID: <520A982A.8030702@neville-neil.com> Date: Tue, 13 Aug 2013 16:33:46 -0400 From: George Neville-Neil User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130806 Thunderbird/17.0.7 MIME-Version: 1.0 To: eclipse@freebsd.org Subject: Patch to fix key bindings in eclipse-devel/ X-Enigmail-Version: 1.5.1 Content-Type: multipart/mixed; boundary="------------020606040901010204000907" X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - vps.hungerhost.com X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - neville-neil.com X-Get-Message-Sender-Via: vps.hungerhost.com: authenticated_id: gnn@neville-neil.com X-BeenThere: freebsd-eclipse@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps & ports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Aug 2013 20:34:43 -0000 This is a multi-part message in MIME format. --------------020606040901010204000907 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Howdy, I would like to commit the following patches to eclipse-devel. This addresses the following bug. https://bugs.eclipse.org/bugs/show_bug.cgi?id=378684 The patch is not pretty but I'd like to apply it before we move eclipse-devel/ to eclipse so that at least the base eclipse in ports works correctly with key bindings. Best, George --------------020606040901010204000907 Content-Type: text/x-patch; name="Makefile.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="Makefile.patch" Index: Makefile =================================================================== --- Makefile (revision 324677) +++ Makefile (working copy) @@ -273,6 +273,11 @@ @(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} --------------020606040901010204000907 Content-Type: text/x-patch; name="BindingModel.java.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="BindingModel.java.patch" --- 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, --------------020606040901010204000907--