1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-11 07:22:22 +00:00

. Fix a crash caused by the "Open File" dialogue.

Submitted by:	Pieter de Goeje <pieter@degoeje.nl>
This commit is contained in:
Greg Lewis 2008-02-22 15:52:48 +00:00
parent 8134249786
commit 4689182334
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=207756
2 changed files with 40 additions and 1 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= eclipse-devel
PORTVERSION= 3.3.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= ${MASTER_SITE_ECLIPSE}
MASTER_SITE_SUBDIR= R-${PORTVERSION}-200709211145
@ -107,6 +107,7 @@ post-patch:
@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/gtk/org/eclipse/swt/browser/MozillaDelegate.java" ${FILESDIR}/post-patch-plugins-swt-mozilla-gtk-swt-browser-MozillaDelegate.java
@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/gtk/org/eclipse/swt/internal/gtk/OS.java" ${FILESDIR}/post-patch-plugins-swt-gtk-swt-internal-gtk-OS.java
@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/gtk/library/os.c" ${FILESDIR}/post-patch-plugins-swt-gtk-library-os.c
@${PATCH} ${PATCH_DIST_ARGS} "${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java" ${FILESDIR}/post-patch-plugins-swt-gtk-swt-FileDialog.java
@${REINPLACE_CMD} -e 's|%%GECKO%%|${GECKO}|g' \
"${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh" \

View File

@ -0,0 +1,38 @@
$FreeBSD$
--- plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java.orig 2007-09-21 18:58:07.000000000 +0200
+++ plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java 2008-02-05 20:49:58.000000000 +0100
@@ -378,29 +378,29 @@
stringBuffer.append ('.');
}
byte [] buffer = Converter.wcsToMbcs (null, stringBuffer.toString (), true);
+ byte [] bufspc = new byte[1024];
/*
* Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6
* when setting a file name that is not a true canonical path.
* The fix is to use the canonical path.
*/
- int /*long*/ ptr = OS.realpath (buffer, null);
+ int /*long*/ ptr = OS.realpath (buffer, bufspc);
if (ptr != 0) {
OS.gtk_file_chooser_set_filename (handle, ptr);
- OS.g_free (ptr);
}
} else {
if (fileName.length () > 0) {
if (fileName.charAt (0) == SEPARATOR) {
byte [] buffer = Converter.wcsToMbcs (null, fileName, true);
+ byte [] bufspc = new byte[1024];
/*
* Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6
* when setting a file name that is not a true canonical path.
* The fix is to use the canonical path.
*/
- int /*long*/ ptr = OS.realpath (buffer, null);
+ int /*long*/ ptr = OS.realpath (buffer, bufspc);
if (ptr != 0) {
OS.gtk_file_chooser_set_filename (handle, ptr);
- OS.g_free (ptr);
}
}
}