Update to firefox35 3.5.17.
This commit is contained in:
landry
parent
3b0c50e3a2
commit
d4c868a945
@ -1,12 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.59 2011/01/28 21:38:12 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.60 2011/03/02 14:41:09 landry Exp $
|
||||
|
||||
COMMENT = Mozilla web browser
|
||||
|
||||
MOZILLA_VERSION = 3.5.16
|
||||
MOZILLA_VERSION = 3.5.17
|
||||
MOZILLA_BRANCH = 1.9.1
|
||||
MOZILLA_PROJECT = firefox35
|
||||
MOZILLA_CODENAME = browser
|
||||
REVISION = 2
|
||||
|
||||
SO_VERSION = 24.0
|
||||
# NOTE: Must bump minor version if any shlib's are removed from the
|
||||
@ -39,7 +38,6 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MOZILLA_VERSION}/source/
|
||||
DISTNAME = firefox-${MOZILLA_VERSION}.source
|
||||
REVISION = 0
|
||||
|
||||
MODULES = www/mozilla devel/gettext lang/python
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (firefox-3.5.16.source.tar.bz2) = uf3bD5YPYx89fKom09Uv5A==
|
||||
RMD160 (firefox-3.5.16.source.tar.bz2) = iUXUt5UsIvCvVsn4vQA9VQZ54Hk=
|
||||
SHA1 (firefox-3.5.16.source.tar.bz2) = JajzjGeg/Fa0dSV/6FamV5Y2Kbg=
|
||||
SHA256 (firefox-3.5.16.source.tar.bz2) = mduaZN0RBm8O0EDofwM61TxRYO1SSv0vsaFNs2YOx70=
|
||||
SIZE (firefox-3.5.16.source.tar.bz2) = 47573612
|
||||
MD5 (firefox-3.5.17.source.tar.bz2) = 1o1ZCSgrvu6ovlATmFBQUA==
|
||||
RMD160 (firefox-3.5.17.source.tar.bz2) = ZHq1IiQ+4BnkN1WobgOVdj2DrC8=
|
||||
SHA1 (firefox-3.5.17.source.tar.bz2) = m/fcaKlTJ4W8j6n72kxLGN8kZC0=
|
||||
SHA256 (firefox-3.5.17.source.tar.bz2) = LMmPgqotMw63AGZax7GLhcaiPMB/rF1Sjvbif++EJsE=
|
||||
SIZE (firefox-3.5.17.source.tar.bz2) = 47567011
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-gfx_src_psshared_nsCUPSShim_cpp,v 1.2 2011/01/05 08:22:30 dcoppa Exp $
|
||||
--- gfx/src/psshared/nsCUPSShim.cpp.orig Sun Dec 26 11:07:52 2010
|
||||
+++ gfx/src/psshared/nsCUPSShim.cpp Sun Dec 26 11:08:25 2010
|
||||
$OpenBSD: patch-gfx_src_psshared_nsCUPSShim_cpp,v 1.3 2011/03/02 14:41:09 landry Exp $
|
||||
--- gfx/src/psshared/nsCUPSShim.cpp.orig Wed Mar 2 10:39:37 2011
|
||||
+++ gfx/src/psshared/nsCUPSShim.cpp Wed Mar 2 10:39:42 2011
|
||||
@@ -59,7 +59,7 @@ static const int gSymNameCt = sizeof(gSymName) / sizeo
|
||||
PRBool
|
||||
nsCUPSShim::Init()
|
||||
@ -10,14 +10,3 @@ $OpenBSD: patch-gfx_src_psshared_nsCUPSShim_cpp,v 1.2 2011/01/05 08:22:30 dcoppa
|
||||
if (!mCupsLib)
|
||||
return PR_FALSE;
|
||||
|
||||
@@ -87,10 +87,4 @@ nsCUPSShim::Init()
|
||||
}
|
||||
}
|
||||
return PR_TRUE;
|
||||
-}
|
||||
-
|
||||
-nsCUPSShim::~nsCUPSShim()
|
||||
-{
|
||||
- if (mCupsLib)
|
||||
- PR_UnloadLibrary(mCupsLib);
|
||||
}
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-gfx_src_psshared_nsCUPSShim_h,v 1.1 2011/01/05 08:22:30 dcoppa Exp $
|
||||
--- gfx/src/psshared/nsCUPSShim.h.orig Fri Dec 3 16:48:03 2010
|
||||
+++ gfx/src/psshared/nsCUPSShim.h Sun Dec 26 11:09:25 2010
|
||||
@@ -86,7 +86,6 @@ struct PRLibrary;
|
||||
class NS_PSSHARED nsCUPSShim {
|
||||
public:
|
||||
nsCUPSShim() : mCupsLib(nsnull) { }
|
||||
- ~nsCUPSShim();
|
||||
|
||||
/**
|
||||
* Initialize this object. Attempt to load the CUPS shared
|
||||
@ -1,53 +0,0 @@
|
||||
$OpenBSD: patch-gfx_src_psshared_nsPSPrinters_cpp,v 1.1 2011/01/05 08:22:30 dcoppa Exp $
|
||||
--- gfx/src/psshared/nsPSPrinters.cpp.orig Tue Nov 30 14:49:19 2010
|
||||
+++ gfx/src/psshared/nsPSPrinters.cpp Mon Jan 3 16:24:18 2011
|
||||
@@ -45,6 +45,7 @@
|
||||
#include "nsPrintfCString.h"
|
||||
#include "nsPSPrinters.h"
|
||||
#include "nsReadableUtils.h" // StringBeginsWith()
|
||||
+#include "nsCUPSShim.h"
|
||||
|
||||
#include "prlink.h"
|
||||
#include "prenv.h"
|
||||
@@ -56,6 +57,8 @@
|
||||
/* 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()
|
||||
@@ -70,8 +73,8 @@ nsPSPrinterList::Init()
|
||||
// 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;
|
||||
}
|
||||
|
||||
@@ -99,10 +102,10 @@ nsPSPrinterList::GetPrinterList(nsCStringArray& aList)
|
||||
|
||||
// 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);
|
||||
@@ -117,7 +120,7 @@ nsPSPrinterList::GetPrinterList(nsCStringArray& aList)
|
||||
aList.AppendCString(fullName);
|
||||
}
|
||||
}
|
||||
- (mCups.mCupsFreeDests)(num_dests, dests);
|
||||
+ (gCupsShim.mCupsFreeDests)(num_dests, dests);
|
||||
}
|
||||
|
||||
// Build the "classic" list of printers -- those accessed by running
|
||||
@ -1,19 +0,0 @@
|
||||
$OpenBSD: patch-gfx_src_psshared_nsPSPrinters_h,v 1.1 2011/01/05 08:22:30 dcoppa Exp $
|
||||
--- gfx/src/psshared/nsPSPrinters.h.orig Tue Nov 30 14:49:19 2010
|
||||
+++ gfx/src/psshared/nsPSPrinters.h Mon Jan 3 16:24:18 2011
|
||||
@@ -42,7 +42,6 @@
|
||||
#include "nsString.h"
|
||||
#include "nsVoidArray.h"
|
||||
#include "prtypes.h"
|
||||
-#include "nsCUPSShim.h"
|
||||
#include "psSharedCore.h"
|
||||
|
||||
class nsIPrefService;
|
||||
@@ -96,7 +95,6 @@ class NS_PSSHARED nsPSPrinterList {
|
||||
private:
|
||||
nsCOMPtr<nsIPrefService> mPrefSvc;
|
||||
nsCOMPtr<nsIPrefBranch> mPref;
|
||||
- nsCUPSShim mCups;
|
||||
};
|
||||
|
||||
#endif /* nsPSPrinters_h___ */
|
||||
Loading…
Reference in New Issue
Block a user