Update to 0.16.1.
This commit is contained in:
parent
3d460577a3
commit
41b2e22b6b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=50260
@ -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 ; \
|
||||
|
@ -1 +1 @@
|
||||
MD5 (gtkhtml-0.16.0.tar.gz) = 84b37ebe459b5af00b79c1fbae0590fe
|
||||
MD5 (gtkhtml-0.16.1.tar.gz) = da85f8d2f46db669c4b3e8b0eefdd882
|
||||
|
28
www/gtkhtml/files/patch-ltmain.sh
Normal file
28
www/gtkhtml/files/patch-ltmain.sh
Normal file
@ -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"
|
125
www/gtkhtml/files/patch-src::gtkhtml-properties.c
Normal file
125
www/gtkhtml/files/patch-src::gtkhtml-properties.c
Normal file
@ -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)
|
@ -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
|
||||
|
@ -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 ; \
|
||||
|
@ -1 +1 @@
|
||||
MD5 (gtkhtml-0.16.0.tar.gz) = 84b37ebe459b5af00b79c1fbae0590fe
|
||||
MD5 (gtkhtml-0.16.1.tar.gz) = da85f8d2f46db669c4b3e8b0eefdd882
|
||||
|
28
www/gtkhtml3/files/patch-ltmain.sh
Normal file
28
www/gtkhtml3/files/patch-ltmain.sh
Normal file
@ -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"
|
125
www/gtkhtml3/files/patch-src::gtkhtml-properties.c
Normal file
125
www/gtkhtml3/files/patch-src::gtkhtml-properties.c
Normal file
@ -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)
|
@ -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
|
||||
|
@ -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 ; \
|
||||
|
@ -1 +1 @@
|
||||
MD5 (gtkhtml-0.16.0.tar.gz) = 84b37ebe459b5af00b79c1fbae0590fe
|
||||
MD5 (gtkhtml-0.16.1.tar.gz) = da85f8d2f46db669c4b3e8b0eefdd882
|
||||
|
28
www/gtkhtml38/files/patch-ltmain.sh
Normal file
28
www/gtkhtml38/files/patch-ltmain.sh
Normal file
@ -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"
|
125
www/gtkhtml38/files/patch-src::gtkhtml-properties.c
Normal file
125
www/gtkhtml38/files/patch-src::gtkhtml-properties.c
Normal file
@ -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)
|
@ -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
|
||||
|
@ -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 ; \
|
||||
|
@ -1 +1 @@
|
||||
MD5 (gtkhtml-0.16.0.tar.gz) = 84b37ebe459b5af00b79c1fbae0590fe
|
||||
MD5 (gtkhtml-0.16.1.tar.gz) = da85f8d2f46db669c4b3e8b0eefdd882
|
||||
|
28
www/libgtkhtml/files/patch-ltmain.sh
Normal file
28
www/libgtkhtml/files/patch-ltmain.sh
Normal file
@ -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"
|
125
www/libgtkhtml/files/patch-src::gtkhtml-properties.c
Normal file
125
www/libgtkhtml/files/patch-src::gtkhtml-properties.c
Normal file
@ -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)
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user