aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory A. Pratt <anarchy@gentoo.org>2010-07-31 15:57:29 -0500
committerJory A. Pratt <anarchy@gentoo.org>2010-07-31 15:57:29 -0500
commit7b01b81ecc31154b9d9583b725ab0aff1fc6dd0f (patch)
treeeb091b6568430b8362ac648eceb543c870a31945 /x11-plugins/enigmail
parentFixup patchset and install dir, install to /usr/$(get_libdir)/${PN} (diff)
downloadmozilla-7b01b81ecc31154b9d9583b725ab0aff1fc6dd0f.tar.gz
mozilla-7b01b81ecc31154b9d9583b725ab0aff1fc6dd0f.tar.bz2
mozilla-7b01b81ecc31154b9d9583b725ab0aff1fc6dd0f.zip
do not forget to include js fixup
Diffstat (limited to 'x11-plugins/enigmail')
-rw-r--r--x11-plugins/enigmail/Manifest3
-rw-r--r--x11-plugins/enigmail/enigmail-1.1.2-r2.ebuild3
-rw-r--r--x11-plugins/enigmail/files/75_enigmai-js-fixup.patch27
3 files changed, 29 insertions, 4 deletions
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 4f473add..d3ad07e5 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,5 +1,6 @@
AUX 70_enigmail-fix.patch 343 RMD160 a81caaa4cb6507b5a41b2593e26b984c8748a8b8 SHA1 7028cd7cf09c60325887fd0fb68a20ba3bb98b12 SHA256 895c5ffec6aa321290115f2c995658ae87f9bde027ac0414e5d76a7c9d451165
+AUX 75_enigmai-js-fixup.patch 1260 RMD160 b89620f3495a286c1e5636b0c65b423d3a158944 SHA1 033b817e08acd35c9d4e943b24f07d9191900912 SHA256 66e3e9ddce9d191ce1417e364757f1d35873f031abd94c817e069249d18a3dd3
DIST enigmail-1.1.2.tar.gz 1280923 RMD160 2c1fa3494c1c2458635a3d68929ce7ff8fdb48e7 SHA1 d29fce2b20a36d210b12c28fcbbee965007c95aa SHA256 dd6206f6622081b595d7bde7aaa8f63ca2c3f9db2acd13c751c7dd941def9e41
DIST thunderbird-3.1-patches-0.2.tar.bz2 2739 RMD160 f08e89bfc22cc7ffa2c3b39401e197d73ec2df96 SHA1 91fd6da678a2130cb097dacd0603389bdf9bebc0 SHA256 a09064811e928f1c0ca8b2556f3ccfb0cedfa5569e908d1b11cdd1d0e952c9ba
DIST thunderbird-3.1.1.source.tar.bz2 65820406 RMD160 f7c635610eace54a29601a796f8f5e34bc7d198e SHA1 8e25fd786fbe094c3f4d9bc4e18285701bd42279 SHA256 206a0fb7d9464b5e3b46c8ad5f1b76fd3de88858236dd5f9b7082f5b893e955d
-EBUILD enigmail-1.1.2-r2.ebuild 4291 RMD160 a419c4857dfd7dbf864b78eb654d09c9801d8fef SHA1 ae403a79a94d287621d6fe1edfe7aec01514d940 SHA256 3ef0e828f254c057717251ad52b31033a1fe120e3113b5d6781cea8fea7f6ed3
+EBUILD enigmail-1.1.2-r2.ebuild 4205 RMD160 bda2692c270114729d21be74f974c566714a0e12 SHA1 aa413fde77a9bc2852e6ddac03547f9016bb7479 SHA256 d062257c787174aa14b4e7170bbf0c9e6a35c3997019519b325c46f6b4f2d5c4
diff --git a/x11-plugins/enigmail/enigmail-1.1.2-r2.ebuild b/x11-plugins/enigmail/enigmail-1.1.2-r2.ebuild
index 6289d2fb..cf970787 100644
--- a/x11-plugins/enigmail/enigmail-1.1.2-r2.ebuild
+++ b/x11-plugins/enigmail/enigmail-1.1.2-r2.ebuild
@@ -56,9 +56,6 @@ src_prepare(){
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"
- # ARM fixes, bug 327783
- epatch "${FILESDIR}/thunderbird-xul-1.9.2-arm-fixes.patch"
-
cd mozilla
eautoreconf
cd js/src
diff --git a/x11-plugins/enigmail/files/75_enigmai-js-fixup.patch b/x11-plugins/enigmail/files/75_enigmai-js-fixup.patch
new file mode 100644
index 00000000..8e85cfcc
--- /dev/null
+++ b/x11-plugins/enigmail/files/75_enigmai-js-fixup.patch
@@ -0,0 +1,27 @@
+--- mailnews/extensions/enigmail/package/enigmail.js 2010-06-26 19:51:30.000000000 +0200
++++ mailnews/extensions/enigmail/package/enigmail.js 2010-07-10 17:34:46.000000000 +0200
+@@ -1231,7 +1231,10 @@ function () {
+ .getInstallLocation(ENIGMAIL_EXTENSION_ID);
+ var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
+ extensionLoc.append("gpg-agent-wrapper.sh");
+- extensionLoc.permissions=0755;
++ try {
++ extensionLoc.permissions=0755;
++ }
++ catch(ex) {}
+ agentProcess = Components.classes[NS_PROCESS_UTIL_CONTRACTID].createInstance(Components.interfaces.nsIProcess);
+ agentProcess.init(extensionLoc);
+ agentProcess.run(true, [ "stop", this.gpgAgentProcess ], 2);
+@@ -1758,7 +1761,10 @@ function (domWindow) {
+ .getInstallLocation(ENIGMAIL_EXTENSION_ID);
+ var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
+ extensionLoc.append("gpg-agent-wrapper.sh");
+- extensionLoc.permissions=0755;
++ try {
++ extensionLoc.permissions=0755;
++ }
++ catch(ex) {}
+ args.unshift(command.path);
+ args.unshift("start");
+ command = extensionLoc;
+