forked from jasperla/openbsd-wip
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Seamonkey bug fix 681026 and enigmail for seamonkey v1.3 update to v1…
….3.1
- Loading branch information
Nigel Taylor
committed
Aug 29, 2011
1 parent
b330e93
commit f1a9b96
Showing
6 changed files
with
100 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,8 @@ MOZILLA_CODENAME = suite | |
| MULTI_PACKAGES = -main -lightning -enigmail | ||
| PKGNAME-main = ${PKGNAME} | ||
| PKGNAME-lightning = lightning-seamonkey-1.0beta5 | ||
| PKGNAME-enigmail = enigmail-seamonkey-1.3 | ||
| PKGNAME-enigmail = enigmail-seamonkey-1.3.1 | ||
| REVISION-main = 0 | ||
| EPOCH-lightning = 0 | ||
| REVISION-lightning = 0 | ||
|
|
||
|
|
@@ -58,11 +59,11 @@ LANGUAGES= ca \ | |
| tr | ||
|
|
||
| EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \ | ||
| enigmail-1.3.tar.gz | ||
| enigmail-1.3.1.tar.gz | ||
| EXTRACT_CASES = enigmail-*.tar.gz) ${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | tar -C comm-${MOZILLA_BRANCH}/mailnews/extensions/ -xf -;; | ||
|
|
||
| DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \ | ||
| enigmail-1.3.tar.gz:1 | ||
| enigmail-1.3.1.tar.gz:1 | ||
| .for language in ${LANGUAGES} | ||
| DISTFILES+= seamonkey-${MOZILLA_VERSION}.${language}.langpack.xpi:0 | ||
| .endfor | ||
|
|
@@ -112,7 +113,7 @@ GNU_ARCH = ${MACHINE_ARCH:S/amd64/x86_64/} | |
| GUIDS = gdata-provider {a62ef8ec-5fdc-40c2-873c-223b8a6925cc} \ | ||
| lightning {e2fda1a4-762b-4020-b5ad-a41df1933103} \ | ||
| calendar-timezones [email protected] \ | ||
| ../bin/enigmail-1.2-openbsd-${GNU_ARCH} {847b3a00-7ab1-11d4-8f02-006008948af5} | ||
| ../bin/enigmail-1.4-openbsd-${GNU_ARCH} {847b3a00-7ab1-11d4-8f02-006008948af5} | ||
|
|
||
| EXTDIR = ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/ | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
www/seamonkey/patches/patch-mozilla_widget_public_nsIGfxInfo_idl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| $OpenBSD$ | ||
| --- mozilla/widget/public/nsIGfxInfo.idl.orig Fri Aug 12 15:16:45 2011 | ||
| +++ mozilla/widget/public/nsIGfxInfo.idl Fri Aug 26 15:38:17 2011 | ||
| @@ -131,5 +131,8 @@ interface nsIGfxInfo : nsISupports | ||
| * underlying GL impl that's used to implement WebGL. | ||
| */ | ||
| DOMString getWebGLParameter(in DOMString aParam); | ||
| + | ||
| + // only useful on X11 | ||
| + [notxpcom] void GetData(); | ||
| }; | ||
|
|
13 changes: 13 additions & 0 deletions
13
www/seamonkey/patches/patch-mozilla_widget_src_xpwidgets_GfxInfoBase_h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| $OpenBSD$ | ||
| --- mozilla/widget/src/xpwidgets/GfxInfoBase.h.orig Fri Aug 12 15:16:46 2011 | ||
| +++ mozilla/widget/src/xpwidgets/GfxInfoBase.h Fri Aug 26 15:38:17 2011 | ||
| @@ -84,6 +84,9 @@ class GfxInfoBase : public nsIGfxInfo, (public) | ||
| // Ideally, Init() would be void-return, but the rules of | ||
| // NS_GENERIC_FACTORY_CONSTRUCTOR_INIT require it be nsresult return. | ||
| virtual nsresult Init(); | ||
| + | ||
| + // only useful on X11 | ||
| + virtual void GetData() {} | ||
|
|
||
| protected: | ||
|
|
20 changes: 20 additions & 0 deletions
20
www/seamonkey/patches/patch-mozilla_widget_src_xpwidgets_GfxInfoX11_h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| $OpenBSD$ | ||
| --- mozilla/widget/src/xpwidgets/GfxInfoX11.h.orig Fri Aug 12 15:16:46 2011 | ||
| +++ mozilla/widget/src/xpwidgets/GfxInfoX11.h Fri Aug 26 15:43:26 2011 | ||
| @@ -68,6 +68,8 @@ class GfxInfo : public GfxInfoBase (public) | ||
|
|
||
| virtual nsresult Init(); | ||
|
|
||
| + virtual void GetData(); | ||
| + | ||
| protected: | ||
|
|
||
| virtual nsresult GetFeatureStatusImpl(PRInt32 aFeature, PRInt32 *aStatus, nsAString & aSuggestedDriverVersion, GfxDriverInfo* aDriverInfo = nsnull); | ||
| @@ -81,7 +83,6 @@ class GfxInfo : public GfxInfoBase (public) | ||
| int mMajorVersion, mMinorVersion; | ||
|
|
||
| void AddCrashReportAnnotations(); | ||
| - void GetData(); | ||
| }; | ||
|
|
||
| } // namespace widget |
45 changes: 45 additions & 0 deletions
45
www/seamonkey/patches/patch-mozilla_widget_src_xpwidgets_nsBaseWidget_cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| $OpenBSD$ | ||
| --- mozilla/widget/src/xpwidgets/nsBaseWidget.cpp.orig Fri Aug 12 15:16:46 2011 | ||
| +++ mozilla/widget/src/xpwidgets/nsBaseWidget.cpp Fri Aug 26 15:38:17 2011 | ||
| @@ -828,21 +828,33 @@ nsBaseWidget::GetShouldAccelerate() | ||
| if (xr) | ||
| xr->GetInSafeMode(&safeMode); | ||
|
|
||
| - if (disableAcceleration || safeMode) | ||
| - return PR_FALSE; | ||
| + bool whitelisted = false; | ||
|
|
||
| - if (forceAcceleration) | ||
| - return PR_TRUE; | ||
| - | ||
| nsCOMPtr<nsIGfxInfo> gfxInfo = do_GetService("@mozilla.org/gfx/info;1"); | ||
| if (gfxInfo) { | ||
| + // bug 655578: on X11 at least, we must always call GetData (even if we don't need that information) | ||
| + // as that's what causes GfxInfo initialization which kills the zombie 'glxtest' process. | ||
| + // initially we relied on the fact that GetFeatureStatus calls GetData for us, but bug 681026 showed | ||
| + // that assumption to be unsafe. | ||
| + gfxInfo->GetData(); | ||
| + | ||
| PRInt32 status; | ||
| if (NS_SUCCEEDED(gfxInfo->GetFeatureStatus(nsIGfxInfo::FEATURE_OPENGL_LAYERS, &status))) { | ||
| - if (status != nsIGfxInfo::FEATURE_NO_INFO) { | ||
| - NS_WARNING("OpenGL-accelerated layers are not supported on this system."); | ||
| - return PR_FALSE; | ||
| + if (status == nsIGfxInfo::FEATURE_NO_INFO) { | ||
| + whitelisted = true; | ||
| } | ||
| } | ||
| + } | ||
| + | ||
| + if (disableAcceleration || safeMode) | ||
| + return PR_FALSE; | ||
| + | ||
| + if (forceAcceleration) | ||
| + return PR_TRUE; | ||
| + | ||
| + if (!whitelisted) { | ||
| + NS_WARNING("OpenGL-accelerated layers are not supported on this system."); | ||
| + return PR_FALSE; | ||
| } | ||
|
|
||
| if (accelerateByDefault) |