Port misc/gnomesword does not configure due to old dependencies. Even with these dependencies fixed with the latest libraries available, the port will not build because of changes to libgtkhtml. Fix: I haven't done this before, so here goes. This is a tar file of the contents of the misc/gnomesword/files directory: patch-Makefile.in000644 000000 000000 00000002004 10112044014 014276 0ustar00rootwheel000000 000000 --- Makefile.in.orig Wed Jul 14 23:34:10 2004 +++ Makefile.in Sat Aug 21 16:34:24 2004 @@ -61,7 +61,7 @@ install-recursive installcheck-recursive installdirs-recursive \ pdf-recursive ps-recursive uninstall-info-recursive \ uninstall-recursive -am__installdirs = "$(DESTDIR)$(gnomemenudir)" "$(DESTDIR)$(gnomesworddocdir)" +am__installdirs = "$(DESTDIR)$(gnomemenudir)" gnomemenuDATA_INSTALL = $(INSTALL_DATA) gnomesworddocDATA_INSTALL = $(INSTALL_DATA) DATA = $(gnomemenu_DATA) $(gnomesworddoc_DATA) @@ -627,7 +627,7 @@ all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(gnomemenudir)" "$(DESTDIR)$(gnomesworddocdir)"; do \ + for dir in "$(DESTDIR)$(gnomemenudir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive @@ -674,8 +674,7 @@ info-am: -install-data-am: install-data-local install-gnomemenuDATA \ - install-gnomesworddocDATA +install-data-am: install-data-local install-gnomemenuDATA install-exec-am: patch-configure000644 000000 000000 00000005571 10205437703 014167 0ustar00rootwheel000000 000000 --- configure.orig Wed Jul 14 09:34:14 2004 +++ configure Thu Feb 17 15:43:03 2005 @@ -2033,35 +2033,35 @@ echo "*** to the full path to pkg-config." echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword" >&5 -echo $ECHO_N "checking for libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.1 gal-2.2 libxml-2.0 sword" >&5 +echo $ECHO_N "checking for libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.1 gal-2.2 libxml-2.0 sword... $ECHO_C" >&6 - if $PKG_CONFIG --exists "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword" ; then + if $PKG_CONFIG --exists "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.1 gal-2.2 libxml-2.0 sword" ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 succeeded=yes echo "$as_me:$LINENO: checking GNOME_CFLAGS" >&5 echo $ECHO_N "checking GNOME_CFLAGS... $ECHO_C" >&6 - GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword"` + GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.1 gal-2.2 libxml-2.0 sword"` echo "$as_me:$LINENO: result: $GNOME_CFLAGS" >&5 echo "${ECHO_T}$GNOME_CFLAGS" >&6 echo "$as_me:$LINENO: checking GNOME_LIBS" >&5 echo $ECHO_N "checking GNOME_LIBS... $ECHO_C" >&6 - GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword"` + GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.1 gal-2.2 libxml-2.0 sword"` echo "$as_me:$LINENO: result: $GNOME_LIBS" >&5 echo "${ECHO_T}$GNOME_LIBS" >&6 else GNOME_CFLAGS="" GNOME_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword"` + GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.1 gal-2.2 libxml-2.0 sword"` fi @@ -23854,13 +23854,13 @@ fi packagedatadir=share/${PACKAGE} packagedocdir=share/doc/${PACKAGE} -packagepixmapsdir=share/pixmaps/${PACKAGE} +packagepixmapsdir=share/gnome/pixmaps/${PACKAGE} packagehelpdir=share/gnome/help/${PACKAGE} -packagemenudir=share/applications +packagemenudir=share/gnome/applications NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}" PACKAGE_DATA_DIR="${packageprefix}/${packagedatadir}" patch-src::gnome2::editor_menu.c000644 000000 000000 00000002636 10205204061 017115 0ustar00rootwheel000000 000000 --- src/gnome2/editor_menu.c.origFri Apr 2 17:28:07 2004 +++ src/gnome2/editor_menu.c Mon Feb 14 15:08:42 2005 @@ -29,11 +29,11 @@ #include <gtkhtml/htmlform.h> #include <gtkhtml/htmlenums.h> #include <gtkhtml/htmlsettings.h> #include <gtkhtml/htmlcolor.h> #include <gtkhtml/htmlcolorset.h> -#include <gtkhtml/htmllinktext.h> +//#include <gtkhtml/htmllinktext.h> #include <gtkhtml/htmlengine-edit.h> #include <gtkhtml/htmlengine-edit-fontstyle.h> #include <gtkhtml/htmlengine-edit-cut-and-paste.h> #include <gtkhtml/htmlselection.h> #include <gtkhtml/htmlengine-search.h> @@ -491,17 +491,33 @@ target = strchr(url, '#'); url_copy = target ? g_strndup(url, target - url) : g_strdup(url); new_link = + html_text_new(text, + GTK_HTML_FONT_STYLE_DEFAULT, + html_colorset_get_color(e-> + settings-> + color_set, + HTMLLinkColor)); + new_link = + html_object_set_link(new_link, + html_colorset_get_color(e-> + settings-> + color_set, + HTMLLinkColor), + url_copy, target); +/* + new_link = html_link_text_new(text, GTK_HTML_FONT_STYLE_DEFAULT, html_colorset_get_color(e-> settings-> color_set, HTMLLinkColor), url_copy, target); +*/ html_engine_paste_object(e, new_link, g_utf8_strlen(text, -1)); g_free(url_copy); } } patch-src::gnome2::mod_mgr.c000644 000000 000000 00000000567 10111773013 016234 0ustar00rootwheel000000 000000 --- src/gnome2/mod_mgr.c.orig Sun Mar 28 04:39:23 2004 +++ src/gnome2/mod_mgr.c Sat Aug 21 15:56:12 2004 @@ -1910,8 +1910,7 @@ GtkTreeModel *model; GError *error = NULL; - GtkTooltips *tooltips; - tooltips = gtk_tooltips_new(); + GtkTooltips *tooltips = gtk_tooltips_new(); GString *str = g_string_new(NULL); GtkCellRenderer *renderer; GtkTreeViewColumn *column; patch-src::gnome2::note_editor.c000644 000000 000000 00000002622 10205204105 017110 0ustar00rootwheel000000 000000 --- src/gnome2/note_editor.c.origThu May 6 19:10:00 2004 +++ src/gnome2/note_editor.c Mon Feb 14 15:12:22 2005 @@ -29,11 +29,11 @@ #include <gtkhtml/htmlform.h> #include <gtkhtml/htmlenums.h> #include <gtkhtml/htmlsettings.h> #include <gtkhtml/htmlcolor.h> #include <gtkhtml/htmlcolorset.h> -#include <gtkhtml/htmllinktext.h> +//#include <gtkhtml/htmllinktext.h> #include <gtkhtml/htmlengine-edit.h> #include <gtkhtml/htmlengine-edit-fontstyle.h> #include <gtkhtml/htmlengine-edit-cut-and-paste.h> #include <gtkhtml/htmlselection.h> #include <gtkhtml/htmlengine-search.h> @@ -1185,17 +1185,33 @@ target = strchr(url, '#'); url_copy = target ? g_strndup(url, target - url) : g_strdup(url); new_link = + html_text_new(text, + GTK_HTML_FONT_STYLE_DEFAULT, + html_colorset_get_color(e-> + settings-> + color_set, + HTMLLinkColor)); + new_link = + html_object_set_link(new_link, + html_colorset_get_color(e-> + settings-> + color_set, + HTMLLinkColor), + url_copy, target); +/* + new_link = html_link_text_new(text, GTK_HTML_FONT_STYLE_DEFAULT, html_colorset_get_color(e-> settings-> color_set, HTMLLinkColor), url_copy, target); +*/ html_engine_paste_object(e, new_link, g_utf8_strlen(text, -1)); g_free(url_copy); } } patch-src::gnome2::note_toolbar_style.c000644 000000 000000 00000001052 10205204127 020504 0ustar00rootwheel000000 000000 --- src/gnome2/note_toolbar_style.c.orig Thu Apr 22 14:12:43 2004 +++ src/gnome2/note_toolbar_style.c Mon Feb 14 15:20:54 2005 @@ -469,11 +469,12 @@ DIALOG_DATA * d) { GSHTMLEditorControlData *cd = d->editor; color_combo_set_color(COLOR_COMBO(cd->combo), &html_colorset_get_color_allocated - (html->engine->painter, + (cd->html->engine->settings->color_set, + html->engine->painter, HTMLTextColor)->color); } /****************************************************************************** patch-src::gnome2::tabbed_browser.c000644 000000 000000 00000001310 10111773013 017557 0ustar00rootwheel000000 000000 --- src/gnome2/tabbed_browser.c.orig Thu Jun 17 04:53:24 2004 +++ src/gnome2/tabbed_browser.c Sat Aug 21 15:59:13 2004 @@ -664,11 +664,13 @@ */ void gui_close_passage_tab(gint pagenum) { + PASSAGE_TAB_INFO *pt; + if (-1 == pagenum) pagenum = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets.notebook_main)); if (1 == gtk_notebook_get_n_pages(GTK_NOTEBOOK(widgets.notebook_main))) return; - PASSAGE_TAB_INFO *pt = (PASSAGE_TAB_INFO*)g_list_nth_data(passage_list, (guint)pagenum); + pt = (PASSAGE_TAB_INFO*)g_list_nth_data(passage_list, (guint)pagenum); passage_list = g_list_remove(passage_list, pt); if(pt->text_mod) g_free(pt->text_mod); if(pt->commentary_mod) g_free(pt->commentary_mod); patch-src::gnome2::toolbar_style.c000644 000000 000000 00000001057 10205204143 017462 0ustar00rootwheel000000 000000 --- src/gnome2/toolbar_style.c.origThu Apr 22 14:12:43 2004 +++ src/gnome2/toolbar_style.c Mon Feb 14 15:23:28 2005 @@ -460,11 +460,12 @@ static void set_color_combo(GtkHTML * html, GSHTMLEditorControlData * cd) { color_combo_set_color(COLOR_COMBO(cd->combo), &html_colorset_get_color_allocated - (html->engine->painter, + (cd->html->engine->settings->color_set, + html->engine->painter, HTMLTextColor)->color); } /****************************************************************************** How-To-Repeat: Try to run make the misc/gnomesword port
State Changed From-To: open->feedback Please, resend the update as unified diff between old and new port directories. For details refer to Porter's Handbook.
Responsible Changed From-To: freebsd-ports-bugs->pav Follow
State Changed From-To: feedback->closed Committed, thanks!