1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00

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.
This commit is contained in:
George V. Neville-Neil 2013-08-17 17:37:03 +00:00
parent fc05dacb45
commit e19c8e6620
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=324860
2 changed files with 20 additions and 1 deletions

View File

@ -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}

View File

@ -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,