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
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}
--- 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,
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-eclipse
To unsubscribe, send any mail to "[email protected]"
