Permalink
Browse files

Seamonkey bug fix 681026 and enigmail for seamonkey v1.3 update to v1…

….3.1
  • Loading branch information...
1 parent b330e93 commit f1a9b963beb9bdbf3b66e04866a419746b6f5ff8 Nigel Taylor committed Aug 29, 2011
View
@@ -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 calendar-timezones@mozilla.org \
- ../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/
View
@@ -1,4 +1,4 @@
-MD5 (mozilla/enigmail-1.3.tar.gz) = thdTPNviQynRGE45PTQJUg==
+MD5 (mozilla/enigmail-1.3.1.tar.gz) = TNf1q81/CWDC9AuG9jrUcQ==
MD5 (mozilla/seamonkey-2.3.1.ca.langpack.xpi) = aNN/KXT8+KSnFReGlT5RcA==
MD5 (mozilla/seamonkey-2.3.1.cs.langpack.xpi) = awBzUydVy8H0flzcCh66Cw==
MD5 (mozilla/seamonkey-2.3.1.de.langpack.xpi) = qOPwdia23oyP71LJYAuGmA==
@@ -21,7 +21,7 @@ MD5 (mozilla/seamonkey-2.3.1.sk.langpack.xpi) = zmpapBqrTavdYdwlXASREw==
MD5 (mozilla/seamonkey-2.3.1.source.tar.bz2) = cll3Q6wYi+d1ArVZ8QgsJQ==
MD5 (mozilla/seamonkey-2.3.1.sv-SE.langpack.xpi) = tvet3d0Cod0Fv66GLpCUnQ==
MD5 (mozilla/seamonkey-2.3.1.tr.langpack.xpi) = Ypmurpk0TGBj1iMnpjRCTQ==
-RMD160 (mozilla/enigmail-1.3.tar.gz) = u5Jb6k62t4KsfOPDbhT6faawhZ0=
+RMD160 (mozilla/enigmail-1.3.1.tar.gz) = P+F4okTmunrst4Brv9wDWm+sNhA=
RMD160 (mozilla/seamonkey-2.3.1.ca.langpack.xpi) = +ja2YFV5qI8W2Fgs0iIpM2f+xm0=
RMD160 (mozilla/seamonkey-2.3.1.cs.langpack.xpi) = vzeIN9mp4cg1iRxBGcJaq0HTZwo=
RMD160 (mozilla/seamonkey-2.3.1.de.langpack.xpi) = TdXYLgLfaytPqwUQRwxpHdKwd/E=
@@ -44,7 +44,7 @@ RMD160 (mozilla/seamonkey-2.3.1.sk.langpack.xpi) = vOw42QHC4wRyebg+V5/AotqSGTA=
RMD160 (mozilla/seamonkey-2.3.1.source.tar.bz2) = clcB88nmy/y6GwNP2tf00MqvGo4=
RMD160 (mozilla/seamonkey-2.3.1.sv-SE.langpack.xpi) = /9BW4IuJnRJpiraS1m4ZkP6dU/A=
RMD160 (mozilla/seamonkey-2.3.1.tr.langpack.xpi) = QTz6jWTSnlW9qh3JqU8TPwO1qAg=
-SHA1 (mozilla/enigmail-1.3.tar.gz) = zuPOkNHsOAISEsI6ivf+t8epCT8=
+SHA1 (mozilla/enigmail-1.3.1.tar.gz) = jILzgccy9nHh9KplJyPcLND6+fg=
SHA1 (mozilla/seamonkey-2.3.1.ca.langpack.xpi) = YE/WvqR3WQ36ieW6gsdm8fkKrdo=
SHA1 (mozilla/seamonkey-2.3.1.cs.langpack.xpi) = VrKiS5LAtA/dscPogqEIV1BRUVk=
SHA1 (mozilla/seamonkey-2.3.1.de.langpack.xpi) = COwgORm3lNKYj9G7aLY+xIDSAb0=
@@ -67,7 +67,7 @@ SHA1 (mozilla/seamonkey-2.3.1.sk.langpack.xpi) = SyXFFlUinXbLpea90kdyltgIbJQ=
SHA1 (mozilla/seamonkey-2.3.1.source.tar.bz2) = xfZHx36lk01Q68v8sIuQX4L5hEY=
SHA1 (mozilla/seamonkey-2.3.1.sv-SE.langpack.xpi) = I+KnV/puixxj3C33IuoLQZ+IeeU=
SHA1 (mozilla/seamonkey-2.3.1.tr.langpack.xpi) = WZKF70vj3lJGOyHTyh/6BFPr2dg=
-SHA256 (mozilla/enigmail-1.3.tar.gz) = Q0VyLvF40XfM3Ry68ySXNX1j6c8NTRHlpXnt0vIIMH4=
+SHA256 (mozilla/enigmail-1.3.1.tar.gz) = sjbciZXEi6fE3Fjle633v3KhzQXpFlcXz1MsfqOmrZc=
SHA256 (mozilla/seamonkey-2.3.1.ca.langpack.xpi) = TkdAyaatQUfm36ULTndX5WVY1HhJcQLHl+CJ2C4Xeu0=
SHA256 (mozilla/seamonkey-2.3.1.cs.langpack.xpi) = 4/cF6vg31LIZ58sPQblC8EUGb4CQ5/ESM1RL2OlD1IY=
SHA256 (mozilla/seamonkey-2.3.1.de.langpack.xpi) = /pEGDfvUxP6ElIUfQO+pkB98DoIApVoBJgqCWFdDe3Y=
@@ -90,7 +90,7 @@ SHA256 (mozilla/seamonkey-2.3.1.sk.langpack.xpi) = t4W2gnyRc+mqvJk38s2TvkijdD/WC
SHA256 (mozilla/seamonkey-2.3.1.source.tar.bz2) = kCJW2rFoQ7ZpBQCbYOhM0t5CUiMZiGQlYCDBoZW70GE=
SHA256 (mozilla/seamonkey-2.3.1.sv-SE.langpack.xpi) = FrPQfeuxcglj755VYH1G5G39u+vy6O4qQdYhhCn8SRY=
SHA256 (mozilla/seamonkey-2.3.1.tr.langpack.xpi) = sgKQ7mys8su92jj+5vwe685UXw+mHQntdd1e5N9Sz/A=
-SIZE (mozilla/enigmail-1.3.tar.gz) = 1379908
+SIZE (mozilla/enigmail-1.3.1.tar.gz) = 1361839
SIZE (mozilla/seamonkey-2.3.1.ca.langpack.xpi) = 812150
SIZE (mozilla/seamonkey-2.3.1.cs.langpack.xpi) = 815820
SIZE (mozilla/seamonkey-2.3.1.de.langpack.xpi) = 858159
@@ -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();
+ };
+
@@ -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:
+
@@ -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
@@ -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)

0 comments on commit f1a9b96

Please sign in to comment.