mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-22 20:41:26 +00:00
Update to 1.0.0.
This commit is contained in:
parent
edc0f6b58f
commit
355e9dc55b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=51075
@ -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
|
||||
|
@ -1 +1 @@
|
||||
MD5 (gtkhtml-0.16.1.tar.gz) = da85f8d2f46db669c4b3e8b0eefdd882
|
||||
MD5 (gtkhtml-1.0.0.tar.gz) = 19b9d3a9b8f4d1d24a46a2f81984085b
|
||||
|
@ -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
|
||||
|
@ -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)
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1 +1 @@
|
||||
MD5 (gtkhtml-0.16.1.tar.gz) = da85f8d2f46db669c4b3e8b0eefdd882
|
||||
MD5 (gtkhtml-1.0.0.tar.gz) = 19b9d3a9b8f4d1d24a46a2f81984085b
|
||||
|
@ -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
|
||||
|
@ -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)
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1 +1 @@
|
||||
MD5 (gtkhtml-0.16.1.tar.gz) = da85f8d2f46db669c4b3e8b0eefdd882
|
||||
MD5 (gtkhtml-1.0.0.tar.gz) = 19b9d3a9b8f4d1d24a46a2f81984085b
|
||||
|
@ -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
|
||||
|
@ -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)
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1 +1 @@
|
||||
MD5 (gtkhtml-0.16.1.tar.gz) = da85f8d2f46db669c4b3e8b0eefdd882
|
||||
MD5 (gtkhtml-1.0.0.tar.gz) = 19b9d3a9b8f4d1d24a46a2f81984085b
|
||||
|
@ -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
|
||||
|
@ -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)
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user