c34d58f59f
- Fixes MFSA 2012-12->19 - see http://www.seamonkey-project.org/releases/seamonkey2.8/ - complete patchset for #691898, still fixes build on ppc (and hopefully commited in firefox 14...) - add patchset from #706955, workarounds #669050 (xpcshell hangs during make install and chokes on CSPUtils.csm, threads related..) - remove obsolete/commited patches
33 lines
1.7 KiB
Plaintext
33 lines
1.7 KiB
Plaintext
$OpenBSD: patch-mailnews_extensions_enigmail_genxpi,v 1.4 2012/03/16 21:38:33 landry Exp $
|
|
Remove ABI=xxx marker and xpcomAbi from lib naming.
|
|
--- mailnews/extensions/enigmail/genxpi.orig Mon Aug 15 17:59:15 2011
|
|
+++ mailnews/extensions/enigmail/genxpi Tue Sep 27 18:59:33 2011
|
|
@@ -62,7 +62,7 @@ cd "$cwd"
|
|
if [ "$xpcomAbi" = "" ] ; then
|
|
xpcomAbi="unknown"
|
|
fi
|
|
-platform=${osArch}_${xpcomAbi}
|
|
+platform=${osArch}
|
|
# Pepare install.rdf
|
|
sed 's/<!-- targetPlatform placeholder -->/<em:targetPlatform>'${platform}'<\/em:targetPlatform>/' < ${srcDir}/package/install.rdf > ${targetDir}/install.rdf
|
|
|
|
@@ -74,14 +74,14 @@ if [ ${platform} = OS2_x86-gcc3 ]; then
|
|
enigDllFile=platform/${platform}/components/${enigmimeDll}
|
|
ipcDllFile=platform/${platform}/components/${ipcDll}
|
|
else
|
|
- enigDllFile=platform/${platform}/components/${libPrefix}enigmime-${xpcomAbi}${dllSuffix}
|
|
- ipcDllFile=platform/${platform}/components/${libPrefix}ipc-${xpcomAbi}${dllSuffix}
|
|
+ enigDllFile=platform/${platform}/components/${libPrefix}enigmime${dllSuffix}
|
|
+ ipcDllFile=platform/${platform}/components/${libPrefix}ipc${dllSuffix}
|
|
fi
|
|
|
|
# Prepare chrome.manifest
|
|
cat ${srcDir}/package/chrome.manifest | \
|
|
-sed 's/##ENIGMIMEDLL-PLACEHOLDER##/binary-component platform\/'${platform}'\/components\/'`basename ${enigDllFile}`' ABI='${platform}'/' | \
|
|
-sed 's/##IPCDLL-PLACEHOLDER##/binary-component platform\/'${platform}'\/components\/'`basename ${ipcDllFile}`' ABI='${platform}'/' \
|
|
+sed 's/##ENIGMIMEDLL-PLACEHOLDER##/binary-component platform\/'${platform}'\/components\/'`basename ${enigDllFile}`'/' | \
|
|
+sed 's/##IPCDLL-PLACEHOLDER##/binary-component platform\/'${platform}'\/components\/'`basename ${ipcDllFile}`'/' \
|
|
> ${targetDir}/chrome.manifest
|
|
|
|
# Prepare languages other than en-US
|