22586 2008-12-01 20:32:06 -0800 Remove WebCore CG-specific functions from Cairo Build of WebKit (Windows) 2008-12-02 11:01:18 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 bfulgham webkit-unassigned oldest_to_newest 100953 0 bfulgham 2008-12-01 20:32:06 -0800 The FontDatabase class is only needed for processing CG-based fonts. Since these are not used in the Cairo version of the Windows build, remove the database from the Cairo Windows target. 100954 1 25657 bfulgham 2008-12-01 20:48:58 -0800 Created attachment 25657 Remove FontDatabase from Windows Cairo build. 100955 2 25658 bfulgham 2008-12-01 20:48:59 -0800 Created attachment 25658 Remove FontDatabase from Windows Cairo build. 100970 3 25658 aroben 2008-12-01 22:12:33 -0800 Comment on attachment 25658 Remove FontDatabase from Windows Cairo build. > Index: WebCore/ChangeLog > =================================================================== > --- WebCore/ChangeLog (revision 38852) > +++ WebCore/ChangeLog (working copy) > @@ -1,3 +1,15 @@ > +2008-11-30 Brent Fulgham <bfulgham@gmail.com> > + > + Reviewed by NOBODY (OOPS!). > + > + https://bugs.webkit.org/show_bug.cgi?id=22586 > + Remove FontDatabase files from Cairo Windows build. Maybe you should make the name of the bug more general since you're making other fixes in this change. > + static Color focusRingColor; > + > + if (!focusRingColor.isValid()) > + focusRingColor = aquaFocusRingColor; You can do this all in one statement: static Color focusRingColor = aquaFocusRingColor; > + void populateFontDatabase() { /* Do nothing */ } Why not just add this one stub to platform/win/TemporaryLinkStubs.cpp? r- because I don't think it's good to add another link stub file with a different name that's only for Cairo (at least not if the name doesn't indicate it's only for Cairo). 101010 4 25672 bfulgham 2008-12-02 09:31:00 -0800 Created attachment 25672 Patch to remove some CG-specific code from the Cairo build. Revised patch based on aroben's comments: 1. Using the canonical stub file. 2. Switched to simplified focusRingColor implementation. 3. Revised bug title and description. 101011 5 25672 aroben 2008-12-02 09:35:21 -0800 Comment on attachment 25672 Patch to remove some CG-specific code from the Cairo build. > Index: WebCore/ChangeLog > =================================================================== > --- WebCore/ChangeLog (revision 38897) > +++ WebCore/ChangeLog (working copy) > @@ -1,3 +1,15 @@ > +2008-12-01 Brent Fulgham <bfulgham@gmail.com> > + > + Reviewed by NOBODY (OOPS!). > + > + WARNING: NO TEST CASES ADDED OR CHANGED You should still reference the bug in the ChangeLog. You should also remove this line about no tests being added, and replace it with an explanation. r=me 101013 6 25673 bfulgham 2008-12-02 09:42:27 -0800 Created attachment 25673 Patch to remove some CG-specific code from the Cairo build. Revised patch to address aroben's ChangeLog suggestions. 101014 7 25673 aroben 2008-12-02 09:43:46 -0800 Comment on attachment 25673 Patch to remove some CG-specific code from the Cairo build. r=me 101024 8 eric 2008-12-02 11:01:18 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/WebCore.vcproj/WebCore.vcproj M WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp M WebCore/platform/win/TemporaryLinkStubs.cpp Committed r38906 25657 2008-12-01 20:48:58 -0800 2008-12-01 21:45:01 -0800 Remove FontDatabase from Windows Cairo build. font_database.patch text/plain 6169 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODg1MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDgtMTEtMzAgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTg2CisgICAgICAgIFJl bW92ZSBGb250RGF0YWJhc2UgZmlsZXMgZnJvbSBDYWlybyBXaW5kb3dzIGJ1aWxkLiAKKworICAg ICAgICAqIFdlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qOgorICAgICAgICAgIDEuICBSZW1v dmUgRm9udERhdGFiYXNlIGZpbGVzIGZyb20gV2luZG93cyBDYWlybyBidWlsZC4KKyAgICAgICAg ICAyLiAgQWRkIGEgc21hbGwgV2luU3R1YnMuY3BwIGZpbGUgZm9yIENhaXJvIChidXQgbm90IENH KSBidWlsZC4KKyAgICAgICAgICAzLiAgUmVtb3ZlIENvbG9yU2FmYXJpLmNwcCBmcm9tIENhaXJv IGJ1aWxkLgorCiAyMDA4LTExLTMwICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAd2Via2l0Lm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJbmRleDogV2ViQ29yZS9X ZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNv cmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCShyZXZpc2lvbiAzODg1MikKKysrIFdlYkNvcmUvV2Vi Q29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oJKHdvcmtpbmcgY29weSkKQEAgLTQwMTQsNiArNDAz MCwyMiBAQAogCQkJCQk8RmlsZQ0KIAkJCQkJCVJlbGF0aXZlUGF0aD0iLi5ccGxhdGZvcm1cZ3Jh cGhpY3Ncd2luXENvbG9yU2FmYXJpLmNwcCINCiAJCQkJCQk+DQorCQkJCQkJPEZpbGVDb25maWd1 cmF0aW9uDQorCQkJCQkJCU5hbWU9IkRlYnVnX0NhaXJvfFdpbjMyIg0KKwkJCQkJCQlFeGNsdWRl ZEZyb21CdWlsZD0idHJ1ZSINCisJCQkJCQkJPg0KKwkJCQkJCQk8VG9vbA0KKwkJCQkJCQkJTmFt ZT0iVkNDTENvbXBpbGVyVG9vbCINCisJCQkJCQkJLz4NCisJCQkJCQk8L0ZpbGVDb25maWd1cmF0 aW9uPg0KKwkJCQkJCTxGaWxlQ29uZmlndXJhdGlvbg0KKwkJCQkJCQlOYW1lPSJSZWxlYXNlX0Nh aXJvfFdpbjMyIg0KKwkJCQkJCQlFeGNsdWRlZEZyb21CdWlsZD0idHJ1ZSINCisJCQkJCQkJPg0K KwkJCQkJCQk8VG9vbA0KKwkJCQkJCQkJTmFtZT0iVkNDTENvbXBpbGVyVG9vbCINCisJCQkJCQkJ Lz4NCisJCQkJCQk8L0ZpbGVDb25maWd1cmF0aW9uPg0KIAkJCQkJPC9GaWxlPg0KIAkJCQkJPEZp bGUNCiAJCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXHBsYXRmb3JtXGdyYXBoaWNzXHdpblxGb250Q2Fj aGVXaW4uY3BwIg0KQEAgLTQxMDIsMTAgKzQxMzQsNDAgQEAKIAkJCQkJPEZpbGUNCiAJCQkJCQlS ZWxhdGl2ZVBhdGg9Ii4uXHBsYXRmb3JtXGdyYXBoaWNzXHdpblxGb250RGF0YWJhc2UuY3BwIg0K IAkJCQkJCT4NCisJCQkJCQk8RmlsZUNvbmZpZ3VyYXRpb24NCisJCQkJCQkJTmFtZT0iRGVidWdf Q2Fpcm98V2luMzIiDQorCQkJCQkJCUV4Y2x1ZGVkRnJvbUJ1aWxkPSJ0cnVlIg0KKwkJCQkJCQk+ DQorCQkJCQkJCTxUb29sDQorCQkJCQkJCQlOYW1lPSJWQ0NMQ29tcGlsZXJUb29sIg0KKwkJCQkJ CQkvPg0KKwkJCQkJCTwvRmlsZUNvbmZpZ3VyYXRpb24+DQorCQkJCQkJPEZpbGVDb25maWd1cmF0 aW9uDQorCQkJCQkJCU5hbWU9IlJlbGVhc2VfQ2Fpcm98V2luMzIiDQorCQkJCQkJCUV4Y2x1ZGVk RnJvbUJ1aWxkPSJ0cnVlIg0KKwkJCQkJCQk+DQorCQkJCQkJCTxUb29sDQorCQkJCQkJCQlOYW1l PSJWQ0NMQ29tcGlsZXJUb29sIg0KKwkJCQkJCQkvPg0KKwkJCQkJCTwvRmlsZUNvbmZpZ3VyYXRp b24+DQogCQkJCQk8L0ZpbGU+DQogCQkJCQk8RmlsZQ0KIAkJCQkJCVJlbGF0aXZlUGF0aD0iLi5c cGxhdGZvcm1cZ3JhcGhpY3Ncd2luXEZvbnREYXRhYmFzZS5oIg0KIAkJCQkJCT4NCisJCQkJCQk8 RmlsZUNvbmZpZ3VyYXRpb24NCisJCQkJCQkJTmFtZT0iRGVidWdfQ2Fpcm98V2luMzIiDQorCQkJ CQkJCT4NCisJCQkJCQkJPFRvb2wNCisJCQkJCQkJCU5hbWU9IlZDQ3VzdG9tQnVpbGRUb29sIg0K KwkJCQkJCQkvPg0KKwkJCQkJCTwvRmlsZUNvbmZpZ3VyYXRpb24+DQorCQkJCQkJPEZpbGVDb25m aWd1cmF0aW9uDQorCQkJCQkJCU5hbWU9IlJlbGVhc2VfQ2Fpcm98V2luMzIiDQorCQkJCQkJCT4N CisJCQkJCQkJPFRvb2wNCisJCQkJCQkJCU5hbWU9IlZDQ3VzdG9tQnVpbGRUb29sIg0KKwkJCQkJ CQkvPg0KKwkJCQkJCTwvRmlsZUNvbmZpZ3VyYXRpb24+DQogCQkJCQk8L0ZpbGU+DQogCQkJCQk8 RmlsZQ0KIAkJCQkJCVJlbGF0aXZlUGF0aD0iLi5ccGxhdGZvcm1cZ3JhcGhpY3Ncd2luXEZvbnRQ bGF0Zm9ybURhdGEuaCINCkBAIC00NTMxLDYgKzQ1OTMsNDIgQEAKIAkJCQkJCVJlbGF0aXZlUGF0 aD0iLi5ccGxhdGZvcm1cZ3JhcGhpY3Ncd2luXFVuaXNjcmliZUNvbnRyb2xsZXIuaCINCiAJCQkJ CQk+DQogCQkJCQk8L0ZpbGU+DQorCQkJCQk8RmlsZQ0KKwkJCQkJCVJlbGF0aXZlUGF0aD0iLi5c cGxhdGZvcm1cZ3JhcGhpY3Ncd2luXFdpblN0dWJzLmNwcCINCisJCQkJCQk+DQorCQkJCQkJPEZp bGVDb25maWd1cmF0aW9uDQorCQkJCQkJCU5hbWU9IkRlYnVnfFdpbjMyIg0KKwkJCQkJCQlFeGNs dWRlZEZyb21CdWlsZD0idHJ1ZSINCisJCQkJCQkJPg0KKwkJCQkJCQk8VG9vbA0KKwkJCQkJCQkJ TmFtZT0iVkNDTENvbXBpbGVyVG9vbCINCisJCQkJCQkJLz4NCisJCQkJCQk8L0ZpbGVDb25maWd1 cmF0aW9uPg0KKwkJCQkJCTxGaWxlQ29uZmlndXJhdGlvbg0KKwkJCQkJCQlOYW1lPSJSZWxlYXNl fFdpbjMyIg0KKwkJCQkJCQlFeGNsdWRlZEZyb21CdWlsZD0idHJ1ZSINCisJCQkJCQkJPg0KKwkJ CQkJCQk8VG9vbA0KKwkJCQkJCQkJTmFtZT0iVkNDTENvbXBpbGVyVG9vbCINCisJCQkJCQkJLz4N CisJCQkJCQk8L0ZpbGVDb25maWd1cmF0aW9uPg0KKwkJCQkJCTxGaWxlQ29uZmlndXJhdGlvbg0K KwkJCQkJCQlOYW1lPSJEZWJ1Z19JbnRlcm5hbHxXaW4zMiINCisJCQkJCQkJRXhjbHVkZWRGcm9t QnVpbGQ9InRydWUiDQorCQkJCQkJCT4NCisJCQkJCQkJPFRvb2wNCisJCQkJCQkJCU5hbWU9IlZD Q0xDb21waWxlclRvb2wiDQorCQkJCQkJCS8+DQorCQkJCQkJPC9GaWxlQ29uZmlndXJhdGlvbj4N CisJCQkJCQk8RmlsZUNvbmZpZ3VyYXRpb24NCisJCQkJCQkJTmFtZT0iUmVsZWFzZV9QR098V2lu MzIiDQorCQkJCQkJCUV4Y2x1ZGVkRnJvbUJ1aWxkPSJ0cnVlIg0KKwkJCQkJCQk+DQorCQkJCQkJ CTxUb29sDQorCQkJCQkJCQlOYW1lPSJWQ0NMQ29tcGlsZXJUb29sIg0KKwkJCQkJCQkvPg0KKwkJ CQkJCTwvRmlsZUNvbmZpZ3VyYXRpb24+DQorCQkJCQk8L0ZpbGU+DQogCQkJCTwvRmlsdGVyPg0K IAkJCQk8RmlsdGVyDQogCQkJCQlOYW1lPSJjZyINCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcAkocmV2 aXNpb24gMzg4NTIpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNz Q29udGV4dENhaXJvLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjIsNiArNjIsMTggQEAKIAogbmFt ZXNwYWNlIFdlYkNvcmUgewogCitzdGF0aWMgY29uc3QgdW5zaWduZWQgYXF1YUZvY3VzUmluZ0Nv bG9yID0gMHhGRjdEQUREOTsKKworQ29sb3IgZm9jdXNSaW5nQ29sb3IoKQoreworICAgIHN0YXRp YyBDb2xvciBmb2N1c1JpbmdDb2xvcjsKKworICAgIGlmICghZm9jdXNSaW5nQ29sb3IuaXNWYWxp ZCgpKQorICAgICAgICBmb2N1c1JpbmdDb2xvciA9IGFxdWFGb2N1c1JpbmdDb2xvcjsKKworICAg IHJldHVybiBmb2N1c1JpbmdDb2xvcjsKK30KKwogc3RhdGljIGlubGluZSB2b2lkIHNldENvbG9y KGNhaXJvX3QqIGNyLCBjb25zdCBDb2xvciYgY29sKQogewogICAgIGZsb2F0IHJlZCwgZ3JlZW4s IGJsdWUsIGFscGhhOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vV2luU3R1 YnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1dpblN0 dWJzLmNwcAkocmV2aXNpb24gMCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1dp blN0dWJzLmNwcAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyOCBAQAorLyoKKyAqIENvcHlyaWdo dCAoQykgMjAwOCBCcmVudCBGdWxnaGFtIDxiZnVsZ2hhbUBnbWFpbC5jb20+CisgKgorICogUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMg b2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy LgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRo ZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24g YW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisg KgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBDT01QVVRFUiwgSU5DLiBg YEFTIElTJycgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKKyAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBN RVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBB UkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIENPTVBVVEVSLCBJTkMuIE9S CisgKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5D SURFTlRBTCwgU1BFQ0lBTCwKKyAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VT IChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFBST0NVUkVNRU5UIE9GIFNVQlNU SVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgorICogUFJPRklU UzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRI RU9SWQorICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklM SVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4g SUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KK25hbWVz cGFjZSBXZWJDb3JlIHsKKworICAgIHZvaWQgcG9wdWxhdGVGb250RGF0YWJhc2UoKSB7IC8qIERv IG5vdGhpbmcgKi8gfQorfQoKUHJvcGVydHkgY2hhbmdlcyBvbjogV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy93aW4vV2luU3R1YnMuY3BwCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWRkZWQ6IHN2bjplb2wtc3R5bGUK ICAgKyBuYXRpdmUKCg== 25658 2008-12-01 20:48:59 -0800 2008-12-02 09:31:00 -0800 Remove FontDatabase from Windows Cairo build. font_database.patch text/plain 6169 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODg1MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDgtMTEtMzAgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTg2CisgICAgICAgIFJl bW92ZSBGb250RGF0YWJhc2UgZmlsZXMgZnJvbSBDYWlybyBXaW5kb3dzIGJ1aWxkLiAKKworICAg ICAgICAqIFdlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qOgorICAgICAgICAgIDEuICBSZW1v dmUgRm9udERhdGFiYXNlIGZpbGVzIGZyb20gV2luZG93cyBDYWlybyBidWlsZC4KKyAgICAgICAg ICAyLiAgQWRkIGEgc21hbGwgV2luU3R1YnMuY3BwIGZpbGUgZm9yIENhaXJvIChidXQgbm90IENH KSBidWlsZC4KKyAgICAgICAgICAzLiAgUmVtb3ZlIENvbG9yU2FmYXJpLmNwcCBmcm9tIENhaXJv IGJ1aWxkLgorCiAyMDA4LTExLTMwICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAd2Via2l0Lm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJbmRleDogV2ViQ29yZS9X ZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNv cmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCShyZXZpc2lvbiAzODg1MikKKysrIFdlYkNvcmUvV2Vi Q29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oJKHdvcmtpbmcgY29weSkKQEAgLTQwMTQsNiArNDAz MCwyMiBAQAogCQkJCQk8RmlsZQ0KIAkJCQkJCVJlbGF0aXZlUGF0aD0iLi5ccGxhdGZvcm1cZ3Jh cGhpY3Ncd2luXENvbG9yU2FmYXJpLmNwcCINCiAJCQkJCQk+DQorCQkJCQkJPEZpbGVDb25maWd1 cmF0aW9uDQorCQkJCQkJCU5hbWU9IkRlYnVnX0NhaXJvfFdpbjMyIg0KKwkJCQkJCQlFeGNsdWRl ZEZyb21CdWlsZD0idHJ1ZSINCisJCQkJCQkJPg0KKwkJCQkJCQk8VG9vbA0KKwkJCQkJCQkJTmFt ZT0iVkNDTENvbXBpbGVyVG9vbCINCisJCQkJCQkJLz4NCisJCQkJCQk8L0ZpbGVDb25maWd1cmF0 aW9uPg0KKwkJCQkJCTxGaWxlQ29uZmlndXJhdGlvbg0KKwkJCQkJCQlOYW1lPSJSZWxlYXNlX0Nh aXJvfFdpbjMyIg0KKwkJCQkJCQlFeGNsdWRlZEZyb21CdWlsZD0idHJ1ZSINCisJCQkJCQkJPg0K KwkJCQkJCQk8VG9vbA0KKwkJCQkJCQkJTmFtZT0iVkNDTENvbXBpbGVyVG9vbCINCisJCQkJCQkJ Lz4NCisJCQkJCQk8L0ZpbGVDb25maWd1cmF0aW9uPg0KIAkJCQkJPC9GaWxlPg0KIAkJCQkJPEZp bGUNCiAJCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXHBsYXRmb3JtXGdyYXBoaWNzXHdpblxGb250Q2Fj aGVXaW4uY3BwIg0KQEAgLTQxMDIsMTAgKzQxMzQsNDAgQEAKIAkJCQkJPEZpbGUNCiAJCQkJCQlS ZWxhdGl2ZVBhdGg9Ii4uXHBsYXRmb3JtXGdyYXBoaWNzXHdpblxGb250RGF0YWJhc2UuY3BwIg0K IAkJCQkJCT4NCisJCQkJCQk8RmlsZUNvbmZpZ3VyYXRpb24NCisJCQkJCQkJTmFtZT0iRGVidWdf Q2Fpcm98V2luMzIiDQorCQkJCQkJCUV4Y2x1ZGVkRnJvbUJ1aWxkPSJ0cnVlIg0KKwkJCQkJCQk+ DQorCQkJCQkJCTxUb29sDQorCQkJCQkJCQlOYW1lPSJWQ0NMQ29tcGlsZXJUb29sIg0KKwkJCQkJ CQkvPg0KKwkJCQkJCTwvRmlsZUNvbmZpZ3VyYXRpb24+DQorCQkJCQkJPEZpbGVDb25maWd1cmF0 aW9uDQorCQkJCQkJCU5hbWU9IlJlbGVhc2VfQ2Fpcm98V2luMzIiDQorCQkJCQkJCUV4Y2x1ZGVk RnJvbUJ1aWxkPSJ0cnVlIg0KKwkJCQkJCQk+DQorCQkJCQkJCTxUb29sDQorCQkJCQkJCQlOYW1l PSJWQ0NMQ29tcGlsZXJUb29sIg0KKwkJCQkJCQkvPg0KKwkJCQkJCTwvRmlsZUNvbmZpZ3VyYXRp b24+DQogCQkJCQk8L0ZpbGU+DQogCQkJCQk8RmlsZQ0KIAkJCQkJCVJlbGF0aXZlUGF0aD0iLi5c cGxhdGZvcm1cZ3JhcGhpY3Ncd2luXEZvbnREYXRhYmFzZS5oIg0KIAkJCQkJCT4NCisJCQkJCQk8 RmlsZUNvbmZpZ3VyYXRpb24NCisJCQkJCQkJTmFtZT0iRGVidWdfQ2Fpcm98V2luMzIiDQorCQkJ CQkJCT4NCisJCQkJCQkJPFRvb2wNCisJCQkJCQkJCU5hbWU9IlZDQ3VzdG9tQnVpbGRUb29sIg0K KwkJCQkJCQkvPg0KKwkJCQkJCTwvRmlsZUNvbmZpZ3VyYXRpb24+DQorCQkJCQkJPEZpbGVDb25m aWd1cmF0aW9uDQorCQkJCQkJCU5hbWU9IlJlbGVhc2VfQ2Fpcm98V2luMzIiDQorCQkJCQkJCT4N CisJCQkJCQkJPFRvb2wNCisJCQkJCQkJCU5hbWU9IlZDQ3VzdG9tQnVpbGRUb29sIg0KKwkJCQkJ CQkvPg0KKwkJCQkJCTwvRmlsZUNvbmZpZ3VyYXRpb24+DQogCQkJCQk8L0ZpbGU+DQogCQkJCQk8 RmlsZQ0KIAkJCQkJCVJlbGF0aXZlUGF0aD0iLi5ccGxhdGZvcm1cZ3JhcGhpY3Ncd2luXEZvbnRQ bGF0Zm9ybURhdGEuaCINCkBAIC00NTMxLDYgKzQ1OTMsNDIgQEAKIAkJCQkJCVJlbGF0aXZlUGF0 aD0iLi5ccGxhdGZvcm1cZ3JhcGhpY3Ncd2luXFVuaXNjcmliZUNvbnRyb2xsZXIuaCINCiAJCQkJ CQk+DQogCQkJCQk8L0ZpbGU+DQorCQkJCQk8RmlsZQ0KKwkJCQkJCVJlbGF0aXZlUGF0aD0iLi5c cGxhdGZvcm1cZ3JhcGhpY3Ncd2luXFdpblN0dWJzLmNwcCINCisJCQkJCQk+DQorCQkJCQkJPEZp bGVDb25maWd1cmF0aW9uDQorCQkJCQkJCU5hbWU9IkRlYnVnfFdpbjMyIg0KKwkJCQkJCQlFeGNs dWRlZEZyb21CdWlsZD0idHJ1ZSINCisJCQkJCQkJPg0KKwkJCQkJCQk8VG9vbA0KKwkJCQkJCQkJ TmFtZT0iVkNDTENvbXBpbGVyVG9vbCINCisJCQkJCQkJLz4NCisJCQkJCQk8L0ZpbGVDb25maWd1 cmF0aW9uPg0KKwkJCQkJCTxGaWxlQ29uZmlndXJhdGlvbg0KKwkJCQkJCQlOYW1lPSJSZWxlYXNl fFdpbjMyIg0KKwkJCQkJCQlFeGNsdWRlZEZyb21CdWlsZD0idHJ1ZSINCisJCQkJCQkJPg0KKwkJ CQkJCQk8VG9vbA0KKwkJCQkJCQkJTmFtZT0iVkNDTENvbXBpbGVyVG9vbCINCisJCQkJCQkJLz4N CisJCQkJCQk8L0ZpbGVDb25maWd1cmF0aW9uPg0KKwkJCQkJCTxGaWxlQ29uZmlndXJhdGlvbg0K KwkJCQkJCQlOYW1lPSJEZWJ1Z19JbnRlcm5hbHxXaW4zMiINCisJCQkJCQkJRXhjbHVkZWRGcm9t QnVpbGQ9InRydWUiDQorCQkJCQkJCT4NCisJCQkJCQkJPFRvb2wNCisJCQkJCQkJCU5hbWU9IlZD Q0xDb21waWxlclRvb2wiDQorCQkJCQkJCS8+DQorCQkJCQkJPC9GaWxlQ29uZmlndXJhdGlvbj4N CisJCQkJCQk8RmlsZUNvbmZpZ3VyYXRpb24NCisJCQkJCQkJTmFtZT0iUmVsZWFzZV9QR098V2lu MzIiDQorCQkJCQkJCUV4Y2x1ZGVkRnJvbUJ1aWxkPSJ0cnVlIg0KKwkJCQkJCQk+DQorCQkJCQkJ CTxUb29sDQorCQkJCQkJCQlOYW1lPSJWQ0NMQ29tcGlsZXJUb29sIg0KKwkJCQkJCQkvPg0KKwkJ CQkJCTwvRmlsZUNvbmZpZ3VyYXRpb24+DQorCQkJCQk8L0ZpbGU+DQogCQkJCTwvRmlsdGVyPg0K IAkJCQk8RmlsdGVyDQogCQkJCQlOYW1lPSJjZyINCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcAkocmV2 aXNpb24gMzg4NTIpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNz Q29udGV4dENhaXJvLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjIsNiArNjIsMTggQEAKIAogbmFt ZXNwYWNlIFdlYkNvcmUgewogCitzdGF0aWMgY29uc3QgdW5zaWduZWQgYXF1YUZvY3VzUmluZ0Nv bG9yID0gMHhGRjdEQUREOTsKKworQ29sb3IgZm9jdXNSaW5nQ29sb3IoKQoreworICAgIHN0YXRp YyBDb2xvciBmb2N1c1JpbmdDb2xvcjsKKworICAgIGlmICghZm9jdXNSaW5nQ29sb3IuaXNWYWxp ZCgpKQorICAgICAgICBmb2N1c1JpbmdDb2xvciA9IGFxdWFGb2N1c1JpbmdDb2xvcjsKKworICAg IHJldHVybiBmb2N1c1JpbmdDb2xvcjsKK30KKwogc3RhdGljIGlubGluZSB2b2lkIHNldENvbG9y KGNhaXJvX3QqIGNyLCBjb25zdCBDb2xvciYgY29sKQogewogICAgIGZsb2F0IHJlZCwgZ3JlZW4s IGJsdWUsIGFscGhhOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vV2luU3R1 YnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1dpblN0 dWJzLmNwcAkocmV2aXNpb24gMCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1dp blN0dWJzLmNwcAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyOCBAQAorLyoKKyAqIENvcHlyaWdo dCAoQykgMjAwOCBCcmVudCBGdWxnaGFtIDxiZnVsZ2hhbUBnbWFpbC5jb20+CisgKgorICogUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMg b2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy LgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRo ZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24g YW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisg KgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBDT01QVVRFUiwgSU5DLiBg YEFTIElTJycgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKKyAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBN RVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBB UkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIENPTVBVVEVSLCBJTkMuIE9S CisgKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5D SURFTlRBTCwgU1BFQ0lBTCwKKyAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VT IChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFBST0NVUkVNRU5UIE9GIFNVQlNU SVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgorICogUFJPRklU UzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRI RU9SWQorICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklM SVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4g SUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KK25hbWVz cGFjZSBXZWJDb3JlIHsKKworICAgIHZvaWQgcG9wdWxhdGVGb250RGF0YWJhc2UoKSB7IC8qIERv IG5vdGhpbmcgKi8gfQorfQoKUHJvcGVydHkgY2hhbmdlcyBvbjogV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy93aW4vV2luU3R1YnMuY3BwCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWRkZWQ6IHN2bjplb2wtc3R5bGUK ICAgKyBuYXRpdmUKCg== 25672 2008-12-02 09:31:00 -0800 2008-12-02 09:42:27 -0800 Patch to remove some CG-specific code from the Cairo build. cgisms.patch text/plain 2731 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODg5NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDgtMTItMDEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg V0FSTklORzogTk8gVEVTVCBDQVNFUyBBRERFRCBPUiBDSEFOR0VECisKKyAgICAgICAgKiBXZWJD b3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvajogUmVtb3ZlIEZvbnREYXRhYmFzZSBmcm9tCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Zm9jdXNSaW5nQ29sb3IpOiBBZGQgc3R1YiBtZXRob2QKKyAgICAg ICAgKiBwbGF0Zm9ybS93aW4vVGVtcG9yYXJ5TGlua1N0dWJzLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OnBvcHVsYXRlRm9udERhdGFiYXNlKTogQWRkIHN0dWIgbWV0aG9kLgorCiAyMDA4LTEyLTAx ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEFkYW0gUm9iZW4uCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNw cm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oJ KHJldmlzaW9uIDM4ODk3KQorKysgV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJv agkod29ya2luZyBjb3B5KQpAQCAtNDEzNCw2ICs0MTM0LDIyIEBACiAJCQkJCTxGaWxlDQogCQkJ CQkJUmVsYXRpdmVQYXRoPSIuLlxwbGF0Zm9ybVxncmFwaGljc1x3aW5cRm9udERhdGFiYXNlLmNw cCINCiAJCQkJCQk+DQorCQkJCQkJPEZpbGVDb25maWd1cmF0aW9uDQorCQkJCQkJCU5hbWU9IkRl YnVnX0NhaXJvfFdpbjMyIg0KKwkJCQkJCQlFeGNsdWRlZEZyb21CdWlsZD0idHJ1ZSINCisJCQkJ CQkJPg0KKwkJCQkJCQk8VG9vbA0KKwkJCQkJCQkJTmFtZT0iVkNDTENvbXBpbGVyVG9vbCINCisJ CQkJCQkJLz4NCisJCQkJCQk8L0ZpbGVDb25maWd1cmF0aW9uPg0KKwkJCQkJCTxGaWxlQ29uZmln dXJhdGlvbg0KKwkJCQkJCQlOYW1lPSJSZWxlYXNlX0NhaXJvfFdpbjMyIg0KKwkJCQkJCQlFeGNs dWRlZEZyb21CdWlsZD0idHJ1ZSINCisJCQkJCQkJPg0KKwkJCQkJCQk8VG9vbA0KKwkJCQkJCQkJ TmFtZT0iVkNDTENvbXBpbGVyVG9vbCINCisJCQkJCQkJLz4NCisJCQkJCQk8L0ZpbGVDb25maWd1 cmF0aW9uPg0KIAkJCQkJPC9GaWxlPg0KIAkJCQkJPEZpbGUNCiAJCQkJCQlSZWxhdGl2ZVBhdGg9 Ii4uXHBsYXRmb3JtXGdyYXBoaWNzXHdpblxGb250RGF0YWJhc2UuaCINCkluZGV4OiBXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENh aXJvLmNwcAkocmV2aXNpb24gMzg4NTIpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nh aXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjIsNiArNjIs MTUgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitzdGF0aWMgY29uc3QgdW5zaWduZWQgYXF1 YUZvY3VzUmluZ0NvbG9yID0gMHhGRjdEQUREOTsKKworQ29sb3IgZm9jdXNSaW5nQ29sb3IoKQor eworICAgIHN0YXRpYyBDb2xvciBmb2N1c1JpbmdDb2xvciA9IGFxdWFGb2N1c1JpbmdDb2xvcjsK KworICAgIHJldHVybiBmb2N1c1JpbmdDb2xvcjsKK30KKwogc3RhdGljIGlubGluZSB2b2lkIHNl dENvbG9yKGNhaXJvX3QqIGNyLCBjb25zdCBDb2xvciYgY29sKQogewogICAgIGZsb2F0IHJlZCwg Z3JlZW4sIGJsdWUsIGFscGhhOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS93aW4vVGVtcG9yYXJ5 TGlua1N0dWJzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL3dpbi9UZW1wb3Jh cnlMaW5rU3R1YnMuY3BwCShyZXZpc2lvbiAzODg1MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vd2lu L1RlbXBvcmFyeUxpbmtTdHVicy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzLDUgKzMzLDcgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogLy8gPGtleWdlbj4KIFN0cmluZyBzaWduZWRQdWJsaWNLZXlB bmRDaGFsbGVuZ2VTdHJpbmcodW5zaWduZWQsIGNvbnN0IFN0cmluZyYsIGNvbnN0IEtVUkwmKSB7 IG5vdEltcGxlbWVudGVkKCk7IHJldHVybiBTdHJpbmcoKTsgfQogdm9pZCBnZXRTdXBwb3J0ZWRL ZXlTaXplcyhWZWN0b3I8U3RyaW5nPiYpIHsgbm90SW1wbGVtZW50ZWQoKTsgfQotCisjaWYgUExB VEZPUk0oQ0FJUk8pCit2b2lkIHBvcHVsYXRlRm9udERhdGFiYXNlKCkgeyAvKiBOb3QgbmVlZGVk IGZvciBHREkgZm9udHMgKi8gfQorI2VuZGlmCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 25673 2008-12-02 09:42:27 -0800 2008-12-02 09:43:46 -0800 Patch to remove some CG-specific code from the Cairo build. cgisms.patch text/plain 2971 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODg5NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDgtMTItMDEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmVtb3ZlIHNvbWUgQ0ctc3BlY2lmaWMgY29kZSBmcm9tIHRoZSBXaW5kb3dzIENhaXJvIGJ1aWxk LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1ODYK KworICAgICAgICBObyBuZXcgdGVzdCBjYXNlcyBzaW5jZSB0aGlzIHVwZGF0ZSBzaG91bGQgY3Jl YXRlIG5vIHVzZXItdmlzaWJsZQorICAgICAgICBjaGFuZ2VzLCBhbmQgc2hvdWxkIGJlIGZ1bGx5 IGNvdmVyZWQgYnkgdGhlIGV4aXN0aW5nIHJlZ3Jlc3Npb24KKyAgICAgICAgdGVzdHMuCisKKyAg ICAgICAgKiBXZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvajogUmVtb3ZlIEZvbnREYXRhYmFz ZSBmcm9tCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0 Q2Fpcm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Zm9jdXNSaW5nQ29sb3IpOiBBZGQgc3R1YiBt ZXRob2QKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vVGVtcG9yYXJ5TGlua1N0dWJzLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OnBvcHVsYXRlRm9udERhdGFiYXNlKTogQWRkIHN0dWIgbWV0aG9kLgor CiAyMDA4LTEyLTAxICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AZ21haWwuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUudmNwcm9q L1dlYkNvcmUudmNwcm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2Vi Q29yZS52Y3Byb2oJKHJldmlzaW9uIDM4ODk3KQorKysgV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9X ZWJDb3JlLnZjcHJvagkod29ya2luZyBjb3B5KQpAQCAtNDEzNCw2ICs0MTM0LDIyIEBACiAJCQkJ CTxGaWxlDQogCQkJCQkJUmVsYXRpdmVQYXRoPSIuLlxwbGF0Zm9ybVxncmFwaGljc1x3aW5cRm9u dERhdGFiYXNlLmNwcCINCiAJCQkJCQk+DQorCQkJCQkJPEZpbGVDb25maWd1cmF0aW9uDQorCQkJ CQkJCU5hbWU9IkRlYnVnX0NhaXJvfFdpbjMyIg0KKwkJCQkJCQlFeGNsdWRlZEZyb21CdWlsZD0i dHJ1ZSINCisJCQkJCQkJPg0KKwkJCQkJCQk8VG9vbA0KKwkJCQkJCQkJTmFtZT0iVkNDTENvbXBp bGVyVG9vbCINCisJCQkJCQkJLz4NCisJCQkJCQk8L0ZpbGVDb25maWd1cmF0aW9uPg0KKwkJCQkJ CTxGaWxlQ29uZmlndXJhdGlvbg0KKwkJCQkJCQlOYW1lPSJSZWxlYXNlX0NhaXJvfFdpbjMyIg0K KwkJCQkJCQlFeGNsdWRlZEZyb21CdWlsZD0idHJ1ZSINCisJCQkJCQkJPg0KKwkJCQkJCQk8VG9v bA0KKwkJCQkJCQkJTmFtZT0iVkNDTENvbXBpbGVyVG9vbCINCisJCQkJCQkJLz4NCisJCQkJCQk8 L0ZpbGVDb25maWd1cmF0aW9uPg0KIAkJCQkJPC9GaWxlPg0KIAkJCQkJPEZpbGUNCiAJCQkJCQlS ZWxhdGl2ZVBhdGg9Ii4uXHBsYXRmb3JtXGdyYXBoaWNzXHdpblxGb250RGF0YWJhc2UuaCINCklu ZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJv LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBo aWNzQ29udGV4dENhaXJvLmNwcAkocmV2aXNpb24gMzg4NTIpCisrKyBXZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNjIsNiArNjIsMTUgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitzdGF0aWMgY29uc3Qg dW5zaWduZWQgYXF1YUZvY3VzUmluZ0NvbG9yID0gMHhGRjdEQUREOTsKKworQ29sb3IgZm9jdXNS aW5nQ29sb3IoKQoreworICAgIHN0YXRpYyBDb2xvciBmb2N1c1JpbmdDb2xvciA9IGFxdWFGb2N1 c1JpbmdDb2xvcjsKKworICAgIHJldHVybiBmb2N1c1JpbmdDb2xvcjsKK30KKwogc3RhdGljIGlu bGluZSB2b2lkIHNldENvbG9yKGNhaXJvX3QqIGNyLCBjb25zdCBDb2xvciYgY29sKQogewogICAg IGZsb2F0IHJlZCwgZ3JlZW4sIGJsdWUsIGFscGhhOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS93 aW4vVGVtcG9yYXJ5TGlua1N0dWJzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3Jt L3dpbi9UZW1wb3JhcnlMaW5rU3R1YnMuY3BwCShyZXZpc2lvbiAzODg1MikKKysrIFdlYkNvcmUv cGxhdGZvcm0vd2luL1RlbXBvcmFyeUxpbmtTdHVicy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMz LDUgKzMzLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogLy8gPGtleWdlbj4KIFN0cmluZyBzaWdu ZWRQdWJsaWNLZXlBbmRDaGFsbGVuZ2VTdHJpbmcodW5zaWduZWQsIGNvbnN0IFN0cmluZyYsIGNv bnN0IEtVUkwmKSB7IG5vdEltcGxlbWVudGVkKCk7IHJldHVybiBTdHJpbmcoKTsgfQogdm9pZCBn ZXRTdXBwb3J0ZWRLZXlTaXplcyhWZWN0b3I8U3RyaW5nPiYpIHsgbm90SW1wbGVtZW50ZWQoKTsg fQotCisjaWYgUExBVEZPUk0oQ0FJUk8pCit2b2lkIHBvcHVsYXRlRm9udERhdGFiYXNlKCkgeyAv KiBOb3QgbmVlZGVkIGZvciBHREkgZm9udHMgKi8gfQorI2VuZGlmCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCg==