Author: viric Date: Wed Sep 1 08:37:42 2010 New Revision: 23585 URL: https://svn.nixos.org/websvn/nix/?rev=23585&sc=1
Log: New patch for firefox, to avoid a SIGBUS on mips. r0bertz gave me the patch through irc: http://www.gentoo-cn.org/gitweb/?p=loongson.git;a=blob;f=net-libs/xulrunner/files/xulrunner-1.9.2_beta4-mips-bus-error.patch;h=2bf51d77054796ffaf4f4d903dd8560bf96b7844;hb=HEAD "some insns requires addr to be 8 bytes alignment, xulrunner can't guarantee that" "instead it guarantees some addr will be sizeof(void *) aligned." Added: nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/xulrunner-1.9.2_beta4-mips-bus-error.patch Modified: nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/3.6.nix Modified: nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/3.6.nix ============================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/3.6.nix Wed Sep 1 08:37:28 2010 (r23584) +++ nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/3.6.nix Wed Sep 1 08:37:42 2010 (r23585) @@ -45,10 +45,16 @@ inherit src; - # To be removed when the change gets upstream. I don't know if the patch - # affects xulrunner or firefox. - patches = [ ./symlinks-bug551152.patch ./xulrunner-chromium-mips.patch - ./xulrunner-mips-n32.patch ]; + patches = [ + # To be removed when the change gets upstream. I don't know if the patch + # affects xulrunner or firefox. + ./symlinks-bug551152.patch + + # Loongson2f related patches: + ./xulrunner-chromium-mips.patch + ./xulrunner-mips-n32.patch + ./xulrunner-1.9.2_beta4-mips-bus-error.patch + ]; buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 Added: nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/xulrunner-1.9.2_beta4-mips-bus-error.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/xulrunner-1.9.2_beta4-mips-bus-error.patch Wed Sep 1 08:37:42 2010 (r23585) @@ -0,0 +1,26 @@ +http://www.gentoo-cn.org/gitweb/?p=loongson.git;a=blob;f=net-libs/xulrunner/files/xulrunner-1.9.2_beta4-mips-bus-error.patch;h=2bf51d77054796ffaf4f4d903dd8560bf96b7844;hb=HEAD + +--- ./xpcom/glue/nsTArray.h.orig 2009-04-26 01:21:58.000000000 +0800 ++++ ./xpcom/glue/nsTArray.h 2009-04-26 01:21:33.000000000 +0800 +@@ -168,6 +168,7 @@ + + // The array's elements (prefixed with a Header). This pointer is never + // null. If the array is empty, then this will point to sEmptyHdr. ++ void *padding; + Header *mHdr; + }; + +diff --git a/layout/svg/base/src/nsSVGGlyphFrame.cpp b/layout/svg/base/src/nsSVGGlyphFrame.cpp +index 6d452d0..3ce4193 100644 +--- a/layout/svg/base/src/nsSVGGlyphFrame.cpp ++++ b/layout/svg/base/src/nsSVGGlyphFrame.cpp +@@ -169,8 +169,8 @@ private: + PRBool SetupForDirectTextRun(gfxContext *aContext, float aScale); + void SetupFor(gfxContext *aContext, float aScale); + +- nsSVGGlyphFrame *mSource; + nsAutoTArray<CharacterPosition,80> mPositions; ++ nsSVGGlyphFrame *mSource; + gfxMatrix mInitialMatrix; + // Textrun advance width from start to mCurrentChar, in appunits + gfxFloat mCurrentAdvance; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
