Browse files

mail/thunderbird 6.0.2 before changes

  • Loading branch information...
1 parent bd1a5e3 commit 8e03899f44ddb6c3982af840922a4a4c20cad6bf Nigel Taylor committed Sep 6, 2011
View
13 mail/mozilla-thunderbird/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.134 2011/08/24 06:19:51 landry Exp $
+# $OpenBSD: Makefile,v 1.135 2011/09/06 19:42:53 landry Exp $
COMMENT-main = Mozilla e-mail, rss and usenet client
COMMENT-lightning = Mozilla Thunderbird calendar extension
@@ -8,21 +8,22 @@ BROKEN-sparc64 = https://bugzilla.mozilla.org/show_bug.cgi?id=577056
# Don't forget to bump mail/thunderbird-i18n after updates.
# Don't forget to update productivity/sunbird if patches changes.
-MOZILLA_VERSION = 6.0
+MOZILLA_VERSION = 6.0.2
MOZILLA_BRANCH = release
MOZILLA_PROJECT = thunderbird
MOZILLA_CODENAME = mail
MULTI_PACKAGES = -main -lightning -enigmail
PKGNAME-main = ${PKGNAME}
PKGNAME-lightning = lightning-1.0beta5
-PKGNAME-enigmail = enigmail-1.3.1
-REVISION-main = 0
+PKGNAME-enigmail = enigmail-1.3
+REVISION-enigmail = 0
+REVISION-lightning = 0
EPOCH-lightning = 0
MASTER_SITES0 = http://www.mozilla-enigmail.org/download/source/
DISTFILES += ${MOZILLA_PROJECT}-${MOZILLA_VERSION}.source.tar.bz2 \
- enigmail-1.3.1.tar.gz:0
+ enigmail-1.3.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
@@ -99,7 +100,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.4-openbsd-${GNU_ARCH} {847b3a00-7ab1-11d4-8f02-006008948af5}
+ ../bin/enigmail-1.2-openbsd-${GNU_ARCH} {847b3a00-7ab1-11d4-8f02-006008948af5}
EXTDIR = ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/
post-install:
View
2 mail/mozilla-thunderbird/UPDATE
@@ -3,4 +3,4 @@ bug 681026, this causes hungs under certain conditions.
Enigmail v1.3 has been updated to v1.3.1.
-Tested on amd64.
+To be Tested on amd64.
View
20 mail/mozilla-thunderbird/distinfo
@@ -1,10 +1,10 @@
-MD5 (mozilla/enigmail-1.3.1.tar.gz) = TNf1q81/CWDC9AuG9jrUcQ==
-MD5 (mozilla/thunderbird-6.0.source.tar.bz2) = msdB0jjpV5DN61Ii6bI66A==
-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.1.tar.gz) = jILzgccy9nHh9KplJyPcLND6+fg=
-SHA1 (mozilla/thunderbird-6.0.source.tar.bz2) = ep6mKqEVIiMDJ1dLJFoveTAVtfQ=
-SHA256 (mozilla/enigmail-1.3.1.tar.gz) = sjbciZXEi6fE3Fjle633v3KhzQXpFlcXz1MsfqOmrZc=
-SHA256 (mozilla/thunderbird-6.0.source.tar.bz2) = PFavRI69SAXHmX2ODkH0Mz0RCtLErUhzIEvU1ou9gYk=
-SIZE (mozilla/enigmail-1.3.1.tar.gz) = 1361839
-SIZE (mozilla/thunderbird-6.0.source.tar.bz2) = 86286245
+MD5 (mozilla/enigmail-1.3.tar.gz) = thdTPNviQynRGE45PTQJUg==
+MD5 (mozilla/thunderbird-6.0.2.source.tar.bz2) = kXpmf+Ic/RAwktvCOhEhkg==
+RMD160 (mozilla/enigmail-1.3.tar.gz) = u5Jb6k62t4KsfOPDbhT6faawhZ0=
+RMD160 (mozilla/thunderbird-6.0.2.source.tar.bz2) = KZm1q+vE8br9Q1H7sQIWW6AJGGA=
+SHA1 (mozilla/enigmail-1.3.tar.gz) = zuPOkNHsOAISEsI6ivf+t8epCT8=
+SHA1 (mozilla/thunderbird-6.0.2.source.tar.bz2) = NkoT3eZYr9vbQG15MlmFBsTIvng=
+SHA256 (mozilla/enigmail-1.3.tar.gz) = Q0VyLvF40XfM3Ry68ySXNX1j6c8NTRHlpXnt0vIIMH4=
+SHA256 (mozilla/thunderbird-6.0.2.source.tar.bz2) = TyrnBQMyJOZb/XadwBInnBI2tQ0XMxDZ+jfIinT8Q4c=
+SIZE (mozilla/enigmail-1.3.tar.gz) = 1379908
+SIZE (mozilla/thunderbird-6.0.2.source.tar.bz2) = 86083204
View
27 mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_xre_glxtest_cpp
@@ -0,0 +1,27 @@
+$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);
+ }
View
12 mail/mozilla-thunderbird/patches/patch-mozilla_widget_public_nsIGfxInfo_idl
@@ -1,12 +0,0 @@
-$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();
- };
-
View
13 mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_xpwidgets_GfxInfoBase_h
@@ -1,13 +0,0 @@
-$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:
-
View
20 mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_xpwidgets_GfxInfoX11_h
@@ -1,20 +0,0 @@
-$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
View
45 mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_xpwidgets_nsBaseWidget_cpp
@@ -1,45 +0,0 @@
-$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 8e03899

Please sign in to comment.