ports/85590: update: fix compiling for java/eclipse

Thu Sep 1 21:20:19 UTC 2005

>Number:         85590
>Category:       ports
>Synopsis:       update: fix compiling for java/eclipse
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 01 21:20:18 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Panagiotis Astithas
>Release:        FreeBSD 6.0-BETA3 i386
>Organization:
EBS Ltd. 
>Environment:


System: FreeBSD 6.0-BETA3 #3: Mon Aug 29 23:00:09 EEST 2005
    past at ajax.ebs.gr:/usr/obj/usr/src/sys/GENERIC



>Description:


This patch fixes compilation of java/eclipse after the recent nspr split from mozilla/firefox. It also drops an unnecessary patch.


>How-To-Repeat:


Try to compile eclipse against a current ports tree.


>Fix:

--- eclipse.patch begins here ---
diff -ruN /usr/ports/java/eclipse/Makefile eclipse/Makefile
--- /usr/ports/java/eclipse/Makefile	Sun Aug 28 18:29:49 2005
+++ eclipse/Makefile	Tue Aug 30 13:07:54 2005
@@ -107,8 +107,6 @@
 	  ${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 -ruN /usr/ports/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh eclipse/files/manualpatch-plugins-swt-gtk-build.sh
--- /usr/ports/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh	Sun Jul 31 08:26:15 2005
+++ eclipse/files/manualpatch-plugins-swt-gtk-build.sh	Thu Sep  1 21:44:31 2005
@@ -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 -ruN /usr/ports/java/eclipse/files/manualpatch-plugins-swt-gtk-os_custom.h eclipse/files/manualpatch-plugins-swt-gtk-os_custom.h
--- /usr/ports/java/eclipse/files/manualpatch-plugins-swt-gtk-os_custom.h	Sun Jul 31 08:26:15 2005
+++ eclipse/files/manualpatch-plugins-swt-gtk-os_custom.h	Thu Jan  1 02:00:00 1970
@@ -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
--- eclipse.patch ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:

