Permalink
Browse files

tb6 bug fix 681026 enigmail v1.3.1

  • Loading branch information...
1 parent b81c2be commit bec8d9950d2efd74a853386d421d5aa483b3e62e Nigel Taylor committed Aug 27, 2011
@@ -16,12 +16,13 @@ MOZILLA_CODENAME = mail
MULTI_PACKAGES = -main -lightning -enigmail
PKGNAME-main = ${PKGNAME}
PKGNAME-lightning = lightning-1.0beta5
-PKGNAME-enigmail = enigmail-1.3
+PKGNAME-enigmail = enigmail-1.3.1
+REVISION-main = 0
EPOCH-lightning = 0
MASTER_SITES0 = http://www.mozilla-enigmail.org/download/source/
DISTFILES += ${MOZILLA_PROJECT}-${MOZILLA_VERSION}.source.tar.bz2 \
- enigmail-1.3.tar.gz:0
+ enigmail-1.3.1.tar.gz:0
EXTRACT_CASES = enigmail-*.tar.gz) ${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | tar -C comm-${MOZILLA_BRANCH}/mailnews/extensions/ -xf -;;
SO_VERSION = 19.0
@@ -98,7 +99,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/
post-install:
@@ -1,10 +1,10 @@
-MD5 (mozilla/enigmail-1.3.tar.gz) = thdTPNviQynRGE45PTQJUg==
+MD5 (mozilla/enigmail-1.3.1.tar.gz) = TNf1q81/CWDC9AuG9jrUcQ==
MD5 (mozilla/thunderbird-6.0.source.tar.bz2) = msdB0jjpV5DN61Ii6bI66A==
-RMD160 (mozilla/enigmail-1.3.tar.gz) = u5Jb6k62t4KsfOPDbhT6faawhZ0=
+RMD160 (mozilla/enigmail-1.3.1.tar.gz) = P+F4okTmunrst4Brv9wDWm+sNhA=
RMD160 (mozilla/thunderbird-6.0.source.tar.bz2) = dYonTsKxKrpSV0kizZUm/TWWpQU=
-SHA1 (mozilla/enigmail-1.3.tar.gz) = zuPOkNHsOAISEsI6ivf+t8epCT8=
+SHA1 (mozilla/enigmail-1.3.1.tar.gz) = jILzgccy9nHh9KplJyPcLND6+fg=
SHA1 (mozilla/thunderbird-6.0.source.tar.bz2) = ep6mKqEVIiMDJ1dLJFoveTAVtfQ=
-SHA256 (mozilla/enigmail-1.3.tar.gz) = Q0VyLvF40XfM3Ry68ySXNX1j6c8NTRHlpXnt0vIIMH4=
+SHA256 (mozilla/enigmail-1.3.1.tar.gz) = sjbciZXEi6fE3Fjle633v3KhzQXpFlcXz1MsfqOmrZc=
SHA256 (mozilla/thunderbird-6.0.source.tar.bz2) = PFavRI69SAXHmX2ODkH0Mz0RCtLErUhzIEvU1ou9gYk=
-SIZE (mozilla/enigmail-1.3.tar.gz) = 1379908
+SIZE (mozilla/enigmail-1.3.1.tar.gz) = 1361839
SIZE (mozilla/thunderbird-6.0.source.tar.bz2) = 86286245
@@ -1,27 +0,0 @@
-$OpenBSD: patch-mozilla_toolkit_xre_glxtest_cpp,v 1.1 2011/08/23 20:19:33 landry Exp $
-https://bugzilla.mozilla.org/show_bug.cgi?id=681026
---- mozilla/toolkit/xre/glxtest.cpp.orig Fri Aug 12 16:16:45 2011
-+++ mozilla/toolkit/xre/glxtest.cpp Mon Aug 22 22:12:40 2011
-@@ -51,6 +51,8 @@
- // which runs the glxtest() static function. This creates a X connection, a GLX context, calls glGetString, and writes that
- // to the 'write' end of the pipe.
-
-+#include <sys/types.h>
-+#include <sys/wait.h>
- #include <cstdio>
- #include <cstdlib>
- #include <unistd.h>
-@@ -224,6 +226,7 @@ static void glxtest()
- void fire_glxtest_process()
- {
- int pfd[2];
-+ int status;
- if (pipe(pfd) == -1) {
- perror("pipe");
- exit(EXIT_FAILURE);
-@@ -244,4 +247,5 @@ void fire_glxtest_process()
- close(pfd[1]);
- mozilla::widget::glxtest_pipe = pfd[0];
- mozilla::widget::glxtest_pid = pid;
-+ waitpid(pid, &status, 0);
- }
@@ -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 bec8d99

Please sign in to comment.