freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Greg Lewis
2005-09-08 18:11:41 +00:00
parent 93b6d16f71
commit 1aa9870884
3 changed files with 2 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/eclipse/Makefile
View File

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

4
java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh
View File

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

59
java/eclipse/files/manualpatch-plugins-swt-gtk-os_custom.h
View File

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