155725 2006-11-19 14:46 0000 dev-java/swt-3.2.1 libswt-xpcomgcc4.patch fails to apply on amd64 2006-12-06 13:23:25 0000 1 1 1 Unclassified Gentoo Linux Ebuilds 2006.1 AMD64 Linux RESOLVED FIXED P2 normal --- 1 richard.connon@gmail.com java@gentoo.org david.gurvich@verizon.net ron@einfach.org richard.connon@gmail.com 2006-11-19 14:46:32 0000 patching swt fails with the following error: * Applying swt-3.2.1-libswt-xpcomgcc4.patch ... * Failed Patch: swt-3.2.1-libswt-xpcomgcc4.patch ! * ( /usr/portage/dev-java/swt/files/swt-3.2.1-libswt-xpcomgcc4.patch ) * * Include in your bugreport the contents of: * * /var/tmp/portage/dev-java/swt-3.2.1/temp/swt-3.2.1-libswt-xpcomgcc4.patch-22703.out !!! ERROR: dev-java/swt-3.2.1 failed. Call stack: ebuild.sh, line 1568: Called dyn_unpack ebuild.sh, line 708: Called src_unpack swt-3.2.1.ebuild, line 71: Called epatch '/usr/portage/dev-java/swt/files/swt-3.2.1-libswt-xpcomgcc4.patch' eutils.eclass, line 341: Called die !!! Failed Patch: swt-3.2.1-libswt-xpcomgcc4.patch! !!! If you need support, post the topmost build error, and the call stack if relevant. !!! When you file a bug report, please include the following information: GENTOO_VM=blackdown-jdk-1.4.2 CLASSPATH="" JAVA_HOME="/opt/blackdown-jdk-1.4.2.03" JAVACFLAGS="-source 1.4 -target 1.4" COMPILER="" and of course, the output of emerge --info richard.connon@gmail.com 2006-11-19 14:47:15 0000 Created an attachment (id=102359) emerge --info birder@ozemail.com.au 2006-11-19 15:31:57 0000 Created an attachment (id=102363) Failed patch output I get the same error; here's my failed patch output (missing from the original bug report.) caster@gentoo.org 2006-11-19 16:56:44 0000 Must be amd64 specific, can't reproduce on x86 and amd64 has different distfile. caster@gentoo.org 2006-11-19 17:08:11 0000 As a quick workaround, the patch is now applied only on x86. Leaving the bug open for Frederico or somebody with amd64 to take a look at porting the patch there. jmbsvicetto@gentoo.org 2006-11-19 20:47:10 0000 Created an attachment (id=102371) modified swt-3.2.1-libswt-xpcomgcc4.patch file Updated patch file to fit the amd64 swt package. jmbsvicetto@gentoo.org 2006-11-19 20:50:53 0000 Created an attachment (id=102372) modified swt-3.2.1-firefox.patch file Updated patch file to fit the amd64 swt package. jmbsvicetto@gentoo.org 2006-11-19 20:53:38 0000 I was able to patch the swt package and to complete the ebuild install process with the modified patch files posted as comments #5 and #6. I don't know enough of the swt library to know if it will work with these patches or not. ron@einfach.org 2006-11-30 13:29:21 0000 hi! compiles and installs fine on my ~amd64 regards ron caster@gentoo.org 2006-11-30 16:43:53 0000 The patches are now applied, thanks. Now we need to adjust them for ppc too... caster@gentoo.org 2006-12-06 04:02:32 0000 *** Bug 156716 has been marked as a duplicate of this bug. *** caster@gentoo.org 2006-12-06 04:07:03 0000 David, can you check that the patches 30_x86_libswt-xpcomgcc4.patch, 31_x86_firefox.patch and 40_x86_cairo-signedness.patch fix the build_with_seamonkey issue on ppc? They are located in $PORTDIR/dev-java/swt/files/patches-3.2.1. Copy them so that x86 is replaced with ppc in the filenames, redigest and try emerging. You should see the einfo about them being applied, and see if the building was successful. david.gurvich@verizon.net 2006-12-06 06:57:43 0000 Changing patches from x86 to ppc applies successfully and builds with no trouble. caster@gentoo.org 2006-12-06 13:23:25 0000 Thanks for the testing. Just commited it to CVS. All arches are now taken care of. 102359 2006-11-19 14:47 0000 emerge --info info text/plain UG9ydGFnZSAyLjEuMl9yYzIgKGRlZmF1bHQtbGludXgvYW1kNjQvMjAwNi4xLCBnY2MtNC4xLjEs IGdsaWJjLTIuNS1yMCwgMi42LjE4LWdlbnRvby1yMiB4ODZfNjQpCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClN5c3RlbSB1 bmFtZTogMi42LjE4LWdlbnRvby1yMiB4ODZfNjQgQU1EIEF0aGxvbih0bSkgNjQgWDIgRHVhbCBD b3JlIFByb2Nlc3NvciAzODAwKwpHZW50b28gQmFzZSBTeXN0ZW0gdmVyc2lvbiAxLjEyLjYKTGFz dCBTeW5jOiBTdW4sIDE5IE5vdiAyMDA2IDIwOjUwOjAxICswMDAwCmNjYWNoZSB2ZXJzaW9uIDIu NCBbZGlzYWJsZWRdCmRldi1qYXZhL2phdmEtY29uZmlnOiAxLjMuNywgMi4wLjMwCmRldi1sYW5n L3B5dGhvbjogICAgIDIuNC40CmRldi1weXRob24vcHljcnlwdG86IDIuMC4xLXI1CmRldi11dGls L2NjYWNoZTogICAgIDIuNC1yNgpzeXMtYXBwcy9zYW5kYm94OiAgICAxLjIuMTguMQpzeXMtZGV2 ZWwvYXV0b2NvbmY6ICAyLjEzLCAyLjYxCnN5cy1kZXZlbC9hdXRvbWFrZTogIDEuNF9wNiwgMS41 LCAxLjYuMywgMS43LjktcjEsIDEuOC41LXIzLCAxLjkuNi1yMiwgMS4xMApzeXMtZGV2ZWwvYmlu dXRpbHM6ICAyLjE3CnN5cy1kZXZlbC9nY2MtY29uZmlnOiAxLjMuMTQKc3lzLWRldmVsL2xpYnRv b2w6ICAgMS41LjIyCnZpcnR1YWwvb3MtaGVhZGVyczogIDIuNi4xNy1yMQpBQ0NFUFRfS0VZV09S RFM9ImFtZDY0IH5hbWQ2NCIKQVVUT0NMRUFOPSJ5ZXMiCkNCVUlMRD0ieDg2XzY0LXBjLWxpbnV4 LWdudSIKQ0ZMQUdTPSItbWFyY2g9azggLU8yIC1waXBlIgpDSE9TVD0ieDg2XzY0LXBjLWxpbnV4 LWdudSIKQ09ORklHX1BST1RFQ1Q9Ii9ldGMgL3Vzci9rZGUvMy41L2VudiAvdXNyL2tkZS8zLjUv c2hhcmUvY29uZmlnIC91c3Iva2RlLzMuNS9zaHV0ZG93biAvdXNyL3NoYXJlL1gxMS94a2IgL3Vz ci9zaGFyZS9jb25maWciCkNPTkZJR19QUk9URUNUX01BU0s9Ii9ldGMvZW52LmQgL2V0Yy9lbnYu ZC9qYXZhLyAvZXRjL2djb25mIC9ldGMvamF2YS1jb25maWcvdm1zLyAvZXRjL3JldmRlcC1yZWJ1 aWxkIC9ldGMvdGVybWluZm8gL2V0Yy90ZXhtZi93ZWIyYyIKQ1hYRkxBR1M9Ii1tYXJjaD1rOCAt TzIgLXBpcGUiCkRJU1RESVI9Ii91c3IvcG9ydGFnZS9kaXN0ZmlsZXMiCkZFQVRVUkVTPSJhdXRv Y29uZmlnIGRpc3Rsb2NrcyBtZXRhZGF0YS10cmFuc2ZlciBzYW5kYm94IHNmcGVybXMgc3RyaWN0 IgpHRU5UT09fTUlSUk9SUz0iZnRwOi8vZnRwLm1pcnJvcnNlcnZpY2Uub3JnL3NpdGVzL3d3dy5p YmlibGlvLm9yZy9nZW50b28vIgpMQU5HPSJlbl9HQiIKTENfQUxMPSJlbl9HQiIKTUFLRU9QVFM9 Ii1qMyIKUEtHRElSPSIvdXNyL3BvcnRhZ2UvcGFja2FnZXMiClBPUlRBR0VfUlNZTkNfT1BUUz0i LS1yZWN1cnNpdmUgLS1saW5rcyAtLXNhZmUtbGlua3MgLS1wZXJtcyAtLXRpbWVzIC0tY29tcHJl c3MgLS1mb3JjZSAtLXdob2xlLWZpbGUgLS1kZWxldGUgLS1kZWxldGUtYWZ0ZXIgLS1zdGF0cyAt LXRpbWVvdXQ9MTgwIC0tZXhjbHVkZT0vZGlzdGZpbGVzIC0tZXhjbHVkZT0vbG9jYWwgLS1leGNs dWRlPS9wYWNrYWdlcyIKUE9SVEFHRV9UTVBESVI9Ii92YXIvdG1wIgpQT1JURElSPSIvdXNyL3Bv cnRhZ2UiClBPUlRESVJfT1ZFUkxBWT0iL3Vzci9wb3J0YWdlL2xvY2FsL2xheW1hbi9wcm8tYXVk aW8gL3Vzci9sb2NhbC9wb3J0YWdlIgpTWU5DPSJyc3luYzovL3JzeW5jLmV1cm9wZS5nZW50b28u b3JnL2dlbnRvby1wb3J0YWdlIgpVU0U9ImFtZDY0IFggYWxzYSBhcnRzIGF1ZGlvZmlsZSBhdmFo aSBiZXJrZGIgYml0bWFwLWZvbnRzIGJvbm9ibyBicmFuZGluZyBiemlwMiBjZHBhcmFub2lhIGNk ciBjbGkgY3JhY2tsaWIgY3J5cHQgY3VwcyBjdXJsIGRidXMgZGxsb2FkZXIgZHJpIGR2ZCBkdmRy IGR2ZHJlYWQgZWxpYmNfZ2xpYmMgZW11bC1saW51eC14ODYgZW5jb2RlIGVzZCBleHBhdCBmYW0g ZmZtcGVnIGZpcmVmb3ggZmxhYyBmb3J0cmFuIGZ0cCBnY2ogZ2RibSBnbm9tZSBncG0gZ3N0cmVh bWVyIGd0ayBndGsyIGhhbCBpY29udiBpZWVlMTM5NCBpbWxpYiBpbnB1dF9kZXZpY2VzX2tleWJv YXJkIGlucHV0X2RldmljZXNfbW91c2UgaXBvZCBpcHY2IGlzZG5sb2cgamFiYmVyIGphY2sgamF2 YSBqYXZhc2NyaXB0IGpwZWcganBlZzJrIGtkZSBrZXJuZWxfbGludXggbGFzaCBsaWJnKysgbGly YyBtYWQgbWltZSBtb3picmFuZGluZyBtcDMgbXBlZyBtc24gbmN1cnNlcyBubHMgbm93aW4gbnB0 bCBucHRsb25seSBuc3BsdWdpbiBvZ2cgb3BlbmFsIG9wZW5nbCBwYW0gcGNudGwgcGNyZSBwZGYg cGVybCBwbmcgcG9zaXggcHBkcyBwcHBkIHB5dGhvbiBxdDMgcXQ0IHJlYWRsaW5lIHJlZmxlY3Rp b24gc2FtYmEgc2RsIHNlc3Npb24gc3BsIHNzbCBzeW1saW5rIHN5c3ZpcGMgdGNsIHRjbHRrIHRj cGQgdGV0ZXggdGhyZWFkcyB0aWZmIHRrIHRydWV0eXBlIHRydWV0eXBlLWZvbnRzIHR5cGUxLWZv bnRzIHVkZXYgdW5pY29kZSB1c2IgdXNlcmxhbmRfR05VIHZpZGVvX2NhcmRzX252IHZpZGVvX2Nh cmRzX252aWRpYSB2b3JiaXMgd2lmaSB4b3JnIHpsaWIiClVuc2V0OiAgQ1RBUkdFVCwgRU1FUkdF X0RFRkFVTFRfT1BUUywgSU5TVEFMTF9NQVNLLCBMREZMQUdTLCBMSU5HVUFTLCBQT1JUQUdFX1JT WU5DX0VYVFJBX09QVFMKCg== 102363 2006-11-19 15:31 0000 Failed patch output swt-3.2.1-libswt-xpcomgcc4.patch-22368.out text/plain KioqKiogc3d0LTMuMi4xLWxpYnN3dC14cGNvbWdjYzQucGF0Y2ggKioqKioKCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CgpQQVRDSCBDT01NQU5EOiAgcGF0Y2gg LXAwIC1nMCAtRSAtLW5vLWJhY2t1cC1pZi1taXNtYXRjaCA8IC91c3IvcG9ydGFnZS9kZXYtamF2 YS9zd3QvZmlsZXMvc3d0LTMuMi4xLWxpYnN3dC14cGNvbWdjYzQucGF0Y2gKCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CnBhdGNoaW5nIGZpbGUgLi94cGNvbS5j cHAKSHVuayAjMSBGQUlMRUQgYXQgMTQxLgpIdW5rICMyIEZBSUxFRCBhdCAxODY4LgpIdW5rICMz IEZBSUxFRCBhdCAxODgwLgpIdW5rICM0IEZBSUxFRCBhdCAxODk0LgpIdW5rICM1IHN1Y2NlZWRl ZCBhdCAyMTMxIChvZmZzZXQgMjIzIGxpbmVzKS4KSHVuayAjNiBGQUlMRUQgYXQgMjE1My4KSHVu ayAjNyBGQUlMRUQgYXQgMjE2NS4KSHVuayAjOCBGQUlMRUQgYXQgMjE3OS4KSHVuayAjOSBzdWNj ZWVkZWQgYXQgMjE5MyAob2Zmc2V0IDIyMyBsaW5lcykuCkh1bmsgIzEwIHN1Y2NlZWRlZCBhdCAy MjA3IChvZmZzZXQgMjIzIGxpbmVzKS4KSHVuayAjMTEgRkFJTEVEIGF0IDIyMzEuCjggb3V0IG9m IDExIGh1bmtzIEZBSUxFRCAtLSBzYXZpbmcgcmVqZWN0cyB0byBmaWxlIC4veHBjb20uY3BwLnJl ago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQoKUEFUQ0ggQ09N TUFORDogIHBhdGNoIC1wMSAtZzAgLUUgLS1uby1iYWNrdXAtaWYtbWlzbWF0Y2ggPCAvdXNyL3Bv cnRhZ2UvZGV2LWphdmEvc3d0L2ZpbGVzL3N3dC0zLjIuMS1saWJzd3QteHBjb21nY2M0LnBhdGNo Cgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpwYXRjaGluZyBm aWxlIHhwY29tLmNwcApIdW5rICMxIEZBSUxFRCBhdCAxNDEuCkh1bmsgIzIgRkFJTEVEIGF0IDE4 NjguCkh1bmsgIzMgRkFJTEVEIGF0IDE4ODAuCkh1bmsgIzQgRkFJTEVEIGF0IDE4OTQuCkh1bmsg IzUgc3VjY2VlZGVkIGF0IDIxMzEgKG9mZnNldCAyMjMgbGluZXMpLgpIdW5rICM2IEZBSUxFRCBh dCAyMTUzLgpIdW5rICM3IEZBSUxFRCBhdCAyMTY1LgpIdW5rICM4IEZBSUxFRCBhdCAyMTc5LgpI dW5rICM5IHN1Y2NlZWRlZCBhdCAyMTkzIChvZmZzZXQgMjIzIGxpbmVzKS4KSHVuayAjMTAgc3Vj Y2VlZGVkIGF0IDIyMDcgKG9mZnNldCAyMjMgbGluZXMpLgpIdW5rICMxMSBGQUlMRUQgYXQgMjIz MS4KOCBvdXQgb2YgMTEgaHVua3MgRkFJTEVEIC0tIHNhdmluZyByZWplY3RzIHRvIGZpbGUgeHBj b20uY3BwLnJlago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQoK UEFUQ0ggQ09NTUFORDogIHBhdGNoIC1wMiAtZzAgLUUgLS1uby1iYWNrdXAtaWYtbWlzbWF0Y2gg PCAvdXNyL3BvcnRhZ2UvZGV2LWphdmEvc3d0L2ZpbGVzL3N3dC0zLjIuMS1saWJzd3QteHBjb21n Y2M0LnBhdGNoCgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpt aXNzaW5nIGhlYWRlciBmb3IgdW5pZmllZCBkaWZmIGF0IGxpbmUgNCBvZiBwYXRjaApjYW4ndCBm aW5kIGZpbGUgdG8gcGF0Y2ggYXQgaW5wdXQgbGluZSA0ClBlcmhhcHMgeW91IHVzZWQgdGhlIHdy b25nIC1wIG9yIC0tc3RyaXAgb3B0aW9uPwpUaGUgdGV4dCBsZWFkaW5nIHVwIHRvIHRoaXMgd2Fz OgotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQp8ZGlmZiAtdXJOIC4uL3RtcC1vcmlnL3N3dC1n dGstMy4xL3hwY29tLmNwcCAuL3hwY29tLmNwcAp8LS0tIC4uL3RtcC1vcmlnL3N3dC1ndGstMy4x L3hwY29tLmNwcAkyMDA1LTAyLTAzIDAxOjA2OjUyLjAwMDAwMDAwMCArMDAwMAp8KysrIC4veHBj b20uY3BwCTIwMDUtMDktMTAgMDg6MjI6MzcuMDAwMDAwMDAwICswMDAwCi0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCk5vIGZpbGUgdG8gcGF0Y2guICBTa2lwcGluZyBwYXRjaC4KMTEgb3V0IG9m IDExIGh1bmtzIGlnbm9yZWQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KClBBVENIIENPTU1BTkQ6ICBwYXRjaCAtcDMgLWcwIC1FIC0tbm8tYmFja3VwLWlmLW1p c21hdGNoIDwgL3Vzci9wb3J0YWdlL2Rldi1qYXZhL3N3dC9maWxlcy9zd3QtMy4yLjEtbGlic3d0 LXhwY29tZ2NjNC5wYXRjaAoKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KbWlzc2luZyBoZWFkZXIgZm9yIHVuaWZpZWQgZGlmZiBhdCBsaW5lIDQgb2YgcGF0Y2gK cGF0Y2hpbmcgZmlsZSB4cGNvbS5jcHAKSHVuayAjMSBGQUlMRUQgYXQgMTQxLgpIdW5rICMyIEZB SUxFRCBhdCAxODY4LgpIdW5rICMzIEZBSUxFRCBhdCAxODgwLgpIdW5rICM0IEZBSUxFRCBhdCAx ODk0LgpIdW5rICM1IHN1Y2NlZWRlZCBhdCAyMTMxIChvZmZzZXQgMjIzIGxpbmVzKS4KSHVuayAj NiBGQUlMRUQgYXQgMjE1My4KSHVuayAjNyBGQUlMRUQgYXQgMjE2NS4KSHVuayAjOCBGQUlMRUQg YXQgMjE3OS4KSHVuayAjOSBzdWNjZWVkZWQgYXQgMjE5MyAob2Zmc2V0IDIyMyBsaW5lcykuCkh1 bmsgIzEwIHN1Y2NlZWRlZCBhdCAyMjA3IChvZmZzZXQgMjIzIGxpbmVzKS4KSHVuayAjMTEgRkFJ TEVEIGF0IDIyMzEuCjggb3V0IG9mIDExIGh1bmtzIEZBSUxFRCAtLSBzYXZpbmcgcmVqZWN0cyB0 byBmaWxlIHhwY29tLmNwcC5yZWoKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KClBBVENIIENPTU1BTkQ6ICBwYXRjaCAtcDQgLWcwIC1FIC0tbm8tYmFja3VwLWlm LW1pc21hdGNoIDwgL3Vzci9wb3J0YWdlL2Rldi1qYXZhL3N3dC9maWxlcy9zd3QtMy4yLjEtbGli c3d0LXhwY29tZ2NjNC5wYXRjaAoKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KbWlzc2luZyBoZWFkZXIgZm9yIHVuaWZpZWQgZGlmZiBhdCBsaW5lIDQgb2YgcGF0 Y2gKY2FuJ3QgZmluZCBmaWxlIHRvIHBhdGNoIGF0IGlucHV0IGxpbmUgNApQZXJoYXBzIHlvdSB1 c2VkIHRoZSB3cm9uZyAtcCBvciAtLXN0cmlwIG9wdGlvbj8KVGhlIHRleHQgbGVhZGluZyB1cCB0 byB0aGlzIHdhczoKLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KfGRpZmYgLXVyTiAuLi90bXAt b3JpZy9zd3QtZ3RrLTMuMS94cGNvbS5jcHAgLi94cGNvbS5jcHAKfC0tLSAuLi90bXAtb3JpZy9z d3QtZ3RrLTMuMS94cGNvbS5jcHAJMjAwNS0wMi0wMyAwMTowNjo1Mi4wMDAwMDAwMDAgKzAwMDAK fCsrKyAuL3hwY29tLmNwcAkyMDA1LTA5LTEwIDA4OjIyOjM3LjAwMDAwMDAwMCArMDAwMAotLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpObyBmaWxlIHRvIHBhdGNoLiAgU2tpcHBpbmcgcGF0Y2gu CjExIG91dCBvZiAxMSBodW5rcyBpZ25vcmVkCg== 102371 2006-11-19 20:47 0000 modified swt-3.2.1-libswt-xpcomgcc4.patch file swt-3.2.1-libswt-xpcomgcc4.patch text/plain ZGlmZiAtdXJOIC4uL3RtcC1vcmlnL3N3dC1ndGstMy4xL3hwY29tLmNwcCAuL3hwY29tLmNwcAot LS0gLi4vdG1wLW9yaWcvc3d0LWd0ay0zLjEveHBjb20uY3BwCTIwMDUtMDItMDMgMDE6MDY6NTIu MDAwMDAwMDAwICswMDAwCisrKyAuL3hwY29tLmNwcAkyMDA1LTA5LTEwIDA4OjIyOjM3LjAwMDAw MDAwMCArMDAwMApAQCAtMTQxLDcgKzE0MSw3IEBACiB7CiAJamludCByYyA9IDA7CiAJWFBDT01f TkFUSVZFX0VOVEVSKGVudiwgdGhhdCwgUFJfMU1hbGxvY19GVU5DKTsKLQlyYyA9IChqbG9uZylQ Ul9NYWxsb2MoYXJnMCk7CisJcmMgPSAobG9uZylQUl9NYWxsb2MoYXJnMCk7CiAJWFBDT01fTkFU SVZFX0VYSVQoZW52LCB0aGF0LCBQUl8xTWFsbG9jX0ZVTkMpOwogCXJldHVybiByYzsKIH0KQEAg LTE4NjgsNyArMTg2OCw3IEBACiB7CiAJamludCByYyA9IDA7CiAJWFBDT01fTkFUSVZFX0VOVEVS KGVudiwgdGhhdCwgbnNFbWJlZENTdHJpbmdfMWdldF9GVU5DKTsKLQlyYyA9IChqbG9uZykoKG5z RW1iZWRDU3RyaW5nICopYXJnMCktPmdldCgpOworCXJjID0gKGxvbmcpKChuc0VtYmVkQ1N0cmlu ZyAqKWFyZzApLT5nZXQoKTsKIAlYUENPTV9OQVRJVkVfRVhJVChlbnYsIHRoYXQsIG5zRW1iZWRD U3RyaW5nXzFnZXRfRlVOQyk7CiAJcmV0dXJuIHJjOwogfQpAQCAtMTg4MCw3ICsxODgwLDcgQEAK IHsKIAlqaW50IHJjID0gMDsKIAlYUENPTV9OQVRJVkVfRU5URVIoZW52LCB0aGF0LCBuc0VtYmVk Q1N0cmluZ18xbmV3X19fRlVOQyk7Ci0JcmMgPSAoamxvbmcpbmV3IG5zRW1iZWRDU3RyaW5nKCk7 CisJcmMgPSAobG9uZyluZXcgbnNFbWJlZENTdHJpbmcoKTsKIAlYUENPTV9OQVRJVkVfRVhJVChl bnYsIHRoYXQsIG5zRW1iZWRDU3RyaW5nXzFuZXdfX19GVU5DKTsKIAlyZXR1cm4gcmM7CiB9CkBA IC0xODk0LDcgKzE4OTQsNyBAQAogCWppbnQgcmMgPSAwOwogCVhQQ09NX05BVElWRV9FTlRFUihl bnYsIHRoYXQsIG5zRW1iZWRDU3RyaW5nXzFuZXdfX18zQklfRlVOQyk7CiAJaWYgKGFyZzApIGlm ICgobHBhcmcwID0gZW52LT5HZXRCeXRlQXJyYXlFbGVtZW50cyhhcmcwLCBOVUxMKSkgPT0gTlVM TCkgZ290byBmYWlsOwotCXJjID0gKGpsb25nKW5ldyBuc0VtYmVkQ1N0cmluZygoY29uc3QgY2hh ciAqKWxwYXJnMCwgYXJnMSk7CisJcmMgPSAobG9uZyluZXcgbnNFbWJlZENTdHJpbmcoKGNvbnN0 IGNoYXIgKilscGFyZzAsIGFyZzEpOwogZmFpbDoKIAlpZiAoYXJnMCAmJiBscGFyZzApIGVudi0+ UmVsZWFzZUJ5dGVBcnJheUVsZW1lbnRzKGFyZzAsIGxwYXJnMCwgMCk7CiAJWFBDT01fTkFUSVZF X0VYSVQoZW52LCB0aGF0LCBuc0VtYmVkQ1N0cmluZ18xbmV3X19fM0JJX0ZVTkMpOwpAQCAtMTkw OCw3ICsxOTA4LDcgQEAKIHsKIAlqaW50IHJjID0gMDsKIAlYUENPTV9OQVRJVkVfRU5URVIoZW52 LCB0aGF0LCBuc0VtYmVkU3RyaW5nXzFMZW5ndGhfRlVOQyk7Ci0JcmMgPSAoamludCkoKG5zRW1i ZWRTdHJpbmcgKilhcmcwKS0+TGVuZ3RoKCk7CisJcmMgPSAobG9uZykoKG5zRW1iZWRTdHJpbmcg KilhcmcwKS0+TGVuZ3RoKCk7CiAJWFBDT01fTkFUSVZFX0VYSVQoZW52LCB0aGF0LCBuc0VtYmVk U3RyaW5nXzFMZW5ndGhfRlVOQyk7CiAJcmV0dXJuIHJjOwogfQpAQCAtMTkzMCw3ICsxOTMwLDcg QEAKIHsKIAlqaW50IHJjID0gMDsKIAlYUENPTV9OQVRJVkVfRU5URVIoZW52LCB0aGF0LCBuc0Vt YmVkU3RyaW5nXzFnZXRfRlVOQyk7Ci0JcmMgPSAoamxvbmcpKChuc0VtYmVkU3RyaW5nICopYXJn MCktPmdldCgpOworCXJjID0gKGxvbmcpKChuc0VtYmVkU3RyaW5nICopYXJnMCktPmdldCgpOwog CVhQQ09NX05BVElWRV9FWElUKGVudiwgdGhhdCwgbnNFbWJlZFN0cmluZ18xZ2V0X0ZVTkMpOwog CXJldHVybiByYzsKIH0KQEAgLTE5NDIsNyArMTk0Miw3IEBACiB7CiAJamludCByYyA9IDA7CiAJ WFBDT01fTkFUSVZFX0VOVEVSKGVudiwgdGhhdCwgbnNFbWJlZFN0cmluZ18xbmV3X19fRlVOQyk7 Ci0JcmMgPSAoamxvbmcpbmV3IG5zRW1iZWRTdHJpbmcoKTsKKwlyYyA9IChsb25nKW5ldyBuc0Vt YmVkU3RyaW5nKCk7CiAJWFBDT01fTkFUSVZFX0VYSVQoZW52LCB0aGF0LCBuc0VtYmVkU3RyaW5n XzFuZXdfX19GVU5DKTsKIAlyZXR1cm4gcmM7CiB9CkBAIC0xOTU2LDcgKzE5NTYsNyBAQAogCWpp bnQgcmMgPSAwOwogCVhQQ09NX05BVElWRV9FTlRFUihlbnYsIHRoYXQsIG5zRW1iZWRTdHJpbmdf MW5ld19fXzNDX0ZVTkMpOwogCWlmIChhcmcwKSBpZiAoKGxwYXJnMCA9IGVudi0+R2V0Q2hhckFy cmF5RWxlbWVudHMoYXJnMCwgTlVMTCkpID09IE5VTEwpIGdvdG8gZmFpbDsKLQlyYyA9IChqbG9u ZyluZXcgbnNFbWJlZFN0cmluZyhscGFyZzApOworCXJjID0gKGxvbmcpbmV3IG5zRW1iZWRTdHJp bmcobHBhcmcwKTsKIGZhaWw6CiAJaWYgKGFyZzAgJiYgbHBhcmcwKSBlbnYtPlJlbGVhc2VDaGFy QXJyYXlFbGVtZW50cyhhcmcwLCBscGFyZzAsIDApOwogCVhQQ09NX05BVElWRV9FWElUKGVudiwg dGhhdCwgbnNFbWJlZFN0cmluZ18xbmV3X19fM0NfRlVOQyk7CkBAIC0xOTcwLDcgKzE5NzAsNyBA QAogewogCWpib29sZWFuIHJjID0gMDsKIAlYUENPTV9OQVRJVkVfRU5URVIoZW52LCB0aGF0LCBu c0lEXzFFcXVhbHNfRlVOQyk7Ci0JcmMgPSAoamJvb2xlYW4pKChuc0lEICopYXJnMCktPkVxdWFs cygqKG5zSUQgKilhcmcxKTsKKwlyYyA9IChsb25nKSgobnNJRCAqKWFyZzApLT5FcXVhbHMoKihu c0lEICopYXJnMSk7CiAJWFBDT01fTkFUSVZFX0VYSVQoZW52LCB0aGF0LCBuc0lEXzFFcXVhbHNf RlVOQyk7CiAJcmV0dXJuIHJjOwogfQpAQCAtMTk4NCw3ICsxOTg0LDcgQEAKIAlqYm9vbGVhbiBy YyA9IDA7CiAJWFBDT01fTkFUSVZFX0VOVEVSKGVudiwgdGhhdCwgbnNJRF8xUGFyc2VfRlVOQyk7 CiAJaWYgKGFyZzEpIGlmICgobHBhcmcxID0gZW52LT5HZXRTdHJpbmdVVEZDaGFycyhhcmcxLCBO VUxMKSkgPT0gTlVMTCkgZ290byBmYWlsOwotCXJjID0gKGpib29sZWFuKSgobnNJRCAqKWFyZzAp LT5QYXJzZSgoY29uc3QgY2hhciAqKWxwYXJnMSk7CisJcmMgPSAobG9uZykoKG5zSUQgKilhcmcw KS0+UGFyc2UoKGNvbnN0IGNoYXIgKilscGFyZzEpOwogZmFpbDoKIAlpZiAoYXJnMSAmJiBscGFy ZzEpIGVudi0+UmVsZWFzZVN0cmluZ1VURkNoYXJzKGFyZzEsIGxwYXJnMSk7CiAJWFBDT01fTkFU SVZFX0VYSVQoZW52LCB0aGF0LCBuc0lEXzFQYXJzZV9GVU5DKTsKQEAgLTIwMDgsNyArMjAwOCw3 IEBACiB7CiAJamludCByYyA9IDA7CiAJWFBDT01fTkFUSVZFX0VOVEVSKGVudiwgdGhhdCwgbnNJ RF8xbmV3X0ZVTkMpOwotCXJjID0gKGpsb25nKW5ldyBuc0lEKCk7CisJcmMgPSAobG9uZyluZXcg bnNJRCgpOwogCVhQQ09NX05BVElWRV9FWElUKGVudiwgdGhhdCwgbnNJRF8xbmV3X0ZVTkMpOwog CXJldHVybiByYzsKIH0K 102372 2006-11-19 20:50 0000 modified swt-3.2.1-firefox.patch file swt-3.2.1-firefox.patch text/plain ZGlmZiAtdSAtcjEuMzMuMi4xIG1ha2VfbGludXgubWFrCi0tLSBtYWtlX2xpbnV4Lm1hawkyNiBK dWwgMjAwNiAxNjozMzoyMyAtMDAwMAkxLjMzLjIuMQorKysgbWFrZV9saW51eC5tYWsJMjkgU2Vw IDIwMDYgMTM6MjE6NTEgLTAwMDAKQEAgLTIwMiw3ICsyMDIsNyBAQAogIwogIyBNb3ppbGxhIGxp YgogIwotbWFrZV9tb3ppbGxhOiQoTU9aSUxMQV9MSUIpICQoUFJPRklMRTE0X0xJQikgJChQUk9G SUxFMTdfTElCKSAkKFBST0ZJTEUxOF9MSUIpCittYWtlX21vemlsbGE6JChNT1pJTExBX0xJQikK IAogJChNT1pJTExBX0xJQik6ICQoTU9aSUxMQV9PQkpFQ1RTKQogCSQoQ1hYKSAtbyAkKE1PWklM TEFfTElCKSAkKE1PWklMTEFfT0JKRUNUUykgJChNT1pJTExBTElCUykgJHtHRUNLT19MSUJTfQpA QCAtMjIwLDIyICsyMjAsMjIgQEAKIAkkKENYWCkgJChNT1pJTExBQ0ZMQUdTKSAke0dFQ0tPX0lO Q0xVREVTfSAtYyB4cGNvbV9zdGF0cy5jcHAJCiAKICQoUFJPRklMRTE0X09CSkVDVFMpOiB4cGNv bV9wcm9maWxlLmNwcAotCSQoQ1hYKSAtbyAkKFBST0ZJTEUxNF9PQkpFQ1RTKSAkKE1PWklMTEFD RkxBR1MpICR7UFJPRklMRTE0X0lOQ0xVREVTfSAtYyB4cGNvbV9wcm9maWxlLmNwcAkKKwkkKENY WCkgLW8gJChQUk9GSUxFMTRfT0JKRUNUUykgJChNT1pJTExBQ0ZMQUdTKSAke1BST0ZJTEUxNF9J TkNMVURFU30gJHtHRUNLT19JTkNMVURFU30gLWMgeHBjb21fcHJvZmlsZS5jcHAJCiAKICQoUFJP RklMRTE3X09CSkVDVFMpOiB4cGNvbV9wcm9maWxlLmNwcAotCSQoQ1hYKSAtbyAkKFBST0ZJTEUx N19PQkpFQ1RTKSAkKE1PWklMTEFDRkxBR1MpICR7UFJPRklMRTE3X0lOQ0xVREVTfSAtYyB4cGNv bV9wcm9maWxlLmNwcAkKKwkkKENYWCkgLW8gJChQUk9GSUxFMTdfT0JKRUNUUykgJChNT1pJTExB Q0ZMQUdTKSAke1BST0ZJTEUxN19JTkNMVURFU30gJHtHRUNLT19JTkNMVURFU30gLWMgeHBjb21f cHJvZmlsZS5jcHAJCiAKICQoUFJPRklMRTE4X09CSkVDVFMpOiB4cGNvbV9wcm9maWxlLmNwcAot CSQoQ1hYKSAtbyAkKFBST0ZJTEUxOF9PQkpFQ1RTKSAkKE1PWklMTEFDRkxBR1MpICR7UFJPRklM RTE4X0lOQ0xVREVTfSAtYyB4cGNvbV9wcm9maWxlLmNwcAkKKwkkKENYWCkgLW8gJChQUk9GSUxF MThfT0JKRUNUUykgJChNT1pJTExBQ0ZMQUdTKSAke1BST0ZJTEUxOF9JTkNMVURFU30gJHtHRUNL T19JTkNMVURFU30gLWMgeHBjb21fcHJvZmlsZS5jcHAJCiAKICQoUFJPRklMRTE0X0xJQik6ICQo UFJPRklMRTE0X09CSkVDVFMpCi0JJChDWFgpIC1vICQoUFJPRklMRTE0X0xJQikgJChQUk9GSUxF MTRfT0JKRUNUUykgJChNT1pJTExBTElCUykgJHtQUk9GSUxFMTRfTElCU30KKwkkKENYWCkgLW8g JChQUk9GSUxFMTRfTElCKSAkKFBST0ZJTEUxNF9PQkpFQ1RTKSAkKE1PWklMTEFMSUJTKSAke1BS T0ZJTEUxNF9MSUJTfSAke0dFQ0tPX0xJQlN9CiAKICQoUFJPRklMRTE3X0xJQik6ICQoUFJPRklM RTE3X09CSkVDVFMpCi0JJChDWFgpIC1vICQoUFJPRklMRTE3X0xJQikgJChQUk9GSUxFMTdfT0JK RUNUUykgJChNT1pJTExBTElCUykgJHtQUk9GSUxFMTdfTElCU30KKwkkKENYWCkgLW8gJChQUk9G SUxFMTdfTElCKSAkKFBST0ZJTEUxN19PQkpFQ1RTKSAkKE1PWklMTEFMSUJTKSAke1BST0ZJTEUx N19MSUJTfSAke0dFQ0tPX0xJQlN9CiAKICQoUFJPRklMRTE4X0xJQik6ICQoUFJPRklMRTE4X09C SkVDVFMpCi0JJChDWFgpIC1vICQoUFJPRklMRTE4X0xJQikgJChQUk9GSUxFMThfT0JKRUNUUykg JChNT1pJTExBTElCUykgJHtQUk9GSUxFMThfTElCU30KKwkkKENYWCkgLW8gJChQUk9GSUxFMThf TElCKSAkKFBST0ZJTEUxOF9PQkpFQ1RTKSAkKE1PWklMTEFMSUJTKSAke1BST0ZJTEUxOF9MSUJT fSAke0dFQ0tPX0xJQlN9CiAKICMKICMgR0xYIGxpYgpAQCAtMjY0LDQgKzI2NCw0IEBACiAjIENs ZWFuCiAjCiBjbGVhbjoKLQlybSAtZiAqLm8gKi5zbworCXJtIC1mICoubyAqLnNvClwgTm8gbmV3 bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC11IC1yMS4xNS4yLjEgeHBjb21fc3RhdHMuY3BwCi0t LSB4cGNvbV9zdGF0cy5jcHAJMjYgSnVsIDIwMDYgMTY6MzM6MjMgLTAwMDAJMS4xNS4yLjEKKysr IHhwY29tX3N0YXRzLmNwcAkyOSBTZXAgMjAwNiAxMzoyMTo0OSAtMDAwMApAQCAtMzEsMTUgKzMx LDE0IEBACiAKICNpZmRlZiBOQVRJVkVfU1RBVFMKIAotaW50IFhQQ09NX25hdGl2ZUZ1bmN0aW9u Q291bnQgPSAxMzI7Ci1pbnQgWFBDT01fbmF0aXZlRnVuY3Rpb25DYWxsQ291bnRbMTMyXTsKK2lu dCBYUENPTV9uYXRpdmVGdW5jdGlvbkNvdW50ID0gMTMxOworaW50IFhQQ09NX25hdGl2ZUZ1bmN0 aW9uQ2FsbENvdW50WzEzMV07CiBjaGFyICogWFBDT01fbmF0aXZlRnVuY3Rpb25OYW1lc1tdID0g ewogCSJDYWxsIiwKIAkiTlNfMUdldENvbXBvbmVudE1hbmFnZXIiLAogCSJOU18xR2V0U2Vydmlj ZU1hbmFnZXIiLAotCSJOU18xSW5pdEVtYmVkZGluZyIsCisJIk5TXzFJbml0WFBDT00zX0ZVTkMi LAogCSJOU18xTmV3TG9jYWxGaWxlIiwKLQkiTlNfMVRlcm1FbWJlZGRpbmciLAogCSJQUl8xRnJl ZSIsCiAJIlBSXzFNYWxsb2MiLAogCSJWdGJsQ2FsbF9fSUkiLApkaWZmIC11IC1yMS4xLjIuMSB4 cGNvbV9wcm9maWxlLmgKLS0tIHhwY29tX3Byb2ZpbGUuaAkyNiBKdWwgMjAwNiAxNjozMzoyMyAt MDAwMAkxLjEuMi4xCisrKyB4cGNvbV9wcm9maWxlLmgJMjkgU2VwIDIwMDYgMTM6MjE6NDggLTAw MDAKQEAgLTMyLDcgKzMyLDcgQEAKICNkZWZpbmUgTkRFQlVHCiAKICNpbmNsdWRlICJuc0NPTVB0 ci5oIgotI2luY2x1ZGUgIm5zUHJvZmlsZURpclNlcnZpY2VQcm92aWRlci5oIgorI2luY2x1ZGUg InByb2ZkaXJzZXJ2aWNlcHJvdmlkZXIvbnNQcm9maWxlRGlyU2VydmljZVByb3ZpZGVyLmgiCiAj aW5jbHVkZSAieHBjb21fc3RhdHMuaCIKIAogI2VuZGlmIC8qIElOQ194cGNvbV9wcm9maWxlX0gg Ki8KZGlmZiAtdSAtcjEuNi4yLjEgeHBjb20uaAotLS0geHBjb20uaAkyNiBKdWwgMjAwNiAxNjoz MzoyMyAtMDAwMAkxLjYuMi4xCisrKyB4cGNvbS5oCTI5IFNlcCAyMDA2IDEzOjIxOjQ4IC0wMDAw CkBAIC0zMiw3ICszMiw2IEBACiAjZGVmaW5lIE5ERUJVRwogCiAjaW5jbHVkZSAibnNYUENPTS5o IgotI2luY2x1ZGUgIm5zRW1iZWRBUEkuaCIJCiAjaW5jbHVkZSAibnNFbWJlZFN0cmluZy5oIgog I2luY2x1ZGUgIm5zSUlucHV0U3RyZWFtLmgiCiAjaW5jbHVkZSAibnNJU3VwcG9ydHNVdGlscy5o IgpkaWZmIC11IC1yMS4yOS4yLjEgeHBjb20uY3BwCi0tLSB4cGNvbS5jcHAJMjYgSnVsIDIwMDYg MTY6MzM6MjMgLTAwMDAJMS4yOS4yLjEKKysrIHhwY29tLmNwcAkyOSBTZXAgMjAwNiAxMzoyMTo0 OCAtMDAwMApAQCAtODUsMTQgKzg1LDE2IEBACiB9CiAjZW5kaWYKIAotI2lmbmRlZiBOT19OU18x SW5pdEVtYmVkZGluZwotSk5JRVhQT1JUIGppbnQgSk5JQ0FMTCBYUENPTV9OQVRJVkUoTlNfMUlu aXRFbWJlZGRpbmcpCi0JKEpOSUVudiAqZW52LCBqY2xhc3MgdGhhdCwgamxvbmcgYXJnMCwgamxv bmcgYXJnMSkKKyNpZm5kZWYgTk9fTlNfMUluaXRYUENPTTMKK0pOSUVYUE9SVCBqaW50IEpOSUNB TEwgWFBDT01fTkFUSVZFKE5TXzFJbml0WFBDT00zKQorCShKTklFbnYgKmVudiwgamNsYXNzIHRo YXQsIGpsb25nIGFyZzAsIGpsb25nIGFyZzEsIGpsb25nIGFyZzIsIGpsb25nIGFyZzMsIGpsb25n IGFyZzQpCiB7CiAJamludCByYyA9IDA7Ci0JWFBDT01fTkFUSVZFX0VOVEVSKGVudiwgdGhhdCwg TlNfMUluaXRFbWJlZGRpbmdfRlVOQyk7Ci0JcmMgPSAoamludClOU19Jbml0RW1iZWRkaW5nKChu c0lMb2NhbEZpbGUgKilhcmcwLCAobnNJRGlyZWN0b3J5U2VydmljZVByb3ZpZGVyICopYXJnMSk7 Ci0JWFBDT01fTkFUSVZFX0VYSVQoZW52LCB0aGF0LCBOU18xSW5pdEVtYmVkZGluZ19GVU5DKTsK KwlYUENPTV9OQVRJVkVfRU5URVIoZW52LCB0aGF0LCBOU18xR2V0Q29tcG9uZW50UmVnaXN0cmFy X0ZVTkMpOworCXJjID0gKGppbnQpTlNfSW5pdFhQQ09NMygobnNJU2VydmljZU1hbmFnZXIgKiop YXJnMCwgKG5zSUZpbGUgKilhcmcxLAorCQkobnNJRGlyZWN0b3J5U2VydmljZVByb3ZpZGVyICop YXJnMiwgKG5zU3RhdGljTW9kdWxlSW5mbyAqKWFyZzMsCisJCShQUlVpbnQzMikgYXJnNCk7CisJ WFBDT01fTkFUSVZFX0VYSVQoZW52LCB0aGF0LCBOU18xR2V0Q29tcG9uZW50UmVnaXN0cmFyX0ZV TkMpOwogCXJldHVybiByYzsKIH0KICNlbmRpZgpAQCAtMTEzLDE4ICsxMTUsNiBAQAogfQogI2Vu ZGlmCiAKLSNpZm5kZWYgTk9fTlNfMVRlcm1FbWJlZGRpbmcKLUpOSUVYUE9SVCBqaW50IEpOSUNB TEwgWFBDT01fTkFUSVZFKE5TXzFUZXJtRW1iZWRkaW5nKQotCShKTklFbnYgKmVudiwgamNsYXNz IHRoYXQpCi17Ci0JamludCByYyA9IDA7Ci0JWFBDT01fTkFUSVZFX0VOVEVSKGVudiwgdGhhdCwg TlNfMVRlcm1FbWJlZGRpbmdfRlVOQyk7Ci0JcmMgPSAoamludClOU19UZXJtRW1iZWRkaW5nKCk7 Ci0JWFBDT01fTkFUSVZFX0VYSVQoZW52LCB0aGF0LCBOU18xVGVybUVtYmVkZGluZ19GVU5DKTsK LQlyZXR1cm4gcmM7Ci19Ci0jZW5kaWYKLQogI2lmbmRlZiBOT19QUl8xRnJlZQogSk5JRVhQT1JU IHZvaWQgSk5JQ0FMTCBYUENPTV9OQVRJVkUoUFJfMUZyZWUpCiAJKEpOSUVudiAqZW52LCBqY2xh c3MgdGhhdCwgamludCBhcmcwKQpkaWZmIC11IC1yMS4xNC4yLjEgeHBjb21fc3RhdHMuaAotLS0g eHBjb21fc3RhdHMuaAkyNiBKdWwgMjAwNiAxNjozMzoyMyAtMDAwMAkxLjE0LjIuMQorKysgeHBj b21fc3RhdHMuaAkyOSBTZXAgMjAwNiAxMzoyMTo0OSAtMDAwMApAQCAtNDEsOSArNDEsOCBAQAog CUNhbGxfRlVOQywKIAlOU18xR2V0Q29tcG9uZW50TWFuYWdlcl9GVU5DLAogCU5TXzFHZXRTZXJ2 aWNlTWFuYWdlcl9GVU5DLAotCU5TXzFJbml0RW1iZWRkaW5nX0ZVTkMsCisJTlNfMUluaXRYUENP TTNfRlVOQywKIAlOU18xTmV3TG9jYWxGaWxlX0ZVTkMsCi0JTlNfMVRlcm1FbWJlZGRpbmdfRlVO QywKIAlQUl8xRnJlZV9GVU5DLAogCVBSXzFNYWxsb2NfRlVOQywKIAlWdGJsQ2FsbF9fSUlfRlVO QywK