diff options
Diffstat (limited to 'gnome-extra/gtkhtml')
| -rw-r--r-- | gnome-extra/gtkhtml/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.4 | 1 | ||||
| -rw-r--r-- | gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.6 | 1 | ||||
| -rw-r--r-- | gnome-extra/gtkhtml/files/gtkhtml-properties.c.diff | 122 | ||||
| -rw-r--r-- | gnome-extra/gtkhtml/gtkhtml-1.1.6.ebuild (renamed from gnome-extra/gtkhtml/gtkhtml-1.1.4.ebuild) | 2 |
5 files changed, 7 insertions, 125 deletions
diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog index 3c74dc4f3b24..2aa82828d2b3 100644 --- a/gnome-extra/gtkhtml/ChangeLog +++ b/gnome-extra/gtkhtml/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/gtkhtml # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.8 2002/09/28 07:35:48 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.9 2002/11/16 20:52:39 azarah Exp $ + +*gtkhtml-1.1.6 (16 Nov 2002) + 16 Nov 2002; Martin Schlemmer <azarah@gentoo.org> : + Update version. *gtkhtml-1.1.2 (28 Sep 2002) 28 Sep 2002; Martin Schlemmer <azarah@gentoo.org> : diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.4 b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.4 deleted file mode 100644 index 5dc37c59a58d..000000000000 --- a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 cc03437091b6cfd84f4de76a02e48f41 gtkhtml-1.1.4.tar.bz2 1090236 diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.6 b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.6 new file mode 100644 index 000000000000..fe32c0a4ad62 --- /dev/null +++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.6 @@ -0,0 +1 @@ +MD5 4b4e0098653a50e61d3b713ddb7f81d6 gtkhtml-1.1.6.tar.bz2 1077593 diff --git a/gnome-extra/gtkhtml/files/gtkhtml-properties.c.diff b/gnome-extra/gtkhtml/files/gtkhtml-properties.c.diff deleted file mode 100644 index 31a1c394a318..000000000000 --- a/gnome-extra/gtkhtml/files/gtkhtml-properties.c.diff +++ /dev/null @@ -1,122 +0,0 @@ ---- gtkhtml-properties.c.orig Fri Nov 9 01:15:55 2001 -+++ gtkhtml-properties.c Tue Nov 20 23:59:29 2001 -@@ -181,59 +181,6 @@ - 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) - { -@@ -319,6 +266,59 @@ - gnome_config_sync (); - } - #endif -+ -+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-*-*-*-*-*-*-*"); -+ } -+} - - #define COPYS(v) \ - g_free (p1->v); \ diff --git a/gnome-extra/gtkhtml/gtkhtml-1.1.4.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.1.6.ebuild index cca07471d578..8f2baee7f84f 100644 --- a/gnome-extra/gtkhtml/gtkhtml-1.1.4.ebuild +++ b/gnome-extra/gtkhtml/gtkhtml-1.1.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.1.4.ebuild,v 1.1 2002/11/09 12:43:22 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.1.6.ebuild,v 1.1 2002/11/16 20:52:39 azarah Exp $ IUSE="nls gnome" |