diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-12-05 13:20:06 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-12-05 13:20:06 +0000 |
commit | 355e9dc55b70ed6644a98c638338601dcd10929a (patch) | |
tree | 4f98a22ff63b7ab4785c2efd1a693a88b5216ddf /www/gtkhtml | |
parent | Move master port to mail/emh and add support for emacs21. (diff) |
Update to 1.0.0.
Notes
Notes:
svn path=/head/; revision=51075
Diffstat (limited to 'www/gtkhtml')
-rw-r--r-- | www/gtkhtml/Makefile | 2 | ||||
-rw-r--r-- | www/gtkhtml/distinfo | 2 | ||||
-rw-r--r-- | www/gtkhtml/files/patch-aa | 11 | ||||
-rw-r--r-- | www/gtkhtml/files/patch-src::gtkhtml-properties.c | 125 | ||||
-rw-r--r-- | www/gtkhtml/pkg-plist | 2 |
5 files changed, 10 insertions, 132 deletions
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile index 79a892b26fdd..1496b103c09b 100644 --- a/www/gtkhtml/Makefile +++ b/www/gtkhtml/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gtkhtml -PORTVERSION= 0.16.1 +PORTVERSION= 1.0.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gtkhtml diff --git a/www/gtkhtml/distinfo b/www/gtkhtml/distinfo index d7a861cecc77..7ceac2591960 100644 --- a/www/gtkhtml/distinfo +++ b/www/gtkhtml/distinfo @@ -1 +1 @@ -MD5 (gtkhtml-0.16.1.tar.gz) = da85f8d2f46db669c4b3e8b0eefdd882 +MD5 (gtkhtml-1.0.0.tar.gz) = 19b9d3a9b8f4d1d24a46a2f81984085b diff --git a/www/gtkhtml/files/patch-aa b/www/gtkhtml/files/patch-aa index bc5a4bc0ed29..d810dfeba569 100644 --- a/www/gtkhtml/files/patch-aa +++ b/www/gtkhtml/files/patch-aa @@ -1,6 +1,9 @@ ---- Makefile.in.orig Fri Jun 2 09:18:22 2000 -+++ Makefile.in Fri Jun 2 14:04:24 2000 -@@ -107,7 +107,7 @@ + +$FreeBSD$ + +--- Makefile.in.orig Tue Dec 4 17:05:01 2001 ++++ Makefile.in Wed Dec 5 11:05:52 2001 +@@ -151,7 +151,7 @@ @BONOBO_TRUE@DIR_COMPONENTS = components @BONOBO_FALSE@DIR_COMPONENTS = @@ -8,4 +11,4 @@ +confexecdir = $(sysconfdir) confexec_DATA = gtkhtmlConf.sh - EXTRA_DIST = html-component.gnorba gtkhtmlConf.sh.in gtkhtml.spec.in gtkhtml.spec + SUBDIRS = intl macros src capplet doc art $(DIR_COMPONENTS) po diff --git a/www/gtkhtml/files/patch-src::gtkhtml-properties.c b/www/gtkhtml/files/patch-src::gtkhtml-properties.c deleted file mode 100644 index f783c11c5904..000000000000 --- a/www/gtkhtml/files/patch-src::gtkhtml-properties.c +++ /dev/null @@ -1,125 +0,0 @@ - -$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 4c2113398dc8..61ffa38722b6 100644 --- a/www/gtkhtml/pkg-plist +++ b/www/gtkhtml/pkg-plist @@ -94,7 +94,7 @@ lib/bonobo/plugin/libstorage_http.a lib/bonobo/plugin/libstorage_http.so lib/libgtkhtml.a lib/libgtkhtml.so -lib/libgtkhtml.so.19 +lib/libgtkhtml.so.20 share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop share/gnome/control-center/Documents/gtkhtml-properties.desktop share/gnome/control-center/capplets/gtkhtml-properties.desktop |