From 60a8bf60da26162d5be8425ed2a15d3bd7cec580 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Wed, 6 Dec 2006 21:22:27 +0000 Subject: [PATCH] Apply the seamonkey patches to fix bug #155725 for ppc. Thanks to David Gurvich for testing them. Patches are now packed in distfile. Package-Manager: portage-2.1.2_rc2-r5 --- dev-java/swt/Manifest | 55 ++----- .../10_all_gcc-4.x-warning-fix.patch | 66 -------- .../20_all_remove-stripping.patch | 36 ----- .../30_amd64_libswt-xpcomgcc4.patch | 103 ------------ .../30_x86_libswt-xpcomgcc4.patch | 103 ------------ .../patches-3.2.1/31_amd64_firefox.patch | 153 ------------------ .../files/patches-3.2.1/31_x86_firefox.patch | 153 ------------------ .../40_amd64_cairo-signedness.patch | 11 -- .../40_x86_cairo-signedness.patch | 11 -- 9 files changed, 12 insertions(+), 679 deletions(-) delete mode 100644 dev-java/swt/files/patches-3.2.1/10_all_gcc-4.x-warning-fix.patch delete mode 100644 dev-java/swt/files/patches-3.2.1/20_all_remove-stripping.patch delete mode 100644 dev-java/swt/files/patches-3.2.1/30_amd64_libswt-xpcomgcc4.patch delete mode 100644 dev-java/swt/files/patches-3.2.1/30_x86_libswt-xpcomgcc4.patch delete mode 100644 dev-java/swt/files/patches-3.2.1/31_amd64_firefox.patch delete mode 100644 dev-java/swt/files/patches-3.2.1/31_x86_firefox.patch delete mode 100644 dev-java/swt/files/patches-3.2.1/40_amd64_cairo-signedness.patch delete mode 100644 dev-java/swt/files/patches-3.2.1/40_x86_cairo-signedness.patch diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index 6144f77cd3bb..0c34218e8cf8 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -2,38 +2,6 @@ AUX build.xml 458 RMD160 a8eb69b723bdd8e5e25df8df26d28f4ea134fa87 SHA1 3d5befea1 MD5 f5e548bc26a0f1f3c18131be76face40 files/build.xml 458 RMD160 a8eb69b723bdd8e5e25df8df26d28f4ea134fa87 files/build.xml 458 SHA256 bbac0fb3bf9454b81e6d27dae4ebb9538cf62f2be17adcf169538749230dc8e7 files/build.xml 458 -AUX patches-3.2.1/10_all_gcc-4.x-warning-fix.patch 3943 RMD160 f2ca2b940bb7584ad36be261d2936cceb2644923 SHA1 75b21c67e5cd80be292e7977eff05bee9d8f4935 SHA256 b4cf8f3db3e9290707ba399bb31f894c8ad80dce2719d957b2d6fd75e890cadf -MD5 4ba59201eb36b0640fc35270622411ad files/patches-3.2.1/10_all_gcc-4.x-warning-fix.patch 3943 -RMD160 f2ca2b940bb7584ad36be261d2936cceb2644923 files/patches-3.2.1/10_all_gcc-4.x-warning-fix.patch 3943 -SHA256 b4cf8f3db3e9290707ba399bb31f894c8ad80dce2719d957b2d6fd75e890cadf files/patches-3.2.1/10_all_gcc-4.x-warning-fix.patch 3943 -AUX patches-3.2.1/20_all_remove-stripping.patch 1100 RMD160 f389af77b0c91f2c62e30f71be2b77f2d8d6a1d2 SHA1 3c055e358f8eb49678939cc9449776008470f8e0 SHA256 71768e2c54d7915e81a260d5572dd62c6bb233c34cdd45047bd22b0fc5d30352 -MD5 c4651d3e1c07cf0b48250d07d5910886 files/patches-3.2.1/20_all_remove-stripping.patch 1100 -RMD160 f389af77b0c91f2c62e30f71be2b77f2d8d6a1d2 files/patches-3.2.1/20_all_remove-stripping.patch 1100 -SHA256 71768e2c54d7915e81a260d5572dd62c6bb233c34cdd45047bd22b0fc5d30352 files/patches-3.2.1/20_all_remove-stripping.patch 1100 -AUX patches-3.2.1/30_amd64_libswt-xpcomgcc4.patch 3490 RMD160 ef4cf99b8456573562d72caeef94c59752d6058c SHA1 47e84bbd67f5cedf264b91ff5f33d8c580e64459 SHA256 c76951779171063aca89095275625b94d92641f860b4ebeb30047473251cd4ba -MD5 6124a1c0e260db3247caffaa0ca3d341 files/patches-3.2.1/30_amd64_libswt-xpcomgcc4.patch 3490 -RMD160 ef4cf99b8456573562d72caeef94c59752d6058c files/patches-3.2.1/30_amd64_libswt-xpcomgcc4.patch 3490 -SHA256 c76951779171063aca89095275625b94d92641f860b4ebeb30047473251cd4ba files/patches-3.2.1/30_amd64_libswt-xpcomgcc4.patch 3490 -AUX patches-3.2.1/30_x86_libswt-xpcomgcc4.patch 3482 RMD160 aeec30ad5d4951ed90b069038c0667fc8e3b5b78 SHA1 99b0ed8219c24513c5447d10a168e35b32ade049 SHA256 cc796935495c947d1bda93e6662b6ca6099fa9c94b3077c5a44628a52106627f -MD5 a8239357d7182153477d8c27d05b76e3 files/patches-3.2.1/30_x86_libswt-xpcomgcc4.patch 3482 -RMD160 aeec30ad5d4951ed90b069038c0667fc8e3b5b78 files/patches-3.2.1/30_x86_libswt-xpcomgcc4.patch 3482 -SHA256 cc796935495c947d1bda93e6662b6ca6099fa9c94b3077c5a44628a52106627f files/patches-3.2.1/30_x86_libswt-xpcomgcc4.patch 3482 -AUX patches-3.2.1/31_amd64_firefox.patch 5131 RMD160 e6f9acb85eb84ed043c85e66aa506c3fe3f37924 SHA1 cdfc63fb02645d92b67d740f67ad6b5d97327aa7 SHA256 93c01331cf4a73718836ecd6af8eca5432479a77ff6f8d9a4d45d0337effcd04 -MD5 3824d84e73d79c7d420c49397188dcc6 files/patches-3.2.1/31_amd64_firefox.patch 5131 -RMD160 e6f9acb85eb84ed043c85e66aa506c3fe3f37924 files/patches-3.2.1/31_amd64_firefox.patch 5131 -SHA256 93c01331cf4a73718836ecd6af8eca5432479a77ff6f8d9a4d45d0337effcd04 files/patches-3.2.1/31_amd64_firefox.patch 5131 -AUX patches-3.2.1/31_x86_firefox.patch 5124 RMD160 f9830b2c440cc38991a7bc0438a31bf8108e90b1 SHA1 6bb4792276dff87409ab20794af7e1ff53accbdb SHA256 9c630b34ef053d83896941f5986fdb3dc2cb64f92ddc2d14864600d45ff65ba4 -MD5 57d4e3c98a49e100ef243cf3061c6a02 files/patches-3.2.1/31_x86_firefox.patch 5124 -RMD160 f9830b2c440cc38991a7bc0438a31bf8108e90b1 files/patches-3.2.1/31_x86_firefox.patch 5124 -SHA256 9c630b34ef053d83896941f5986fdb3dc2cb64f92ddc2d14864600d45ff65ba4 files/patches-3.2.1/31_x86_firefox.patch 5124 -AUX patches-3.2.1/40_amd64_cairo-signedness.patch 497 RMD160 be57f972f110c2f806da1e777f67afbfe0d21ea6 SHA1 cf649085a769011edd344b1d53d7a73115c56f08 SHA256 33f8785cadb42a8f9fbbb5aa213f9e764bf435044b2fe5b9212bfa47a8a3ffcd -MD5 c0c639ec8b9c473e41cfd37a3017afae files/patches-3.2.1/40_amd64_cairo-signedness.patch 497 -RMD160 be57f972f110c2f806da1e777f67afbfe0d21ea6 files/patches-3.2.1/40_amd64_cairo-signedness.patch 497 -SHA256 33f8785cadb42a8f9fbbb5aa213f9e764bf435044b2fe5b9212bfa47a8a3ffcd files/patches-3.2.1/40_amd64_cairo-signedness.patch 497 -AUX patches-3.2.1/40_x86_cairo-signedness.patch 494 RMD160 4e4d5a77ee451806710b8678a97d75258cf18e4e SHA1 496583f3790ce4cb367d1eb2b476904b5eb6f0a8 SHA256 7b3dadc1ae0792966d98d0510456c6f2db2214b65a20720c87e7c54745d10809 -MD5 a0a38db824d740f3fdddf1e06674effc files/patches-3.2.1/40_x86_cairo-signedness.patch 494 -RMD160 4e4d5a77ee451806710b8678a97d75258cf18e4e files/patches-3.2.1/40_x86_cairo-signedness.patch 494 -SHA256 7b3dadc1ae0792966d98d0510456c6f2db2214b65a20720c87e7c54745d10809 files/patches-3.2.1/40_x86_cairo-signedness.patch 494 AUX swt-3.2-cairo-signedness-x86.patch 494 RMD160 4e4d5a77ee451806710b8678a97d75258cf18e4e SHA1 496583f3790ce4cb367d1eb2b476904b5eb6f0a8 SHA256 7b3dadc1ae0792966d98d0510456c6f2db2214b65a20720c87e7c54745d10809 MD5 a0a38db824d740f3fdddf1e06674effc files/swt-3.2-cairo-signedness-x86.patch 494 RMD160 4e4d5a77ee451806710b8678a97d75258cf18e4e files/swt-3.2-cairo-signedness-x86.patch 494 @@ -53,6 +21,7 @@ SHA256 72c26a580a835103d7801018295cb6390473c804a7114796f464ddf5bc9f1983 files/sw DIST swt-3.2-gtk-linux-ppc.zip 2913359 RMD160 558cddfbd3fb32091908c23a26db4f153bf36510 SHA1 b0fb2ce02983be18d6d9d7df033a168a1c92d2a3 SHA256 13cda631e4ec522c9d10aa2edb5a38f104e40ad1f67f94513f932a9193167062 DIST swt-3.2-gtk-linux-x86.zip 2935209 RMD160 d9560445852020e7d755594c60ba01c7904b9924 SHA1 1d6d0cd4624c93ae005053681731cbaf3d4a2e52 SHA256 05701ceb02a4099e035571abb0d005947758de48c47b49cd38a5b3fd5670a13c DIST swt-3.2-gtk-linux-x86_64.zip 2841135 RMD160 8764b1357a23a530c9e523b6f1364a7b7abfea01 SHA1 afd11534a90b2f547fb87c5cf6edea205c0a7d92 SHA256 fb00c97c488353a10d7842a50b9184851e90870c3ec1b0ee3bfa838e6ac9a665 +DIST swt-3.2.1-gentoo-patches.tar.bz2 3979 RMD160 20e3011c0795b114208a7967724d9e889bc26992 SHA1 89680c046473a57c156262344767d88ffffa63d6 SHA256 2026a5d7ad2e041187fbd18058d620924bc6481785781760f2f57be50e81d866 DIST swt-3.2.1-gtk-linux-ppc.zip 3043491 RMD160 0246bacb58dc294719435fe6104a84aa512436f8 SHA1 219f91e28cf72517d40958c539658a6ccef58651 SHA256 267e116f59f72d0b701d60a6bf3c410f81c51e7d468862ecbcf34e7bf4e3b096 DIST swt-3.2.1-gtk-linux-x86.zip 3118312 RMD160 950f1e68c82e6e208ffd6ceeff027e5fa1002d73 SHA1 b1e95288321944bb070bee2bdf4faec8e1aeb275 SHA256 940a5dd90131fe2fa02bcf04374dc168a136100d058042732272ca8e61349e78 DIST swt-3.2.1-gtk-linux-x86_64.zip 2997030 RMD160 742593d51259b5d41d946558ea0743faf122b17f SHA1 163f48796aff2172b89b7b4cc0d5201ccc49b796 SHA256 f7cda0d51a0b01954b96821b1a1053f7b76760286f82756b87963caae2c93cb5 @@ -60,14 +29,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 4690 RMD160 06e7149d7eb0b7a0fb637d077d0135e24c80f4f4 SHA1 483036945735fa6dbcce1cdfce25eb6708db0238 SHA256 adca3449de69ea33a35c3da370363c482b304db1e6acd90ea4f819eff3e4e813 -MD5 002f7c7eea60b4a46267c9eee0409511 swt-3.2.1.ebuild 4690 -RMD160 06e7149d7eb0b7a0fb637d077d0135e24c80f4f4 swt-3.2.1.ebuild 4690 -SHA256 adca3449de69ea33a35c3da370363c482b304db1e6acd90ea4f819eff3e4e813 swt-3.2.1.ebuild 4690 -MISC ChangeLog 10151 RMD160 1ec4d5f3740267a0d97b9b18ee4a2cc6414c743e SHA1 4de0f0eaa7759a46a491c3a8ba7217ef7b29c935 SHA256 5278b8cb64eb8d6b9f95fca027e9d99b7fa0da32cd50f4f147b9b9173d45886d -MD5 1ddd9a15294581c0b66c2fa7b2c1481c ChangeLog 10151 -RMD160 1ec4d5f3740267a0d97b9b18ee4a2cc6414c743e ChangeLog 10151 -SHA256 5278b8cb64eb8d6b9f95fca027e9d99b7fa0da32cd50f4f147b9b9173d45886d ChangeLog 10151 +EBUILD swt-3.2.1.ebuild 4785 RMD160 564b2d4bff1dcea047d79378bb03946059d9b6e8 SHA1 19a190629f6c8d6ec68aa0bb9beb42aba4d3bafb SHA256 c0aa4b87dd79c0d8670b32ceece4b5b36f16dd002551bdc755aba2d669f68356 +MD5 79fc4850873dd8d90b8e9da3aa64674c swt-3.2.1.ebuild 4785 +RMD160 564b2d4bff1dcea047d79378bb03946059d9b6e8 swt-3.2.1.ebuild 4785 +SHA256 c0aa4b87dd79c0d8670b32ceece4b5b36f16dd002551bdc755aba2d669f68356 swt-3.2.1.ebuild 4785 +MISC ChangeLog 10053 RMD160 4c7df19358bf7c63e41553ef67ffea72e52c93b1 SHA1 5dc4b0cc74dd04583fe89637616df4a3b4eb309e SHA256 58763522d20805940c28ccef2033d3022c8a794580bed03c5b3a6049b720781a +MD5 985c2f83bf25dd72ce98e95f5f4d7875 ChangeLog 10053 +RMD160 4c7df19358bf7c63e41553ef67ffea72e52c93b1 ChangeLog 10053 +SHA256 58763522d20805940c28ccef2033d3022c8a794580bed03c5b3a6049b720781a ChangeLog 10053 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8 MD5 8a0e1d1eedbd5a4bdd34889f6fbbf9da metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 metadata.xml 440 @@ -75,6 +44,6 @@ SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8 metadata MD5 8bd1dc15426b016e6e25cd7af5143fa8 files/digest-swt-3.2-r2 786 RMD160 606e3a5f2cd82b21193f5f444d2b5f2f46a8d710 files/digest-swt-3.2-r2 786 SHA256 b4e2c4cf92d0606d20e53cbf52eb32e93be676595a5c1e0d48e2e0b95caddce5 files/digest-swt-3.2-r2 786 -MD5 66029eeb02848204a262a57b31418061 files/digest-swt-3.2.1 804 -RMD160 c037c4c830973c81fe4bafdd0b02bc75333d6492 files/digest-swt-3.2.1 804 -SHA256 c4b185231fb5aafd9b653a4915407eaedd7f216856ae38d380b8346ce5c3f83f files/digest-swt-3.2.1 804 +MD5 b1b92585d08574017b21246e5bee6c45 files/digest-swt-3.2.1 1075 +RMD160 f11b1c0e8775d8a9f96918fd2b632f276b0f577e files/digest-swt-3.2.1 1075 +SHA256 8a4fdc86dcf1d19555dbec690d191b180265908405983e1396a311132d3975e5 files/digest-swt-3.2.1 1075 diff --git a/dev-java/swt/files/patches-3.2.1/10_all_gcc-4.x-warning-fix.patch b/dev-java/swt/files/patches-3.2.1/10_all_gcc-4.x-warning-fix.patch deleted file mode 100644 index f9a8116c0857..000000000000 --- a/dev-java/swt/files/patches-3.2.1/10_all_gcc-4.x-warning-fix.patch +++ /dev/null @@ -1,66 +0,0 @@ -# Patch for GCC 4.x warnings ---- src/os.c 2006-07-16 17:14:17.000000000 -0500 -+++ src/os.c 2006-07-16 17:16:04.000000000 -0500 -@@ -2618,7 +2618,7 @@ - OS_NATIVE_ENTER(env, that, _1g_1object_1get_FUNC); - if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; -- g_object_get((GObject *)arg0, (const gchar *)lparg1, lparg2, arg3); -+ g_object_get((GObject *)arg0, (const gchar *)lparg1, lparg2, arg3, (char *)NULL); - fail: - if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); - if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); -@@ -2669,7 +2669,7 @@ - jbyte *lparg1=NULL; - OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BFI_FUNC); - if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; -- g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3); -+ g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3, (char *)NULL); - fail: - if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); - OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BFI_FUNC); -@@ -2683,7 +2683,7 @@ - jbyte *lparg1=NULL; - OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BII_FUNC); - if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; -- g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3); -+ g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3, (char *)NULL); - fail: - if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); - OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BII_FUNC); -@@ -2697,7 +2697,7 @@ - jbyte *lparg1=NULL; - OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BJI_FUNC); - if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; -- g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3); -+ g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3, (char *)NULL); - fail: - if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); - OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BJI_FUNC); -@@ -2711,7 +2711,7 @@ - jbyte *lparg1=NULL; - OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BZI_FUNC); - if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; -- g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3); -+ g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3, (char *)NULL); - fail: - if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); - OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BZI_FUNC); -@@ -12197,7 +12197,7 @@ - OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__I_3B_3II_FUNC); - if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; -- gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, arg3); -+ gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, arg3, (char *)NULL); - fail: - if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); - if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); -@@ -12214,7 +12214,7 @@ - OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__I_3B_3JI_FUNC); - if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail; -- gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, arg3); -+ gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, arg3, (char *)NULL); - fail: - if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0); - if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); diff --git a/dev-java/swt/files/patches-3.2.1/20_all_remove-stripping.patch b/dev-java/swt/files/patches-3.2.1/20_all_remove-stripping.patch deleted file mode 100644 index 0698d7fc4cd6..000000000000 --- a/dev-java/swt/files/patches-3.2.1/20_all_remove-stripping.patch +++ /dev/null @@ -1,36 +0,0 @@ -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=165097 ---- make_linux.mak.old 2006-11-19 18:11:38.000000000 +0200 -+++ make_linux.mak 2006-11-19 18:20:00.000000000 +0200 -@@ -52,7 +52,7 @@ - - CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc - --AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared -s -+AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared - - ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0` - ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0 -@@ -80,7 +80,7 @@ - -I$(JAVA_HOME)/include \ - -I$(JAVA_HOME)/include/linux \ - ${SWT_PTR_CFLAGS} --MOZILLALIBS = -shared -s -Wl,--version-script=mozilla_exports -Bsymbolic -+MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic - - SWT_OBJECTS = swt.o callback.o - CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o -@@ -103,8 +103,13 @@ - -I$(JAVA_HOME)/include/linux \ - -fPIC \ - ${SWT_PTR_CFLAGS} --LIBS = -shared -fPIC -s -+LIBS = -shared -fPIC - -+ifndef NO_STRIP -+ AWT_LIBS := $(AWT_LIBS) -s -+ MOZILLALIBS := $(MOZILLALIBS) -S -+ LIBS := $(LIBS) -s -+endif - - all: make_swt make_atk make_gnome make_glx - diff --git a/dev-java/swt/files/patches-3.2.1/30_amd64_libswt-xpcomgcc4.patch b/dev-java/swt/files/patches-3.2.1/30_amd64_libswt-xpcomgcc4.patch deleted file mode 100644 index 1c70cc057f56..000000000000 --- a/dev-java/swt/files/patches-3.2.1/30_amd64_libswt-xpcomgcc4.patch +++ /dev/null @@ -1,103 +0,0 @@ -# fix building with seamonkey, bug #156716 and #155725 -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 = (jlong)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 = (jlong)((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 = (jlong)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 = (jlong)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 = (jlong)((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 = (jlong)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 = (jlong)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 = (jlong)new nsID(); -+ rc = (long)new nsID(); - XPCOM_NATIVE_EXIT(env, that, nsID_1new_FUNC); - return rc; - } diff --git a/dev-java/swt/files/patches-3.2.1/30_x86_libswt-xpcomgcc4.patch b/dev-java/swt/files/patches-3.2.1/30_x86_libswt-xpcomgcc4.patch deleted file mode 100644 index 7cab5cdc6f56..000000000000 --- a/dev-java/swt/files/patches-3.2.1/30_x86_libswt-xpcomgcc4.patch +++ /dev/null @@ -1,103 +0,0 @@ -# fix building with seamonkey, bug #156716 and #155725 -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/files/patches-3.2.1/31_amd64_firefox.patch b/dev-java/swt/files/patches-3.2.1/31_amd64_firefox.patch deleted file mode 100644 index 66847728f976..000000000000 --- a/dev-java/swt/files/patches-3.2.1/31_amd64_firefox.patch +++ /dev/null @@ -1,153 +0,0 @@ -# fix building with seamonkey, bug #156716 and #155725 -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, jlong arg0, jlong arg1) -+#ifndef NO_NS_1InitXPCOM3 -+JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM3) -+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong 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/patches-3.2.1/31_x86_firefox.patch b/dev-java/swt/files/patches-3.2.1/31_x86_firefox.patch deleted file mode 100644 index 70a6c762cf5c..000000000000 --- a/dev-java/swt/files/patches-3.2.1/31_x86_firefox.patch +++ /dev/null @@ -1,153 +0,0 @@ -# fix building with seamonkey, bug #156716 and #155725 -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/patches-3.2.1/40_amd64_cairo-signedness.patch b/dev-java/swt/files/patches-3.2.1/40_amd64_cairo-signedness.patch deleted file mode 100644 index 1a560bf1e483..000000000000 --- a/dev-java/swt/files/patches-3.2.1/40_amd64_cairo-signedness.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cairo.c 2006-07-17 16:02:31.000000000 +0200 -+++ cairo.c 2006-07-17 16:02:46.000000000 +0200 -@@ -533,7 +533,7 @@ - { - jlong rc = 0; - Cairo_NATIVE_ENTER(env, that, cairo_1image_1surface_1create_1for_1data_FUNC); -- rc = (jlong)cairo_image_surface_create_for_data((char *)arg0, arg1, arg2, arg3, arg4); -+ rc = (jlong)cairo_image_surface_create_for_data((unsigned char *)arg0, arg1, arg2, arg3, arg4); - Cairo_NATIVE_EXIT(env, that, cairo_1image_1surface_1create_1for_1data_FUNC); - return rc; - } diff --git a/dev-java/swt/files/patches-3.2.1/40_x86_cairo-signedness.patch b/dev-java/swt/files/patches-3.2.1/40_x86_cairo-signedness.patch deleted file mode 100644 index e7bc1d505dda..000000000000 --- a/dev-java/swt/files/patches-3.2.1/40_x86_cairo-signedness.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cairo.c 2006-07-16 19:16:27.000000000 -0500 -+++ cairo.c 2006-07-16 19:18:15.000000000 -0500 -@@ -533,7 +533,7 @@ - { - jint rc = 0; - Cairo_NATIVE_ENTER(env, that, cairo_1image_1surface_1create_1for_1data_FUNC); -- rc = (jint)cairo_image_surface_create_for_data((char *)arg0, arg1, arg2, arg3, arg4); -+ rc = (jint)cairo_image_surface_create_for_data((unsigned char *)arg0, arg1, arg2, arg3, arg4); - Cairo_NATIVE_EXIT(env, that, cairo_1image_1surface_1create_1for_1data_FUNC); - return rc; - } -- 2.26.2