kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Unbreak

Browse source 
- Take maintainership

PR:		ports/77688
Submitted by:	Danny Boudrot <dboudrot@yahoo.com>
This commit is contained in:
Pav Lucistnik 2005-02-20 23:29:31 +00:00
parent 4313297a0c
commit 94724992e3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=129426
14 changed files with 390 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
misc/gnomesword/Makefile
View file

@ -7,25 +7,21 @@
PORTNAME= gnomesword
PORTVERSION= 2.1.1
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
MAINTAINER= dboudrot@yahoo.com
COMMENT= A bible interface utilizing the sword framework
BROKEN= Configure fails
EXPIRATION_DATE=2005-02-18
DEPRECATED= ${BROKEN}
BUILD_DEPENDS= ${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnomespell
LIB_DEPENDS= sword.4:${PORTSDIR}/misc/sword
RUN_DEPENDS= ${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnomespell
USE_X_PREFIX= yes
INSTALLS_OMF= yes
USE_GNOME= gnomehack gnomeprefix gnometarget gtkhtml3 intlhack
USE_GNOME= gnomehack gnomeprefix gnometarget gal2 gtkhtml3 intlhack
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes

60
misc/gnomesword/files/patch-configure Normal file
View file

@ -0,0 +1,60 @@
--- 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}"

49
misc/gnomesword/files/patch-src::gnome2::editor_menu.c Normal file
View file

@ -0,0 +1,49 @@
--- src/gnome2/editor_menu.c.orig Fri 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);
}
}

49
misc/gnomesword/files/patch-src::gnome2::note_editor.c Normal file
View file

@ -0,0 +1,49 @@
--- src/gnome2/note_editor.c.orig Thu 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);
}
}

16
misc/gnomesword/files/patch-src::gnome2::note_toolbar_style.c Normal file
View file

@ -0,0 +1,16 @@
--- 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);
}
/******************************************************************************

16
misc/gnomesword/files/patch-src::gnome2::toolbar_style.c Normal file
View file

@ -0,0 +1,16 @@
--- src/gnome2/toolbar_style.c.orig Thu 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);
}
/******************************************************************************

2
misc/gnomesword/pkg-plist
View file

@ -63,4 +63,6 @@ share/locale/uk/LC_MESSAGES/gnomesword.mo
@dirrm share/gnome/help/gnomesword/C/figures
@dirrm share/gnome/help/gnomesword/C
@dirrm share/gnome/help/gnomesword
@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
%%PORTDOCS%%@dirrm %%DOCSDIR%%

10
misc/xiphos/Makefile
View file

@ -7,25 +7,21 @@
PORTNAME= gnomesword
PORTVERSION= 2.1.1
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
MAINTAINER= dboudrot@yahoo.com
COMMENT= A bible interface utilizing the sword framework
BROKEN= Configure fails
EXPIRATION_DATE=2005-02-18
DEPRECATED= ${BROKEN}
BUILD_DEPENDS= ${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnomespell
LIB_DEPENDS= sword.4:${PORTSDIR}/misc/sword
RUN_DEPENDS= ${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnomespell
USE_X_PREFIX= yes
INSTALLS_OMF= yes
USE_GNOME= gnomehack gnomeprefix gnometarget gtkhtml3 intlhack
USE_GNOME= gnomehack gnomeprefix gnometarget gal2 gtkhtml3 intlhack
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes

60
misc/xiphos/files/patch-configure Normal file
View file

@ -0,0 +1,60 @@
--- 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}"

49
misc/xiphos/files/patch-src::gnome2::editor_menu.c Normal file
View file

@ -0,0 +1,49 @@
--- src/gnome2/editor_menu.c.orig Fri 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);
}
}

49
misc/xiphos/files/patch-src::gnome2::note_editor.c Normal file
View file

@ -0,0 +1,49 @@
--- src/gnome2/note_editor.c.orig Thu 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);
}
}

16
misc/xiphos/files/patch-src::gnome2::note_toolbar_style.c Normal file
View file

@ -0,0 +1,16 @@
--- 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);
}
/******************************************************************************

16
misc/xiphos/files/patch-src::gnome2::toolbar_style.c Normal file
View file

@ -0,0 +1,16 @@
--- src/gnome2/toolbar_style.c.orig Thu 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);
}
/******************************************************************************

2
misc/xiphos/pkg-plist
View file

@ -63,4 +63,6 @@ share/locale/uk/LC_MESSAGES/gnomesword.mo
@dirrm share/gnome/help/gnomesword/C/figures
@dirrm share/gnome/help/gnomesword/C
@dirrm share/gnome/help/gnomesword
@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
%%PORTDOCS%%@dirrm %%DOCSDIR%%