diff options
| author | tnn <tnn@pkgsrc.org> | 2010-03-23 12:43:38 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2010-03-23 12:43:38 +0000 |
| commit | dff8d0d8ec36fc79a6873247de61ff3d0ffad579 (patch) | |
| tree | 0a033b2618371b6361cb24d41ca0153290d0cae9 /devel/xulrunner | |
| parent | 1ce9b7c5adacee5667fe7b1fdf6b5851cd5bdc83 (diff) | |
| download | pkgsrc-dff8d0d8ec36fc79a6873247de61ff3d0ffad579.tar.gz | |
Update to firefox-3.6.2 proper. (no changes from the beta)
Also add patch for PR pkg/42988 crash, effectively disabling all
sound support until we decide on what sound API to use.
The current dlopen() guesswork is bad, mkay.
Bump PKGREVISION for this and previous changes.
Diffstat (limited to 'devel/xulrunner')
| -rw-r--r-- | devel/xulrunner/Makefile | 3 | ||||
| -rw-r--r-- | devel/xulrunner/dist.mk | 7 | ||||
| -rw-r--r-- | devel/xulrunner/distinfo | 9 | ||||
| -rw-r--r-- | devel/xulrunner/patches/patch-be | 16 |
4 files changed, 24 insertions, 11 deletions
diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile index 50c5df0cb8d..7e792e6f936 100644 --- a/devel/xulrunner/Makefile +++ b/devel/xulrunner/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2010/03/16 15:57:02 tnn Exp $ +# $NetBSD: Makefile,v 1.39 2010/03/23 12:43:38 tnn Exp $ .include "dist.mk" PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR} +PKGREVISION= 1 CATEGORIES= devel www MAINTAINER= tnn@NetBSD.org diff --git a/devel/xulrunner/dist.mk b/devel/xulrunner/dist.mk index 7a539c9e26c..679e8ec0f85 100644 --- a/devel/xulrunner/dist.mk +++ b/devel/xulrunner/dist.mk @@ -1,4 +1,4 @@ -# $NetBSD: dist.mk,v 1.8 2010/03/16 15:57:02 tnn Exp $ +# $NetBSD: dist.mk,v 1.9 2010/03/23 12:43:38 tnn Exp $ # # used by devel/nspr/Makefile # used by devel/nss/Makefile @@ -16,8 +16,3 @@ DISTINFO_FILE= ${.CURDIR}/../../devel/xulrunner/distinfo PATCHDIR= ${.CURDIR}/../../devel/xulrunner/patches WRKSRC= ${WRKDIR}/mozilla-${MOZ_BRANCH} - -# snapshot overrides -DISTNAME= f14062c981ba -MASTER_SITES= http://hg.mozilla.org/releases/mozilla-1.9.2/archive/ -WRKSRC= ${WRKDIR}/mozilla-1-9-2-f14062c981ba diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo index b966467fde0..9ae042801ab 100644 --- a/devel/xulrunner/distinfo +++ b/devel/xulrunner/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.26 2010/03/17 14:02:14 tnn Exp $ +$NetBSD: distinfo,v 1.27 2010/03/23 12:43:38 tnn Exp $ -SHA1 (f14062c981ba.tar.bz2) = 8965bf632ea401f1b7a783bae4a78217505d2db4 -RMD160 (f14062c981ba.tar.bz2) = ab698d457f293c8a26553adfa5f1c793806ea925 -Size (f14062c981ba.tar.bz2) = 48101977 bytes +SHA1 (firefox-3.6.2.source.tar.bz2) = 7befdbcc2bd658c136bdce1c1bd8b54201c1d1d1 +RMD160 (firefox-3.6.2.source.tar.bz2) = 89243e2815351e132ad7d139808d3c89b5524762 +Size (firefox-3.6.2.source.tar.bz2) = 48919538 bytes SHA1 (patch-aa) = d719f801f340688102e3b1c07b53655f4053180a SHA1 (patch-ab) = a9a9db3f53ecac231007de9ed163bd99f2184462 SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d @@ -32,6 +32,7 @@ SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4 SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d SHA1 (patch-bb) = a764014f7aee2ecb75584ee652fd4a35ab647527 SHA1 (patch-bc) = 6ea633380f427a24098129afa68fcd0112e68ca1 +SHA1 (patch-be) = cad5bc4ac3e83b6e098edfbf0aadc845d97a6032 SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524 SHA1 (patch-mb) = 5b41f75ec70ef494c58af9eb4eaf4546a5d62e3a SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393 diff --git a/devel/xulrunner/patches/patch-be b/devel/xulrunner/patches/patch-be new file mode 100644 index 00000000000..0d269127efd --- /dev/null +++ b/devel/xulrunner/patches/patch-be @@ -0,0 +1,16 @@ +$NetBSD: patch-be,v 1.1 2010/03/23 12:43:38 tnn Exp $ + +Disable all sound support for now since it causes +crashes and doesn't work correctly anyway ... + +--- widget/src/gtk2/nsSound.cpp.orig 2010-03-15 14:56:04.000000000 +0000 ++++ widget/src/gtk2/nsSound.cpp +@@ -149,6 +149,8 @@ nsSound::Init() + + mInited = PR_TRUE; + ++ return NS_OK; ++ + if (!elib) { + elib = PR_LoadLibrary("libesd.so.0"); + if (elib) { |