bumped xulrunner to 1.9.2.13-r1

Signed-off-by: Zhang Le <r0bertz@gentoo.org>

3 files changed, 171 insertions, 4 deletions

diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 68ddaa8..8f8a5da 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -6,6 +6,7 @@ AUX 1009-armv4t-nanojit-v2.patch 12251 RMD160 9e9d862879d4897067605879245c1a6d50
 AUX 301-xulrunner-xpctools.diff 550 RMD160 12d370d5473de5c54233a70533cd35e37305ef86 SHA1 e3812ce6a4446b0b9d496a9dd4760d03bf0de449 SHA256 6bf510f7df5a41f47501cbdbcffc46d0c04865e3597dc6a575cd4a9cfae1def4
 AUX README 145 RMD160 e6b6991f1dc429a081f6f16a0a7a24909c2ee576 SHA1 10e9be7039df62377a2e2ba8358beeceffbbbb07 SHA256 9b7fac0b4b5834c404c392bd34408eb3cbcfc75be6335395f44f8953adc102df
 AUX bug-606109.patch 1243 RMD160 ec262eed0480d8a13c914c4781329e3ea1c23b0f SHA1 0c0cc40ee0a663422b107cc3ae5d1412b8c45ac7 SHA256 266d9c7218cc04c3badadc54f8f31b1238326b9c3052aed057ffce40c69541dc
+AUX cups-1.4.4-fixup.patch 5439 RMD160 e907f65012a88b0810979c0beda4244e817835e6 SHA1 4099626a22b61802c958faad8171d506a95f9fca SHA256 501f95e278c2fdf3dec2b5586a2dc5ae35d78557a0db9939a1501c4782e54be5
 AUX fix-animated-gifs.patch 7789 RMD160 a8889110a2daea27e07f92a70df6cb1e39e05546 SHA1 05b335feeefff4f06004a20182f821d998b44879 SHA256 6d85d3c103b0dcdbb073302a4041a37bea97c715384d04d299c1fb49a5da7443
 AUX mxgot.patch 704 RMD160 34960622c2bd61336e077289c4473b189e4d0199 SHA1 173301a56c01d1458fd710dc511f9cb8e1437a5f SHA256 2ab115c54f76d4f146b283700548faf1b944c1491dd8a22217a7ed80c7fa42a7
 AUX xulrunner-1.9.2.13-mips-bus-error.patch 957 RMD160 fab47698b8e22205d5b43ee3a5268b5776b32663 SHA1 d4bc49bc1d4871ec2001e72825cdf1e0035fd2fa SHA256 609c10f9f35fe039a472e802af8628c89c796f8d257687f05f43fde846d1a109
@@ -20,6 +21,10 @@ AUX xulrunner-2.0_beta5_pre-chromium-mips.patch 7240 RMD160 33307a04b330e01d4779
 AUX xulrunner-2.0_beta5_pre-mips-bus-error.patch 957 RMD160 fab47698b8e22205d5b43ee3a5268b5776b32663 SHA1 d4bc49bc1d4871ec2001e72825cdf1e0035fd2fa SHA256 609c10f9f35fe039a472e802af8628c89c796f8d257687f05f43fde846d1a109
 AUX xulrunner-2.0_beta5_pre-mips-n32.patch 24738 RMD160 63995685e4343420469fbb056e051afd28cc56db SHA1 e6435e8e9b15db8103b6d6d0c9213ce36ec88f94 SHA256 24ac461bffbd7c2978a2cd30dc4cbed95370a77a2db054ade2794e902620d3de
 AUX xulrunner-2.0_beta5_pre.patch 96688 RMD160 e8190a6c67210a08f06a64c02d1c8d017f5462dc SHA1 d8e0e29b597076945aa1303101df884c8880b6e6 SHA256 0325a78e4b22fa55a38c242001f75afdb92670a629fab6b99a1d5d013b56288b
+AUX xulrunner-2.0_beta8_pre-chromium-mips.patch 7240 RMD160 33307a04b330e01d477929dd7327bdf567226fad SHA1 f0f8d5792ee7b9d4d7c3e4f3cc2d9a327ecee9c6 SHA256 25a776115233784d998b7e9fe76d991fc410938e7793c815ed17509736c0604a
+AUX xulrunner-2.0_beta8_pre-mips-bus-error.patch 957 RMD160 fab47698b8e22205d5b43ee3a5268b5776b32663 SHA1 d4bc49bc1d4871ec2001e72825cdf1e0035fd2fa SHA256 609c10f9f35fe039a472e802af8628c89c796f8d257687f05f43fde846d1a109
+AUX xulrunner-2.0_beta8_pre-mips-n32.patch 24738 RMD160 63995685e4343420469fbb056e051afd28cc56db SHA1 e6435e8e9b15db8103b6d6d0c9213ce36ec88f94 SHA256 24ac461bffbd7c2978a2cd30dc4cbed95370a77a2db054ade2794e902620d3de
+AUX xulrunner-2.0_beta8_pre.patch 96688 RMD160 e8190a6c67210a08f06a64c02d1c8d017f5462dc SHA1 d8e0e29b597076945aa1303101df884c8880b6e6 SHA256 0325a78e4b22fa55a38c242001f75afdb92670a629fab6b99a1d5d013b56288b
 AUX xulrunner-chromium-mips.patch 7752 RMD160 7fd4aab6cd2a4c0d22613812909ed45fd23f5f47 SHA1 f4c0352a809433cfff366833156c7de420f2b46c SHA256 08f5935cc72cc05f4dc9e8500a7f351e0161b5398630a00f44d9a17cd8268d15
 AUX xulrunner-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a SHA1 b9efc3ef5e95ad3081f6b68d771e32e848b4b9ac SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8
 AUX xulrunner-mips-bus-error.patch 1997 RMD160 22b41e26d5ac86b53fc35c5a9220fd80520a99a6 SHA1 384f1e3c507ababbebd8bbc4c08b04490b837436 SHA256 1b3553e751711cfda9e91295fb9bdaf892eee6b0d9f0ac9fc44a532105a784c0
@@ -34,7 +39,7 @@ DIST xulrunner-1.9.2-patches-0.6.tar.bz2 16308 RMD160 6066ea0b01f8b6c9eae1a0692a
 DIST xulrunner-1.9.2-patches-0.9.tar.bz2 15320 RMD160 2dfb86650c0a9a1f0c5bf86df7434c7c286658d6 SHA1 a2276c708eec2e92611ac1e7a2eaf25c39263d30 SHA256 5cca685442f1ab920eb1ba86719a38a437ae05bd5cefc42ababc2556425ebf5a
 DIST xulrunner-1.9.3-patches-0.1.tar.bz2 4761 RMD160 d13fa5e53235fbe4eba50f210107b352530d95ab SHA1 78904c4543eb27717131d159e8ef02762e94c6f7 SHA256 fab399d174e6959afb998446e152f1da41575058afb40e9c442cfa804de326fc
 DIST xulrunner-2.0-patches-0.4.tar.bz2 6121 RMD160 4bb2a879632894a4185c7c778fbf80a6c80f6847 SHA1 139af0b2fabe4f2c46bda27c9e29f7dd2731c6a3 SHA256 606e9f9b44e6ce61035047e58f4c0dc8e4dc6c67b1d159a0623212dedc50c4b9
-EBUILD xulrunner-1.9.2.13.ebuild 8110 RMD160 a19351d61fa537b0b90c36dbb048915d8a8f6ebd SHA1 7b586c0456b5e6ac11089634b3bf9a9282a14a27 SHA256 f3c6882464edf0902b34d172ef8f014f0242b317a2e9299c300c2b188a5f3a49
+EBUILD xulrunner-1.9.2.13-r1.ebuild 8177 RMD160 945be67abb570f9505a5e9d2b5be58898804968d SHA1 f29638adfdd4888d8fad1186e723e912febbc6d3 SHA256 8f66a530c46c6d0f0d3eb596bb70eb11518315b382c07c545327959eb6a874c6
 EBUILD xulrunner-1.9.2.8-r1.ebuild 8213 RMD160 5c8d817c91155e4bbd8763bbd0d99b8ca78cdc93 SHA1 5292e24359386e503b4b3a1e3ecb7cbac3754bbe SHA256 716743ab7bf42421333843adf5a75b23109ae142519a0fb85fda87a4a94a6923
 EBUILD xulrunner-1.9.3_alpha5.ebuild 6811 RMD160 3ac0a6d11b664b0a77b80164e640469c770ed089 SHA1 35bac75d31b1927848235e4d60d993edf487d7cb SHA256 a3a229d9d24b51641b5d2e8e9819766cc1b3ebc19b0827210e87857a9a609dc7
 EBUILD xulrunner-2.0_beta5_pre-r2.ebuild 8139 RMD160 bd837f2c4696444398b0a7aae93d5d8172a33c5e SHA1 f03c08dbdf05005dbd5011121dd68f97238cbe92 SHA256 bc7d175790269a8699bb7cd3c3eb9947f9e63e033a1076b3af7c0a7940fc1f6c
diff --git a/net-libs/xulrunner/files/cups-1.4.4-fixup.patch b/net-libs/xulrunner/files/cups-1.4.4-fixup.patch
new file mode 100644
index 0000000..a0923e8
--- /dev/null
+++ b/net-libs/xulrunner/files/cups-1.4.4-fixup.patch
@@ -0,0 +1,161 @@
+# HG changeset patch
+# User Matthew Gregan <kinetik@flim.org>
+# Date 1293624205 -3600
+# Node ID ffa1ef8ab52b4081e27aa2b24d14a550386f90db
+# Parent  9e561d402701f46eb56dbadb96b6963f4518cdd0
+Bug 573039 - Construct nsCUPSShim statically and avoid calling PR_UnloadLibrary on libcups after it has been initialized. r=karlt a=clegnitto
+
+diff --git a/mozilla/gfx/src/psshared/nsCUPSShim.cpp b/mozilla/gfx/src/psshared/nsCUPSShim.cpp
+--- a/mozilla/gfx/src/psshared/nsCUPSShim.cpp
++++ b/mozilla/gfx/src/psshared/nsCUPSShim.cpp
+@@ -83,14 +83,8 @@ nsCUPSShim::Init()
+ #endif
+             PR_UnloadLibrary(mCupsLib);
+             mCupsLib = nsnull;
+             return PR_FALSE;
+         }
+     }
+     return PR_TRUE;
+ }
+-
+-nsCUPSShim::~nsCUPSShim()
+-{
+-    if (mCupsLib)
+-        PR_UnloadLibrary(mCupsLib);
+-}
+diff --git a/mozilla/gfx/src/psshared/nsCUPSShim.h b/mozilla/gfx/src/psshared/nsCUPSShim.h
+--- a/mozilla/gfx/src/psshared/nsCUPSShim.h
++++ b/mozilla/gfx/src/psshared/nsCUPSShim.h
+@@ -81,17 +81,16 @@ typedef int (PR_CALLBACK *CupsAddOptionT
+                                              int           num_options,
+                                              cups_option_t **options);
+ 
+ struct PRLibrary;
+ 
+ class NS_PSSHARED nsCUPSShim {
+     public:
+         nsCUPSShim() : mCupsLib(nsnull) { }
+-        ~nsCUPSShim();
+ 
+         /**
+          * Initialize this object. Attempt to load the CUPS shared
+          * library and find function pointers for the supported
+          * functions (see below).
+          * @return PR_FALSE if the shared library could not be loaded, or if
+          *                  any of the functions could not be found.
+          *         PR_TRUE  for successful initialization.
+diff --git a/mozilla/gfx/src/psshared/nsPSPrinters.cpp b/mozilla/gfx/src/psshared/nsPSPrinters.cpp
+--- a/mozilla/gfx/src/psshared/nsPSPrinters.cpp
++++ b/mozilla/gfx/src/psshared/nsPSPrinters.cpp
+@@ -51,32 +51,34 @@
+ #include "plstr.h"
+ 
+ #define NS_CUPS_PRINTER "CUPS/"
+ #define NS_CUPS_PRINTER_LEN (sizeof(NS_CUPS_PRINTER) - 1)
+ 
+ /* dummy printer name for the gfx/src/ps driver */
+ #define NS_POSTSCRIPT_DRIVER_NAME "PostScript/"
+ 
++nsCUPSShim gCupsShim;
++
+ /* Initialize the printer manager object */
+ nsresult
+ nsPSPrinterList::Init()
+ {
+     nsresult rv;
+ 
+     mPrefSvc = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
+     if (NS_SUCCEEDED(rv))
+         rv = mPrefSvc->GetBranch("print.", getter_AddRefs(mPref));
+     NS_ENSURE_SUCCESS(rv, NS_ERROR_NOT_INITIALIZED);
+ 
+     // Should we try cups?
+     PRBool useCups = PR_TRUE;
+     rv = mPref->GetBoolPref("postscript.cups.enabled", &useCups);
+-    if (useCups)
+-        mCups.Init();
++    if (useCups && !gCupsShim.IsInitialized())
++        gCupsShim.Init();
+     return NS_OK;
+ }
+ 
+ 
+ /* Check whether the PostScript module has been disabled at runtime */
+ PRBool
+ nsPSPrinterList::Enabled()
+ {
+@@ -94,35 +96,35 @@ nsPSPrinterList::Enabled()
+ /* Fetch a list of printers handled by the PostsScript module */
+ void
+ nsPSPrinterList::GetPrinterList(nsTArray<nsCString>& aList)
+ {
+     aList.Clear();
+ 
+     // Query CUPS for a printer list. The default printer goes to the
+     // head of the output list; others are appended.
+-    if (mCups.IsInitialized()) {
++    if (gCupsShim.IsInitialized()) {
+         cups_dest_t *dests;
+ 
+-        int num_dests = (mCups.mCupsGetDests)(&dests);
++        int num_dests = (gCupsShim.mCupsGetDests)(&dests);
+         if (num_dests) {
+             for (int i = 0; i < num_dests; i++) {
+                 nsCAutoString fullName(NS_CUPS_PRINTER);
+                 fullName.Append(dests[i].name);
+                 if (dests[i].instance != NULL) {
+                     fullName.Append("/");
+                     fullName.Append(dests[i].instance);
+                 }
+                 if (dests[i].is_default)
+                     aList.InsertElementAt(0, fullName);
+                 else
+                     aList.AppendElement(fullName);
+             }
+         }
+-        (mCups.mCupsFreeDests)(num_dests, dests);
++        (gCupsShim.mCupsFreeDests)(num_dests, dests);
+     }
+ 
+     // Build the "classic" list of printers -- those accessed by running
+     // an opaque command. This list always contains a printer named "default".
+     // In addition, we look for either an environment variable
+     // MOZILLA_POSTSCRIPT_PRINTER_LIST or a preference setting
+     // print.printer_list, which contains a space-separated list of printer
+     // names.
+diff --git a/mozilla/gfx/src/psshared/nsPSPrinters.h b/mozilla/gfx/src/psshared/nsPSPrinters.h
+--- a/mozilla/gfx/src/psshared/nsPSPrinters.h
++++ b/mozilla/gfx/src/psshared/nsPSPrinters.h
+@@ -37,17 +37,16 @@
+  * ***** END LICENSE BLOCK ***** */
+ 
+ #ifndef nsPSPrinters_h___
+ #define nsPSPrinters_h___
+ 
+ #include "nsString.h"
+ #include "nsTArray.h"
+ #include "prtypes.h"
+-#include "nsCUPSShim.h"
+ #include "psSharedCore.h"
+ 
+ class nsIPrefService;
+ class nsIPrefBranch;
+ class nsCUPSShim;
+ 
+ class NS_PSSHARED nsPSPrinterList {
+     public:
+@@ -91,12 +90,11 @@ class NS_PSSHARED nsPSPrinterList {
+          *              the <type> portion as described for GetPrinterList().
+          * @return The PrinterType value for this name.
+          */
+         static PrinterType GetPrinterType(const nsACString& aName);
+ 
+     private:
+         nsCOMPtr<nsIPrefService> mPrefSvc;
+         nsCOMPtr<nsIPrefBranch> mPref;
+-        nsCUPSShim mCups;
+ };
+ 
+ #endif /* nsPSPrinters_h___ */
+
+
diff --git a/net-libs/xulrunner/xulrunner-1.9.2.13.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.13-r1.ebuild
index 9068788..1ecd25b 100644
--- a/net-libs/xulrunner/xulrunner-1.9.2.13.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.2.13-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.13.ebuild,v 1.7 2010/12/11 15:58:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.13-r1.ebuild,v 1.1 2011/01/02 22:28:37 betelgeuse Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -17,7 +17,7 @@ HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
 SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="1.9"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="+alsa debug +ipc libnotify system-sqlite wifi"
@@ -67,6 +67,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/bug-606109.patch"
 	epatch "${FILESDIR}/fix-animated-gifs.patch"
+	epatch "${FILESDIR}/cups-1.4.4-fixup.patch"
 
 	if use mips; then
 		epatch "${FILESDIR}"/${P}-mips-n32.patch