summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/libgtkhtml/Makefile3
-rw-r--r--www/libgtkhtml/files/patch-libgtkhtml_util_htmlatomlist.c25
2 files changed, 27 insertions, 1 deletions
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index bb780280efa9..eb455c33c42b 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libgtkhtml
PORTVERSION= 2.2.4
+PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
@@ -23,7 +24,7 @@ USE_GNOME= gnomeprefix gnomehack libxslt gnomevfs2 gail
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib"
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/www/libgtkhtml/files/patch-libgtkhtml_util_htmlatomlist.c b/www/libgtkhtml/files/patch-libgtkhtml_util_htmlatomlist.c
new file mode 100644
index 000000000000..5eec5f729744
--- /dev/null
+++ b/www/libgtkhtml/files/patch-libgtkhtml_util_htmlatomlist.c
@@ -0,0 +1,25 @@
+--- libgtkhtml/util/htmlatomlist.c.orig Mon May 26 14:13:28 2003
++++ libgtkhtml/util/htmlatomlist.c Mon May 26 15:29:00 2003
+@@ -68,10 +68,11 @@
+ HtmlAtom atom;
+ gchar *ptr;
+ gboolean found;
++ gpointer old_atom;
+
+ ptr = g_strdown (g_strdup (str));
+
+- found = g_hash_table_lookup_extended (al->table, ptr, NULL, (gpointer) &atom);
++ found = g_hash_table_lookup_extended (al->table, ptr, NULL, &old_atom);
+
+ if (!found) {
+ if (al->len % 512 == 0)
+@@ -81,6 +82,9 @@
+ atom = al->len;
+ g_hash_table_insert (al->table, al->data[al->len], GUINT_TO_POINTER (atom));
+ al->len++;
++ }
++ else {
++ atom = GPOINTER_TO_UINT (old_atom);
+ }
+
+ g_free (ptr);