Added patches to fix compiling with the seamonkey use flag. Thanks to Federico Fissore <federico@fsfe.org>.

Package-Manager: portage-2.1.2_rc2

5 files changed, 285 insertions, 15 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index c9af3a565198..578c6b3187c2 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/swt
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.51 2006/11/19 18:41:13 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.52 2006/11/19 18:59:50 betelgeuse Exp $
+
+  19 Nov 2006; Petteri Räty <betelgeuse@gentoo.org>
+  +files/swt-3.2.1-firefox.patch, +files/swt-3.2.1-libswt-xpcomgcc4.patch,
+  swt-3.2.1.ebuild:
+  Added patches to fix compiling with the seamonkey use flag. Thanks to
+  Federico Fissore <federico@fsfe.org>.
 
 *swt-3.2.1 (19 Nov 2006)
 
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 065731feba79..35e56e56ba2a 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -21,6 +21,14 @@ AUX swt-3.2-remove-stripping.patch 896 RMD160 71172237544b61942784b91c30a917b0d1
 MD5 4afd88780d3b774d9a5bbdc374981840 files/swt-3.2-remove-stripping.patch 896
 RMD160 71172237544b61942784b91c30a917b0d12586e3 files/swt-3.2-remove-stripping.patch 896
 SHA256 72c26a580a835103d7801018295cb6390473c804a7114796f464ddf5bc9f1983 files/swt-3.2-remove-stripping.patch 896
+AUX swt-3.2.1-firefox.patch 5069 RMD160 b00409c57a4cc1c5caef82fb64af22b5ffc1f3bf SHA1 6061775453107812c8ac540454394bc7550dabbe SHA256 d069c1b58e4aa540542f3bf0c3a20f937a5c4fc99166b4144bff781d5371cc11
+MD5 a37e1842f5eb10610cf2690c95bbaf27 files/swt-3.2.1-firefox.patch 5069
+RMD160 b00409c57a4cc1c5caef82fb64af22b5ffc1f3bf files/swt-3.2.1-firefox.patch 5069
+SHA256 d069c1b58e4aa540542f3bf0c3a20f937a5c4fc99166b4144bff781d5371cc11 files/swt-3.2.1-firefox.patch 5069
+AUX swt-3.2.1-libswt-xpcomgcc4.patch 3427 RMD160 745611a044630bbe183e3628f01e159b8ba0d9b1 SHA1 693ff179ed16c578b79747a520e9a7397084cdd4 SHA256 c5194c4864a469377810df184679ad76ba079092076178e46ce7b68323ef49f1
+MD5 c165468005e908a3a5c58d5bb261647f files/swt-3.2.1-libswt-xpcomgcc4.patch 3427
+RMD160 745611a044630bbe183e3628f01e159b8ba0d9b1 files/swt-3.2.1-libswt-xpcomgcc4.patch 3427
+SHA256 c5194c4864a469377810df184679ad76ba079092076178e46ce7b68323ef49f1 files/swt-3.2.1-libswt-xpcomgcc4.patch 3427
 AUX swt-3.2.1-remove-stripping.patch 1045 RMD160 f06a4c040532abd2eb9894c49dfffa5d0d4a2261 SHA1 68eb328ff2d6882a347c8e9708c9e86cbe199916 SHA256 6c6854f4a416eadd8fcf1cce5771d86169662b6566c41f87a9a7a38faf58c746
 MD5 3451b236486fdeae2ad7fba3067d354a files/swt-3.2.1-remove-stripping.patch 1045
 RMD160 f06a4c040532abd2eb9894c49dfffa5d0d4a2261 files/swt-3.2.1-remove-stripping.patch 1045
@@ -35,14 +43,14 @@ EBUILD swt-3.2-r2.ebuild 5223 RMD160 da996efcac704b5fda4fd71c6974d9252dd38fcf SH
 MD5 d3342ff6d0af3a1ac9c7aa29166167aa swt-3.2-r2.ebuild 5223
 RMD160 da996efcac704b5fda4fd71c6974d9252dd38fcf swt-3.2-r2.ebuild 5223
 SHA256 3515363ece683ebe30dfeac298ef951e9039b5ca93dcd1c2f23aee53696da65f swt-3.2-r2.ebuild 5223
-EBUILD swt-3.2.1.ebuild 5001 RMD160 05b699658f9eb09a76b191861a04c3fa27225d8b SHA1 a031aa5fb75923dd3babd5df64ce55d9c54e39e2 SHA256 bccafa6b511ecf2a64ef4e7af759a840b72212999f3d099ebab92cf41cc172f4
-MD5 7ef05177a8a1ebe96f3f704d2da16c11 swt-3.2.1.ebuild 5001
-RMD160 05b699658f9eb09a76b191861a04c3fa27225d8b swt-3.2.1.ebuild 5001
-SHA256 bccafa6b511ecf2a64ef4e7af759a840b72212999f3d099ebab92cf41cc172f4 swt-3.2.1.ebuild 5001
-MISC ChangeLog 8832 RMD160 318f2d9aa8efff0a9f76184e47390711b4faa4d6 SHA1 19b67c137bccdc930433c77a7d045efe132ef7fa SHA256 cd3676bf6afba5ba1722e3f6052b1aded39b6986eeda50a622e29deabd0f372d
-MD5 9ea993ea8fad75b5befedd4407a521d3 ChangeLog 8832
-RMD160 318f2d9aa8efff0a9f76184e47390711b4faa4d6 ChangeLog 8832
-SHA256 cd3676bf6afba5ba1722e3f6052b1aded39b6986eeda50a622e29deabd0f372d ChangeLog 8832
+EBUILD swt-3.2.1.ebuild 5051 RMD160 9c390fce8d7fa1f5bb627eec73c3d7449da01c42 SHA1 7e41a9eebb64cff869df75d3537efc702f9da150 SHA256 4e2d1da402e556932462ab810cc4af73020ba3baf0d84acafa63d434d2bfe01a
+MD5 5964dc73f62bc8b59a3f4c5198c5ae5a swt-3.2.1.ebuild 5051
+RMD160 9c390fce8d7fa1f5bb627eec73c3d7449da01c42 swt-3.2.1.ebuild 5051
+SHA256 4e2d1da402e556932462ab810cc4af73020ba3baf0d84acafa63d434d2bfe01a swt-3.2.1.ebuild 5051
+MISC ChangeLog 9093 RMD160 0c28a9211f2de86cb47cbc3b6a31c61b23c790e0 SHA1 f2d365d53d40b2c8f47f0150cd9d51c11cc59c09 SHA256 86ebcaf9c549f392fd8e97c9a4265994c3bb6708ff75ee02e159c4b415b5fe43
+MD5 1eac09a568b52534ad8400d36073a65f ChangeLog 9093
+RMD160 0c28a9211f2de86cb47cbc3b6a31c61b23c790e0 ChangeLog 9093
+SHA256 86ebcaf9c549f392fd8e97c9a4265994c3bb6708ff75ee02e159c4b415b5fe43 ChangeLog 9093
 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8
 MD5 8a0e1d1eedbd5a4bdd34889f6fbbf9da metadata.xml 440
 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 metadata.xml 440
@@ -56,7 +64,7 @@ SHA256 c4b185231fb5aafd9b653a4915407eaedd7f216856ae38d380b8346ce5c3f83f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFYKVQcxLzpIGCsLQRAuapAJwMtBgVGwfne77LQ8Xapwgy0LHh8ACbBY8W
-a4k5DoBHYNFVCkJfYt4beQU=
-=FFhp
+iD8DBQFFYKnccxLzpIGCsLQRAurmAJ9GWls2SmScsGEa102cRLwUBsX8IACgiDLZ
+cCYxI710DcW3Q4x7u+qsit4=
+=AgIv
 -----END PGP SIGNATURE-----
diff --git a/dev-java/swt/files/swt-3.2.1-firefox.patch b/dev-java/swt/files/swt-3.2.1-firefox.patch
new file mode 100644
index 000000000000..ee536bf7d6bb
--- /dev/null
+++ b/dev-java/swt/files/swt-3.2.1-firefox.patch
@@ -0,0 +1,152 @@
+diff -u -r1.33.2.1 make_linux.mak
+--- make_linux.mak	26 Jul 2006 16:33:23 -0000	1.33.2.1
++++ make_linux.mak	29 Sep 2006 13:21:51 -0000
+@@ -202,7 +202,7 @@
+ #
+ # Mozilla lib
+ #
+-make_mozilla:$(MOZILLA_LIB) $(PROFILE14_LIB) $(PROFILE17_LIB) $(PROFILE18_LIB)
++make_mozilla:$(MOZILLA_LIB)
+ 
+ $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
+ 	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS}
+@@ -220,22 +220,22 @@
+ 	$(CXX) $(MOZILLACFLAGS) ${GECKO_INCLUDES} -c xpcom_stats.cpp	
+ 
+ $(PROFILE14_OBJECTS): xpcom_profile.cpp
+-	$(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${PROFILE14_INCLUDES} -c xpcom_profile.cpp	
++	$(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${PROFILE14_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp	
+ 
+ $(PROFILE17_OBJECTS): xpcom_profile.cpp
+-	$(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${PROFILE17_INCLUDES} -c xpcom_profile.cpp	
++	$(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${PROFILE17_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp	
+ 
+ $(PROFILE18_OBJECTS): xpcom_profile.cpp
+-	$(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${PROFILE18_INCLUDES} -c xpcom_profile.cpp	
++	$(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${PROFILE18_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp	
+ 
+ $(PROFILE14_LIB): $(PROFILE14_OBJECTS)
+-	$(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${PROFILE14_LIBS}
++	$(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${PROFILE14_LIBS} ${GECKO_LIBS}
+ 
+ $(PROFILE17_LIB): $(PROFILE17_OBJECTS)
+-	$(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${PROFILE17_LIBS}
++	$(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${PROFILE17_LIBS} ${GECKO_LIBS}
+ 
+ $(PROFILE18_LIB): $(PROFILE18_OBJECTS)
+-	$(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${PROFILE18_LIBS}
++	$(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${PROFILE18_LIBS} ${GECKO_LIBS}
+ 
+ #
+ # GLX lib
+@@ -264,4 +264,4 @@
+ # Clean
+ #
+ clean:
+-	rm -f *.o *.so
++	rm -f *.o *.so
+\ No newline at end of file
+diff -u -r1.15.2.1 xpcom_stats.cpp
+--- xpcom_stats.cpp	26 Jul 2006 16:33:23 -0000	1.15.2.1
++++ xpcom_stats.cpp	29 Sep 2006 13:21:49 -0000
+@@ -31,15 +31,14 @@
+ 
+ #ifdef NATIVE_STATS
+ 
+-int XPCOM_nativeFunctionCount = 132;
+-int XPCOM_nativeFunctionCallCount[132];
++int XPCOM_nativeFunctionCount = 131;
++int XPCOM_nativeFunctionCallCount[131];
+ char * XPCOM_nativeFunctionNames[] = {
+ 	"Call",
+ 	"NS_1GetComponentManager",
+ 	"NS_1GetServiceManager",
+-	"NS_1InitEmbedding",
++	"NS_1InitXPCOM3_FUNC",
+ 	"NS_1NewLocalFile",
+-	"NS_1TermEmbedding",
+ 	"PR_1Free",
+ 	"PR_1Malloc",
+ 	"VtblCall__II",
+diff -u -r1.1.2.1 xpcom_profile.h
+--- xpcom_profile.h	26 Jul 2006 16:33:23 -0000	1.1.2.1
++++ xpcom_profile.h	29 Sep 2006 13:21:48 -0000
+@@ -32,7 +32,7 @@
+ #define NDEBUG
+ 
+ #include "nsCOMPtr.h"
+-#include "nsProfileDirServiceProvider.h"
++#include "profdirserviceprovider/nsProfileDirServiceProvider.h"
+ #include "xpcom_stats.h"
+ 
+ #endif /* INC_xpcom_profile_H */
+diff -u -r1.6.2.1 xpcom.h
+--- xpcom.h	26 Jul 2006 16:33:23 -0000	1.6.2.1
++++ xpcom.h	29 Sep 2006 13:21:48 -0000
+@@ -32,7 +32,6 @@
+ #define NDEBUG
+ 
+ #include "nsXPCOM.h"
+-#include "nsEmbedAPI.h"	
+ #include "nsEmbedString.h"
+ #include "nsIInputStream.h"
+ #include "nsISupportsUtils.h"
+diff -u -r1.29.2.1 xpcom.cpp
+--- xpcom.cpp	26 Jul 2006 16:33:23 -0000	1.29.2.1
++++ xpcom.cpp	29 Sep 2006 13:21:48 -0000
+@@ -85,14 +85,16 @@
+ }
+ #endif
+ 
+-#ifndef NO_NS_1InitEmbedding
+-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitEmbedding)
+-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
++#ifndef NO_NS_1InitXPCOM3
++JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM3)
++	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+ {
+ 	jint rc = 0;
+-	XPCOM_NATIVE_ENTER(env, that, NS_1InitEmbedding_FUNC);
+-	rc = (jint)NS_InitEmbedding((nsILocalFile *)arg0, (nsIDirectoryServiceProvider *)arg1);
+-	XPCOM_NATIVE_EXIT(env, that, NS_1InitEmbedding_FUNC);
++	XPCOM_NATIVE_ENTER(env, that, NS_1GetComponentRegistrar_FUNC);
++	rc = (jint)NS_InitXPCOM3((nsIServiceManager **)arg0, (nsIFile *)arg1,
++		(nsIDirectoryServiceProvider *)arg2, (nsStaticModuleInfo *)arg3,
++		(PRUint32) arg4);
++	XPCOM_NATIVE_EXIT(env, that, NS_1GetComponentRegistrar_FUNC);
+ 	return rc;
+ }
+ #endif
+@@ -113,18 +115,6 @@
+ }
+ #endif
+ 
+-#ifndef NO_NS_1TermEmbedding
+-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1TermEmbedding)
+-	(JNIEnv *env, jclass that)
+-{
+-	jint rc = 0;
+-	XPCOM_NATIVE_ENTER(env, that, NS_1TermEmbedding_FUNC);
+-	rc = (jint)NS_TermEmbedding();
+-	XPCOM_NATIVE_EXIT(env, that, NS_1TermEmbedding_FUNC);
+-	return rc;
+-}
+-#endif
+-
+ #ifndef NO_PR_1Free
+ JNIEXPORT void JNICALL XPCOM_NATIVE(PR_1Free)
+ 	(JNIEnv *env, jclass that, jint arg0)
+diff -u -r1.14.2.1 xpcom_stats.h
+--- xpcom_stats.h	26 Jul 2006 16:33:23 -0000	1.14.2.1
++++ xpcom_stats.h	29 Sep 2006 13:21:49 -0000
+@@ -41,9 +41,8 @@
+ 	Call_FUNC,
+ 	NS_1GetComponentManager_FUNC,
+ 	NS_1GetServiceManager_FUNC,
+-	NS_1InitEmbedding_FUNC,
++	NS_1InitXPCOM3_FUNC,
+ 	NS_1NewLocalFile_FUNC,
+-	NS_1TermEmbedding_FUNC,
+ 	PR_1Free_FUNC,
+ 	PR_1Malloc_FUNC,
+ 	VtblCall__II_FUNC,
diff --git a/dev-java/swt/files/swt-3.2.1-libswt-xpcomgcc4.patch b/dev-java/swt/files/swt-3.2.1-libswt-xpcomgcc4.patch
new file mode 100644
index 000000000000..991f5f3a2c04
--- /dev/null
+++ b/dev-java/swt/files/swt-3.2.1-libswt-xpcomgcc4.patch
@@ -0,0 +1,102 @@
+diff -urN ../tmp-orig/swt-gtk-3.1/xpcom.cpp ./xpcom.cpp
+--- ../tmp-orig/swt-gtk-3.1/xpcom.cpp	2005-02-03 01:06:52.000000000 +0000
++++ ./xpcom.cpp	2005-09-10 08:22:37.000000000 +0000
+@@ -141,7 +141,7 @@
+ {
+ 	jint rc = 0;
+ 	XPCOM_NATIVE_ENTER(env, that, PR_1Malloc_FUNC);
+-	rc = (jint)PR_Malloc(arg0);
++	rc = (long)PR_Malloc(arg0);
+ 	XPCOM_NATIVE_EXIT(env, that, PR_1Malloc_FUNC);
+ 	return rc;
+ }
+@@ -1868,7 +1868,7 @@
+ {
+ 	jint rc = 0;
+ 	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1get_FUNC);
+-	rc = (jint)((nsEmbedCString *)arg0)->get();
++	rc = (long)((nsEmbedCString *)arg0)->get();
+ 	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1get_FUNC);
+ 	return rc;
+ }
+@@ -1880,7 +1880,7 @@
+ {
+ 	jint rc = 0;
+ 	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___FUNC);
+-	rc = (jint)new nsEmbedCString();
++	rc = (long)new nsEmbedCString();
+ 	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___FUNC);
+ 	return rc;
+ }
+@@ -1894,7 +1894,7 @@
+ 	jint rc = 0;
+ 	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___3BI_FUNC);
+ 	if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
+-	rc = (jint)new nsEmbedCString((const char *)lparg0, arg1);
++	rc = (long)new nsEmbedCString((const char *)lparg0, arg1);
+ fail:
+ 	if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
+ 	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___3BI_FUNC);
+@@ -1908,7 +1908,7 @@
+ {
+ 	jint rc = 0;
+ 	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1Length_FUNC);
+-	rc = (jint)((nsEmbedString *)arg0)->Length();
++	rc = (long)((nsEmbedString *)arg0)->Length();
+ 	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1Length_FUNC);
+ 	return rc;
+ }
+@@ -1930,7 +1930,7 @@
+ {
+ 	jint rc = 0;
+ 	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1get_FUNC);
+-	rc = (jint)((nsEmbedString *)arg0)->get();
++	rc = (long)((nsEmbedString *)arg0)->get();
+ 	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1get_FUNC);
+ 	return rc;
+ }
+@@ -1942,7 +1942,7 @@
+ {
+ 	jint rc = 0;
+ 	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___FUNC);
+-	rc = (jint)new nsEmbedString();
++	rc = (long)new nsEmbedString();
+ 	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___FUNC);
+ 	return rc;
+ }
+@@ -1956,7 +1956,7 @@
+ 	jint rc = 0;
+ 	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___3C_FUNC);
+ 	if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail;
+-	rc = (jint)new nsEmbedString(lparg0);
++	rc = (long)new nsEmbedString(lparg0);
+ fail:
+ 	if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0);
+ 	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___3C_FUNC);
+@@ -1970,7 +1970,7 @@
+ {
+ 	jboolean rc = 0;
+ 	XPCOM_NATIVE_ENTER(env, that, nsID_1Equals_FUNC);
+-	rc = (jboolean)((nsID *)arg0)->Equals(*(nsID *)arg1);
++	rc = (long)((nsID *)arg0)->Equals(*(nsID *)arg1);
+ 	XPCOM_NATIVE_EXIT(env, that, nsID_1Equals_FUNC);
+ 	return rc;
+ }
+@@ -1984,7 +1984,7 @@
+ 	jboolean rc = 0;
+ 	XPCOM_NATIVE_ENTER(env, that, nsID_1Parse_FUNC);
+ 	if (arg1) if ((lparg1 = env->GetStringUTFChars(arg1, NULL)) == NULL) goto fail;
+-	rc = (jboolean)((nsID *)arg0)->Parse((const char *)lparg1);
++	rc = (long)((nsID *)arg0)->Parse((const char *)lparg1);
+ fail:
+ 	if (arg1 && lparg1) env->ReleaseStringUTFChars(arg1, lparg1);
+ 	XPCOM_NATIVE_EXIT(env, that, nsID_1Parse_FUNC);
+@@ -2008,7 +2008,7 @@
+ {
+ 	jint rc = 0;
+ 	XPCOM_NATIVE_ENTER(env, that, nsID_1new_FUNC);
+-	rc = (jint)new nsID();
++	rc = (long)new nsID();
+ 	XPCOM_NATIVE_EXIT(env, that, nsID_1new_FUNC);
+ 	return rc;
+ }
diff --git a/dev-java/swt/swt-3.2.1.ebuild b/dev-java/swt/swt-3.2.1.ebuild
index fea37d810d6a..69ed2c283994 100644
--- a/dev-java/swt/swt-3.2.1.ebuild
+++ b/dev-java/swt/swt-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2.1.ebuild,v 1.1 2006/11/19 18:41:13 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2.1.ebuild,v 1.2 2006/11/19 18:59:50 betelgeuse Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -52,8 +52,6 @@ S="${WORKDIR}"
 src_unpack() {
 	unzip -jq "${DISTDIR}/${A}" "*src.zip" || die "unable to extract distfile"
 
-	# Unpack the sources
-	einfo "Unpacking src.zip to ${S}"
 	unpack ./src.zip
 
 	# Cleanup the redirtied directory structure
@@ -70,6 +68,10 @@ src_unpack() {
 	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=165097
 	epatch "${FILESDIR}"/${PN}-3.2.1-remove-stripping.patch
 
+	epatch "${FILESDIR}"/${PN}-3.2.1-libswt-xpcomgcc4.patch
+
+	epatch "${FILESDIR}"/${PN}-3.2.1-firefox.patch
+
 	if [[ ${ARCH} == "amd64" ]] ; then
 		epatch "${FILESDIR}"/${PN}-3.2-cairo-signedness-x86_64.patch
 	else