diff options
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | www/galeon/Makefile | 5 | ||||
| -rw-r--r-- | www/galeon/distinfo | 15 | ||||
| -rw-r--r-- | www/galeon/patches/patch-aa | 4 | ||||
| -rw-r--r-- | www/galeon/patches/patch-ab | 6 | ||||
| -rw-r--r-- | www/galeon/patches/patch-ac | 4 | ||||
| -rw-r--r-- | www/galeon/patches/patch-ad | 6 | ||||
| -rw-r--r-- | www/galeon/patches/patch-ae | 14 |
8 files changed, 36 insertions, 21 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 1e6686996ae..6843b51ce31 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.7353 2004/10/05 16:52:06 abs Exp $ +$NetBSD: CHANGES,v 1.7354 2004/10/05 16:54:59 abs Exp $ Changes to the packages collection and infrastructure in 2004: @@ -4554,4 +4554,5 @@ Changes to the packages collection and infrastructure in 2004: Added ntfsprogs-1.9.4 [agc 2004-10-05] Updated sylpheed-claws to 0.9.12b [adam 2004-10-05] Updated rconfig to 0.39 [abs 2004-10-05] + Updated galeon to 1.3.17 [abs 2004-10-05] diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 8e79ac8a242..24fb22d5e2c 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.71 2004/10/03 00:18:25 tv Exp $ +# $NetBSD: Makefile,v 1.72 2004/10/05 16:54:29 abs Exp $ # -DISTNAME= galeon-1.3.16 -PKGREVISION= 1 +DISTNAME= galeon-1.3.17 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=galeon/} EXTRACT_SUFX= .tar.bz2 diff --git a/www/galeon/distinfo b/www/galeon/distinfo index 1e53a1184f8..d3b029fde65 100644 --- a/www/galeon/distinfo +++ b/www/galeon/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.36 2004/07/20 17:37:23 abs Exp $ +$NetBSD: distinfo,v 1.37 2004/10/05 16:54:29 abs Exp $ -SHA1 (galeon-1.3.16.tar.bz2) = d5cdbfbb5a94285f5a41ae40d78094ddce187c76 -Size (galeon-1.3.16.tar.bz2) = 3572080 bytes -SHA1 (patch-aa) = 0bda66e7c4e1f735057aa4fcdcbe0b27b3b739ba -SHA1 (patch-ab) = f04d9ffbe497c53ab60849f103f1d1d3205ba7ab -SHA1 (patch-ac) = 07a25a915a2d636d7a79cd607c865c064bbb9744 -SHA1 (patch-ad) = 9015275a6a73627b44e228e049a29477bb3bc150 +SHA1 (galeon-1.3.17.tar.bz2) = 03bb667acbf61eeca98ae5f39ddf1713ee18246b +Size (galeon-1.3.17.tar.bz2) = 3635524 bytes +SHA1 (patch-aa) = f90eceea62d12ebcaed72d8b8871cf35eda51256 +SHA1 (patch-ab) = 2bea5878588c98b66c31dd5b7eda63912fe9ff1d +SHA1 (patch-ac) = 9f5b88e605c846d566615322cb1cc21ff585028a +SHA1 (patch-ad) = 5f125f07451cbd7969cba6c254d7a5bd6ae00788 +SHA1 (patch-ae) = 054715c68a1a278331e9e20be107b0e1717b08f6 diff --git a/www/galeon/patches/patch-aa b/www/galeon/patches/patch-aa index d2de77cbdd1..eeb0acf90cc 100644 --- a/www/galeon/patches/patch-aa +++ b/www/galeon/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.11 2004/07/20 17:37:23 abs Exp $ +$NetBSD: patch-aa,v 1.12 2004/10/05 16:54:29 abs Exp $ ---- configure.in.orig 2004-07-03 17:49:13.000000000 +0100 +--- configure.in.orig 2004-08-07 21:42:52.000000000 +0100 +++ configure.in @@ -213,12 +213,12 @@ AC_ARG_WITH(mozilla-snapshot, AC_MSG_RESULT($MOZILLA_VERSION$autodetect) diff --git a/www/galeon/patches/patch-ab b/www/galeon/patches/patch-ab index 30279a9bc6b..3593fb8bfd4 100644 --- a/www/galeon/patches/patch-ab +++ b/www/galeon/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.9 2004/07/20 17:37:23 abs Exp $ +$NetBSD: patch-ab,v 1.10 2004/10/05 16:54:29 abs Exp $ ---- configure.orig 2004-07-03 18:07:57.000000000 +0100 +--- configure.orig 2004-08-08 21:12:00.000000000 +0100 +++ configure -@@ -22732,11 +22732,11 @@ fi; +@@ -22744,11 +22744,11 @@ fi; echo "$as_me:$LINENO: result: $MOZILLA_VERSION$autodetect" >&5 echo "${ECHO_T}$MOZILLA_VERSION$autodetect" >&6 diff --git a/www/galeon/patches/patch-ac b/www/galeon/patches/patch-ac index 4286b0d9ac7..e0955535d09 100644 --- a/www/galeon/patches/patch-ac +++ b/www/galeon/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.5 2004/07/20 17:37:23 abs Exp $ +$NetBSD: patch-ac,v 1.6 2004/10/05 16:54:29 abs Exp $ ---- galeon.desktop.in.orig 2003-09-17 22:16:18.000000000 +0100 +--- galeon.desktop.in.orig 2004-07-21 21:46:59.000000000 +0100 +++ galeon.desktop.in @@ -7,7 +7,7 @@ _Comment=Browse the web Exec=galeon diff --git a/www/galeon/patches/patch-ad b/www/galeon/patches/patch-ad index db1142e3611..4c9048e1108 100644 --- a/www/galeon/patches/patch-ad +++ b/www/galeon/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.3 2004/07/20 17:37:23 abs Exp $ +$NetBSD: patch-ad,v 1.4 2004/10/05 16:54:29 abs Exp $ ---- sounds/Makefile.in.orig 2004-07-03 18:08:08.000000000 +0100 +--- sounds/Makefile.in.orig 2004-08-08 21:12:13.000000000 +0100 +++ sounds/Makefile.in -@@ -223,7 +223,8 @@ sharedstatedir = @sharedstatedir@ +@@ -232,7 +232,8 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ galeon_SOUNDS = clicked.wav diff --git a/www/galeon/patches/patch-ae b/www/galeon/patches/patch-ae new file mode 100644 index 00000000000..32f21b23fe1 --- /dev/null +++ b/www/galeon/patches/patch-ae @@ -0,0 +1,14 @@ +$NetBSD: patch-ae,v 1.4 2004/10/05 16:54:29 abs Exp $ + +--- mozilla/mozilla-embed.cpp.orig 2004-10-05 13:03:37.000000000 +0100 ++++ mozilla/mozilla-embed.cpp +@@ -1388,7 +1388,8 @@ impl_set_encoding (GaleonEmbed *embed, + rv = wrapper->ForceEncoding (charset); + if (NS_FAILED (rv)) return G_FAILED; + +-#if MOZILLA_CHECK_VERSION4 (1,8,MOZILLA_ALPHA,3) ++#if MOZILLA_CHECK_VERSION4 (1,8,MOZILLA_ALPHA,3) || \ ++ (MOZILLA_IS_BRANCH (1,7) && MOZILLA_CHECK_VERSION3(1,7,3)) + gtk_moz_embed_reload (GTK_MOZ_EMBED (embed), + GTK_MOZ_EMBED_FLAG_RELOADCHARSETCHANGE); + #else |