. Fix compilation after the recent nspr split from mozilla/firefox.

  Although I can't reproduce this problem, it doesn't break anything
  for me and other users have independently verified it fixes the
  build for them.
. Remove an unnecessary patch.

PR:		85590
Submitted by:	Panagiotis Astithas <past@ebs.gr>

3 files changed, 2 insertions, 63 deletions

diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index 2e78b617939e..9be9a4e09891 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -107,8 +107,6 @@ post-patch:
 	  ${FILESDIR}/manualpatch-plugins-swt-gtk-make_freebsd.mak
 	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/build.sh" \
 	  ${FILESDIR}/manualpatch-plugins-swt-gtk-build.sh
-	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/os_custom.h" \
-	  ${FILESDIR}/manualpatch-plugins-swt-gtk-os_custom.h
 
 do-build:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
diff --git a/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh b/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh
index ed38417a85b6..c618b3f236be 100644
--- a/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh
+++ b/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh
@@ -9,9 +9,9 @@
 +		LD=gcc
 +		XTEST_LIB_PATH=$X11BASE/lib
 +		GECKO_I=${X11BASE}/include/${BROWSER}
-+		GECKO_INCLUDES="-I${GECKO_I} -I${GECKO_I}/nspr -I${GECKO_I}/xpcom -I${GECKO_I}/string -I${GECKO_I}/embed_base -I${GECKO_I}/embedstring"
++		GECKO_INCLUDES="-I${GECKO_I} -I${LOCALBASE}/include/nspr -I${GECKO_I}/xpcom -I${GECKO_I}/string -I${GECKO_I}/embed_base -I${GECKO_I}/embedstring"
 +		GECKO_L=${X11BASE}/lib/${BROWSER}
-+		GECKO_LIBS="-L${GECKO_L} -lxpcom -lnspr4 -lplds4 -lplc4 -lgtkembedmoz"
++		GECKO_LIBS="-L${GECKO_L} -L${LOCALBASE}/lib -lxpcom -lnspr4 -lplds4 -lplc4 -lgtkembedmoz"
 +		case $MODEL in
 +			"amd64")
 +				AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
diff --git a/java/eclipse/files/manualpatch-plugins-swt-gtk-os_custom.h b/java/eclipse/files/manualpatch-plugins-swt-gtk-os_custom.h
deleted file mode 100644
index 0e47fc2a22f4..000000000000
--- a/java/eclipse/files/manualpatch-plugins-swt-gtk-os_custom.h
+++ /dev/null
@@ -1,59 +0,0 @@
---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h.orig	Mon Jun 27 21:54:10 2005
-+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h	Thu Jul 14 20:28:19 2005
-@@ -21,31 +21,31 @@
- #define PTR_sizeof() sizeof(void *)
- 
- /* Libraries for dynamic loaded functions */
--#define gtk_file_chooser_add_filter_LIB "libgtk-x11-2.0.so.0"
--#define gtk_file_chooser_dialog_new_LIB "libgtk-x11-2.0.so.0"
--#define gtk_file_chooser_get_current_folder_LIB "libgtk-x11-2.0.so.0"
--#define gtk_file_chooser_get_filename_LIB "libgtk-x11-2.0.so.0"
--#define gtk_file_chooser_get_filenames_LIB "libgtk-x11-2.0.so.0"
--#define gtk_file_chooser_set_current_folder_LIB "libgtk-x11-2.0.so.0"
--#define gtk_file_chooser_set_current_name_LIB "libgtk-x11-2.0.so.0"
--#define gtk_file_chooser_set_extra_widget_LIB "libgtk-x11-2.0.so.0"
--#define gtk_file_chooser_set_filename_LIB "libgtk-x11-2.0.so.0"
--#define gtk_file_chooser_set_select_multiple_LIB "libgtk-x11-2.0.so.0"
--#define gtk_file_filter_add_pattern_LIB "libgtk-x11-2.0.so.0"
--#define gtk_file_filter_new_LIB "libgtk-x11-2.0.so.0"
--#define gtk_file_filter_set_name_LIB "libgtk-x11-2.0.so.0"
--#define gtk_tree_selection_get_selected_rows_LIB "libgtk-x11-2.0.so.0"
--#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.so.0"
--#define gtk_entry_set_alignment_LIB "libgtk-x11-2.0.so.0"
--#define gdk_draw_pixbuf_LIB "libgdk-x11-2.0.so.0"
--#define gdk_screen_get_default_LIB "libgdk-x11-2.0.so.0"
--#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.so.0"
--#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.so.0"
--#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.so.0"
--#define gdk_screen_get_number_LIB "libgdk-x11-2.0.so.0"
--#define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so.0"
--#define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so.0"
--#define gdk_x11_screen_get_window_manager_name_LIB "libgdk-x11-2.0.so.0"
-+#define gtk_file_chooser_add_filter_LIB "libgtk-x11-2.0.so"
-+#define gtk_file_chooser_dialog_new_LIB "libgtk-x11-2.0.so"
-+#define gtk_file_chooser_get_current_folder_LIB "libgtk-x11-2.0.so"
-+#define gtk_file_chooser_get_filename_LIB "libgtk-x11-2.0.so"
-+#define gtk_file_chooser_get_filenames_LIB "libgtk-x11-2.0.so"
-+#define gtk_file_chooser_set_current_folder_LIB "libgtk-x11-2.0.so"
-+#define gtk_file_chooser_set_current_name_LIB "libgtk-x11-2.0.so"
-+#define gtk_file_chooser_set_extra_widget_LIB "libgtk-x11-2.0.so"
-+#define gtk_file_chooser_set_filename_LIB "libgtk-x11-2.0.so"
-+#define gtk_file_chooser_set_select_multiple_LIB "libgtk-x11-2.0.so"
-+#define gtk_file_filter_add_pattern_LIB "libgtk-x11-2.0.so"
-+#define gtk_file_filter_new_LIB "libgtk-x11-2.0.so"
-+#define gtk_file_filter_set_name_LIB "libgtk-x11-2.0.so"
-+#define gtk_tree_selection_get_selected_rows_LIB "libgtk-x11-2.0.so"
-+#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.so"
-+#define gtk_entry_set_alignment_LIB "libgtk-x11-2.0.so"
-+#define gdk_draw_pixbuf_LIB "libgdk-x11-2.0.so"
-+#define gdk_screen_get_default_LIB "libgdk-x11-2.0.so"
-+#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.so"
-+#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.so"
-+#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.so"
-+#define gdk_screen_get_number_LIB "libgdk-x11-2.0.so"
-+#define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so"
-+#define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so"
-+#define gdk_x11_screen_get_window_manager_name_LIB "libgdk-x11-2.0.so"
- 
- /* Field accessors */
- #define GTK_ACCEL_LABEL_SET_ACCEL_STRING(arg0, arg1) (arg0)->accel_string = arg1