diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-11-20 14:19:40 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-11-20 14:19:40 +0000 |
commit | 41b2e22b6ba9430ae7bf31cc1daa968836ebc355 (patch) | |
tree | ea10deca76b24909aa7aa15d144cb015705d894c /www/gtkhtml | |
parent | Update to 0.18.1. (diff) |
Update to 0.16.1.
Notes
Notes:
svn path=/head/; revision=50260
Diffstat (limited to 'www/gtkhtml')
-rw-r--r-- | www/gtkhtml/Makefile | 5 | ||||
-rw-r--r-- | www/gtkhtml/distinfo | 2 | ||||
-rw-r--r-- | www/gtkhtml/files/patch-ltmain.sh | 28 | ||||
-rw-r--r-- | www/gtkhtml/files/patch-src::gtkhtml-properties.c | 125 | ||||
-rw-r--r-- | www/gtkhtml/pkg-plist | 11 |
5 files changed, 159 insertions, 12 deletions
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile index 3dc654e29307..79a892b26fdd 100644 --- a/www/gtkhtml/Makefile +++ b/www/gtkhtml/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gtkhtml -PORTVERSION= 0.16.0 +PORTVERSION= 0.16.1 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gtkhtml @@ -21,11 +21,12 @@ LIB_DEPENDS= glibwww.1:${PORTSDIR}/www/glibwww \ USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOMECTRL= yes -USE_LIBTOOL= yes INSTALLS_SHLIB= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gconf=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" +CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/www/gtkhtml/distinfo b/www/gtkhtml/distinfo index f6363d0d4117..d7a861cecc77 100644 --- a/www/gtkhtml/distinfo +++ b/www/gtkhtml/distinfo @@ -1 +1 @@ -MD5 (gtkhtml-0.16.0.tar.gz) = 84b37ebe459b5af00b79c1fbae0590fe +MD5 (gtkhtml-0.16.1.tar.gz) = da85f8d2f46db669c4b3e8b0eefdd882 diff --git a/www/gtkhtml/files/patch-ltmain.sh b/www/gtkhtml/files/patch-ltmain.sh new file mode 100644 index 000000000000..98cb05e4ddb3 --- /dev/null +++ b/www/gtkhtml/files/patch-ltmain.sh @@ -0,0 +1,28 @@ + +$FreeBSD$ + +--- ltmain.sh 2001/08/27 09:51:26 1.1 ++++ ltmain.sh 2001/08/27 09:51:42 +@@ -2408,6 +2408,9 @@ + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then +@@ -4175,10 +4178,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/www/gtkhtml/files/patch-src::gtkhtml-properties.c b/www/gtkhtml/files/patch-src::gtkhtml-properties.c new file mode 100644 index 000000000000..f783c11c5904 --- /dev/null +++ b/www/gtkhtml/files/patch-src::gtkhtml-properties.c @@ -0,0 +1,125 @@ + +$FreeBSD$ + +--- src/gtkhtml-properties.c 2001/11/20 09:55:00 1.1 ++++ src/gtkhtml-properties.c 2001/11/20 09:56:37 +@@ -75,6 +75,59 @@ + g_free (p); + } + ++static gchar * ++get_font_name (const GdkFont * font) ++{ ++ Atom font_atom, atom; ++ Bool status; ++ ++ font_atom = gdk_atom_intern ("FONT", FALSE); ++ ++ if (font->type == GDK_FONT_FONTSET) { ++ XFontStruct **font_structs; ++ gint num_fonts; ++ gchar **font_names; ++ ++ num_fonts = XFontsOfFontSet (GDK_FONT_XFONT (font), &font_structs, &font_names); ++ status = XGetFontProperty (font_structs[0], font_atom, &atom); ++ } else { ++ status = XGetFontProperty (GDK_FONT_XFONT (font), font_atom, &atom); ++ } ++ ++ if (status) { ++ return gdk_atom_name (atom); ++ } ++ ++ return NULL; ++} ++ ++static void ++get_default_fonts (gchar **var_name, gchar **fix_name) ++{ ++ GtkStyle *style; ++ char *font_name = NULL; ++ ++ style = gtk_widget_get_default_style (); ++ if (style->font) { ++ font_name = get_font_name (style->font); ++ } ++ ++ if (font_name) { ++ gchar *enc1, *enc2; ++ ++ enc1 = html_font_manager_get_attr (font_name, 13); ++ enc2 = html_font_manager_get_attr (font_name, 14); ++ ++ *var_name = g_strdup_printf ("-*-helvetica-*-*-*-*-12-*-*-*-*-*-%s-%s", enc1, enc2); ++ *fix_name = g_strdup_printf ("-*-courier-*-*-*-*-12-*-*-*-*-*-%s-%s", enc1, enc2); ++ ++ /* printf ("default encoding %s-%s\n%s\n%s\n", enc1, enc2, *var_name, *fix_name); */ ++ } else { ++ *var_name = g_strdup ("-*-helvetica-*-*-*-*-12-*-*-*-*-*-*-*"); ++ *fix_name = g_strdup ("-*-courier-*-*-*-*-12-*-*-*-*-*-*-*"); ++ } ++} ++ + #ifdef GTKHTML_HAVE_GCONF + #define GET(t,x,prop,f,c) \ + key = g_strconcat (GTK_HTML_GCONF_DIR, x, NULL); \ +@@ -180,59 +233,6 @@ + #define GETS(v,s) \ + g_free (p->v); \ + GET(string,v,s) +- +-static gchar * +-get_font_name (const GdkFont * font) +-{ +- Atom font_atom, atom; +- Bool status; +- +- font_atom = gdk_atom_intern ("FONT", FALSE); +- +- if (font->type == GDK_FONT_FONTSET) { +- XFontStruct **font_structs; +- gint num_fonts; +- gchar **font_names; +- +- num_fonts = XFontsOfFontSet (GDK_FONT_XFONT (font), &font_structs, &font_names); +- status = XGetFontProperty (font_structs[0], font_atom, &atom); +- } else { +- status = XGetFontProperty (GDK_FONT_XFONT (font), font_atom, &atom); +- } +- +- if (status) { +- return gdk_atom_name (atom); +- } +- +- return NULL; +-} +- +-static void +-get_default_fonts (gchar **var_name, gchar **fix_name) +-{ +- GtkStyle *style; +- char *font_name = NULL; +- +- style = gtk_widget_get_default_style (); +- if (style->font) { +- font_name = get_font_name (style->font); +- } +- +- if (font_name) { +- gchar *enc1, *enc2; +- +- enc1 = html_font_manager_get_attr (font_name, 13); +- enc2 = html_font_manager_get_attr (font_name, 14); +- +- *var_name = g_strdup_printf ("-*-helvetica-*-*-*-*-12-*-*-*-*-*-%s-%s", enc1, enc2); +- *fix_name = g_strdup_printf ("-*-courier-*-*-*-*-12-*-*-*-*-*-%s-%s", enc1, enc2); +- +- /* printf ("default encoding %s-%s\n%s\n%s\n", enc1, enc2, *var_name, *fix_name); */ +- } else { +- *var_name = g_strdup ("-*-helvetica-*-*-*-*-12-*-*-*-*-*-*-*"); +- *fix_name = g_strdup ("-*-courier-*-*-*-*-12-*-*-*-*-*-*-*"); +- } +-} + + void + gtk_html_class_properties_load (GtkHTMLClassProperties *p) diff --git a/www/gtkhtml/pkg-plist b/www/gtkhtml/pkg-plist index be4ed8b268b4..4c2113398dc8 100644 --- a/www/gtkhtml/pkg-plist +++ b/www/gtkhtml/pkg-plist @@ -90,6 +90,7 @@ include/gtkhtml/htmltypes.h include/gtkhtml/htmlundo-action.h include/gtkhtml/htmlundo.h include/gtkhtml/htmlvspace.h +lib/bonobo/plugin/libstorage_http.a lib/bonobo/plugin/libstorage_http.so lib/libgtkhtml.a lib/libgtkhtml.so @@ -144,14 +145,6 @@ share/gnome/html/gtkhtml-sections.txt share/gnome/html/gtkhtml.hierarchy share/gnome/html/gtkhtml.sgml share/gnome/html/gtkhtml.types -share/gnome/html/gtkhtml/gtkhtml-gtkhtml-enums.html -share/gnome/html/gtkhtml/gtkhtml-gtkhtml-stream.html -share/gnome/html/gtkhtml/gtkhtml-gtkhtml-types.html -share/gnome/html/gtkhtml/gtkhtml-gtkhtmlembedded.html -share/gnome/html/gtkhtml/gtkhtml.html -share/gnome/html/gtkhtml/index.html -share/gnome/html/gtkhtml/license.html -share/gnome/html/gtkhtml/r27.html share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf share/gnome/oaf/GNOME_GtkHTML_Editor.oaf share/gnome/ui/GNOME_GtkHTML_Editor.xml @@ -182,9 +175,9 @@ share/locale/sl/LC_MESSAGES/gtkhtml.mo share/locale/sv/LC_MESSAGES/gtkhtml.mo share/locale/tr/LC_MESSAGES/gtkhtml.mo share/locale/uk/LC_MESSAGES/gtkhtml.mo +share/locale/zh_CN/LC_MESSAGES/gtkhtml.mo share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo @dirrm share/gnome/html/gtkhtml @dirrm share/gnome/gtkhtml/icons @dirrm share/gnome/gtkhtml -@dirrm share/gnome/control-center/capplets @dirrm include/gtkhtml |