From: [email protected]

Package: enigmail
Severity: normal
Tags: patch

When building 'enigmail' with gcc-3.4 I get the following error:

c++ -o nsPipeTransport.o -c -DOSTYPE=\"Linux2.6\" -DOSARCH=\"Linux\" -I./../build -I../../../dist/include/xpcom -I../../../dist/include/xpcom_obsolete -I../../../dist/include/string -I../../../dist/include/js -I../../../dist/include/caps -I../../../dist/
include/uconv -I../../../dist/include/necko -I../../../dist/include/mimetype -I../../../dist/include/xpconnect -I../../../dist/include/ipc -I../../../dist/include -I/usr/include/mozilla-thunderbird/necko/ -I/usr/include/mozilla-thunderbird/mimetype/ -I/
usr/include/mozilla-thunderbird/xpcom_obsolete -I/usr/include/mozilla-thunderbird/caps/ -I/usr/include/mozilla-thunderbird/xpconnect -I/usr/include/mozilla-thunderbird/js -I/usr/include/mozilla-thunderbird/msgsmime/ -I/usr/include/mozilla-thunderbird/
msgcompose -I/usr/include/mozilla-thunderbird/msgbase/ -I/usr/include/mozilla-thunderbird/mailnews/ -I/usr/include/mozilla-thunderbird/msgdb/ -I/usr/include/mozilla-thunderbird/msgbaseutil -I/usr/include/mozilla-thunderbird/mime/ -
I/usr/include/mozilla-thunderbird/uconv -I/usr/include/mozilla-thunderbird/dom -I/usr/include/mozilla-thunderbird/pref -I/usr/include/mozilla-thunderbird/uriloader -I/usr/include/mozilla-thunderbird/string -I/usr/include/mozilla-thunderbird/xpcom -I/
usr/include/mozilla-thunderbird -I/usr/include/mozilla-thunderbird/nspr -fPIC -fno-rtti -fno-exceptions -Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -Wno-long-long -
pedantic -fshort-wchar -pthread -pipe -DNDEBUG -DTRIMMED -DMOZILLA_CLIENT -include ../../../mozilla-config.h -Wp,-MD,.deps/nsPipeTransport.pp nsPipeTransport.cpp
nsPipeTransport.cpp: In constructor `nsPipeTransport::nsPipeTransport()': nsPipeTransport.cpp:122: warning: cast from pointer to integer of different size
nsPipeTransport.cpp:122: warning: cast from pointer to integer of different size
nsPipeTransport.cpp: In destructor `virtual nsPipeTransport::~nsPipeTransport()':
nsPipeTransport.cpp:136: warning: cast from pointer to integer of different size
nsPipeTransport.cpp:136: warning: cast from pointer to integer of different size
nsPipeTransport.cpp:146: warning: cast from pointer to integer of different size
nsPipeTransport.cpp: At global scope:
nsPipeTransport.cpp:87: error: extra `;'

With the attached patch 'enigmail' can be compiled using gcc-3.4.

Regards
Andreas Jochens

diff -urN ../tmp-orig/enigmail-0.85.0debian1/debian/patches/00list.mozilla ./debian/patches/00list.mozilla
--- ../tmp-orig/enigmail-0.85.0debian1/debian/patches/00list.mozilla 2004-08-12 13:02:58.169336891 +0200
+++ ./debian/patches/00list.mozilla 2004-08-12 13:02:33.898032763 +0200
@@ -4,3 +4,4 @@
#50_enigmail_ui_skin_contents_rdf
#50_enigmail_ui_locale_en_US_contents_rdf
70_enigmail-fix
+80_gcc-3.4-fix
diff -urN ../tmp-orig/enigmail-0.85.0debian1/debian/patches/00list.thunderbird ./debian/patches/00list.thunderbird
--- ../tmp-orig/enigmail-0.85.0debian1/debian/patches/00list.thunderbird 2004-08-12 13:02:58.170336698 +0200
+++ ./debian/patches/00list.thunderbird 2004-08-12 13:02:46.819532791 +0200
@@ -6,3 +6,4 @@
50_enigmail_ui_skin_contents_rdf
50_enigmail_ui_locale_en_US_contents_rdf
70_enigmail-fix
+80_gcc-3.4-fix
diff -urN ../tmp-orig/enigmail-0.85.0debian1/debian/patches/80_gcc-3.4-fix.dpatch ./debian/patches/80_gcc-3.4-fix.dpatch
--- ../tmp-orig/enigmail-0.85.0debian1/debian/patches/80_gcc-3.4-fix.dpatch 1970-01-01 01:00:00.000000000 +0100
+++ ./debian/patches/80_gcc-3.4-fix.dpatch 20

From: [email protected]

Hi,

thx for the patch.

This patch applies for the thunderbird build target too, right?

Would be great if you could send a single dpatch file (just as mail attachment).

I will add it to the appropriate 00lists.

Thanks

--
GPG messages preferred. | .''`. ** Debian GNU/Linux **
Alexander Sack | : :' : The universal
[email protected] | `. `' Operating System
http://www.jwsdot.com/ | `- http://www.debian.org/



--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

--- SoupGate-Win32 v1.05
* Origin: you cannot sedate... all the things you hate (1:229/2)

From: [email protected]

On 04-Aug-14 16:57, Alexander Sack wrote:

Hi,

thx for the patch.

This patch applies for the thunderbird build target too, right?

Yes, it does.

Would be great if you could send a single dpatch file (just as mail attachment).

Thank you for your reply to my bug report. I will attach the dpatch file
to this email.

Regards
Andreas Jochens

#!/bin/sh -e
## 80_gcc-3.4-fix.dpatch by Andreas Jochens <[email protected]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove extra ';' characters to allow for compilation with gcc-3.4.

if [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi

[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts patch_opts="${patch_opts:--f --no-backup-if-mismatch}"

case "$1" in
-patch) patch $patch_opts -p1 < $0;;
-unpatch) patch $patch_opts -p1 -R < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1;;
esac

exit 0

@DPATCH@
diff -urN mozilla.orig/extensions/enigmail/build/nsEnigModule.cpp mozilla/extensions/enigmail/build/nsEnigModule.cpp
--- mozilla.orig/extensions/enigmail/build/nsEnigModule.cpp 2004-07-15 21:21:05.000000000 +0200
+++ mozilla/extensions/enigmail/build/nsEnigModule.cpp 2004-08-12 12:55:00.622722043 +0200
@@ -72,7 +72,7 @@
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIPCBuffer)

#include "nsIPCService.h"
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsIPCService, Init); +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsIPCService, Init)

#endif /* !NO_IPC */

diff -urN mozilla.orig/extensions/enigmail/src/nsEnigContentHandler.cpp mozilla/extensions/enigmail/src/nsEnigContentHandler.cpp
--- mozilla.orig/extensions/enigmail/src/nsEnigContentHandler.cpp 2004-07-15 21:21:06.000000000 +0200
+++ mozilla/extensions/enigmail/src/nsEnigContentHandler.cpp 2004-08-12 12:54:22.894020229 +0200
@@ -68,7 +68,7 @@

// nsISupports implementation
NS_IMPL_THREADSAFE_ISUPPORTS1(nsEnigContentHandler,
- nsIMimeContentTypeHandler);
+ nsIMimeContentTypeHandler)


// nsEnigContentHandler implementa