Pullup patches from the trunk to allow galeon to build properly on the

pkgsrc-2003Q4 branch. Requested by Alistair Crooks.

	date: 2003/12/10 18:34:01;  author: agc;  state: Exp;  lines: +10 -41
	Add patches to allow galeon to compile on NetBSD-1.6ZG.

4 files changed, 59 insertions, 3 deletions

diff --git a/www/galeon/distinfo b/www/galeon/distinfo
index 612c65791cc..84f65131f8a 100644
--- a/www/galeon/distinfo
+++ b/www/galeon/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.32 2003/06/19 17:11:52 taya Exp $
+$NetBSD: distinfo,v 1.32.2.1 2003/12/11 19:50:32 agc Exp $
 
-SHA1 (galeon-1.2.11.tar.gz) = ebdc895b0352af6037d65a6fabda856d2a44dcd4
-Size (galeon-1.2.11.tar.gz) = 4216345 bytes
+SHA1 (galeon-1.2.13.tar.gz) = 0282ec0f714b83965fb3b242b9161c76d88fd49e
+Size (galeon-1.2.13.tar.gz) = 4220496 bytes
+SHA1 (patch-aa) = c833d0431ac10507f35b325c109fae35f5d1a454
+SHA1 (patch-ab) = b65428a66edee35968813a64afae9050de5e3271
+SHA1 (patch-ac) = 31d226907d96e56a25e8c7388ef48badc562b788
diff --git a/www/galeon/patches/patch-aa b/www/galeon/patches/patch-aa
new file mode 100644
index 00000000000..e3871746f2a
--- /dev/null
+++ b/www/galeon/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.9.2.1 2003/12/11 19:50:32 agc Exp $
+
+--- configure.in	2003/12/10 18:13:14	1.1
++++ configure.in	2003/12/10 18:13:26
+@@ -486,6 +486,7 @@
+ AC_CHECK_LIB(gtksuperwin, gdk_superwin_get_type, [_mozilla_gtk_super_win_libs="-lgtksuperwin"],[],[$_PTHREAD_LDFLAGS])
+ 
+ dnl gtk moz embed library
++CC="$CXX"
+ LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz $_mozilla_xpcom_libs $_mozilla_gtk_super_win_libs"
+ AC_CHECK_LIB(gtkembedmoz, gtk_moz_embed_get_type, [_mozilla_gtk_moz_embed_libs="-lgtkembedmoz"])
+ 
diff --git a/www/galeon/patches/patch-ab b/www/galeon/patches/patch-ab
new file mode 100644
index 00000000000..c450324caf7
--- /dev/null
+++ b/www/galeon/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.7.2.1 2003/12/11 19:50:32 agc Exp $
+
+--- configure	2003/12/10 18:13:09	1.1
++++ configure	2003/12/10 18:13:20
+@@ -12449,6 +12449,8 @@
+ fi
+ 
+ 
++CC="$CXX"
++
+ LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz $_mozilla_xpcom_libs $_mozilla_gtk_super_win_libs"
+ echo "$as_me:$LINENO: checking for gtk_moz_embed_get_type in -lgtkembedmoz" >&5
+ echo $ECHO_N "checking for gtk_moz_embed_get_type in -lgtkembedmoz... $ECHO_C" >&6
diff --git a/www/galeon/patches/patch-ac b/www/galeon/patches/patch-ac
new file mode 100644
index 00000000000..ea4479f24b5
--- /dev/null
+++ b/www/galeon/patches/patch-ac
@@ -0,0 +1,28 @@
+$NetBSD: patch-ac,v 1.3.2.1 2003/12/11 19:50:32 agc Exp $
+
+--- intl/dcigettext.c	2003/12/10 18:18:51	1.1
++++ intl/dcigettext.c	2003/12/10 18:23:22
+@@ -974,18 +974,18 @@
+      size_t translation_len;
+ {
+   struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
+-  unsigned long int index;
++  unsigned long int ind;
+   const char *p;
+ 
+-  index = plural_eval (domaindata->plural, n);
+-  if (index >= domaindata->nplurals)
++  ind = plural_eval (domaindata->plural, n);
++  if (ind >= domaindata->nplurals)
+     /* This should never happen.  It means the plural expression and the
+        given maximum value do not match.  */
+-    index = 0;
++    ind = 0;
+ 
+   /* Skip INDEX strings at TRANSLATION.  */
+   p = translation;
+-  while (index-- > 0)
++  while (ind-- > 0)
+     {
+ #ifdef _LIBC
+       p = __rawmemchr (p, '\0');