26244 2009-06-07 12:41:32 -0700 [Qt] Build fix when NETSCAPE_PLUGIN_API support is turned off 2009-06-08 05:06:24 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 laszlo.gombos webkit-unassigned zecke oldest_to_newest 124699 0 laszlo.gombos 2009-06-07 12:41:32 -0700 After ChangeSets r44119, r44120 QtWebKit no longer builds when NETSCAPE_PLUGIN_API support is turned off. Here are the linker errors: obj/release/PluginPackageNone.o: In function `WebCore::PluginPackage::hash() const': PluginPackageNone.cpp:(.text._ZNK7WebCore13PluginPackage4hashEv+0x0): multiple definition of `WebCore::PluginPackage::hash() const' obj/release/PluginPackage.o:PluginPackage.cpp:(.text._ZNK7WebCore13PluginPackage4hashEv+0x0): first defined here obj/release/PluginPackageNone.o: In function `WebCore::PluginPackage::equal(WebCore::PluginPackage const&, WebCore::PluginPackage const&)': PluginPackageNone.cpp:(.text._ZN7WebCore13PluginPackage5equalERKS0_S2_+0x0): multiple definition of `WebCore::PluginPackage::equal(WebCore::PluginPackage const&, WebCore::PluginPackage const&)' obj/release/PluginPackage.o:PluginPackage.cpp:(.text._ZN7WebCore13PluginPackage5equalERKS0_S2_+0x0): first defined here obj/release/PluginPackageNone.o: In function `WebCore::PluginPackage::compareFileVersion(unsigned int const&) const': PluginPackageNone.cpp:(.text._ZNK7WebCore13PluginPackage18compareFileVersionERKj+0x0): multiple definition of `WebCore::PluginPackage::compareFileVersion(unsigned int const&) const' obj/release/PluginPackage.o:PluginPackage.cpp:(.text._ZNK7WebCore13PluginPackage18compareFileVersionERKj+0x0): first defined here 124700 1 31034 laszlo.gombos 2009-06-07 12:45:54 -0700 Created attachment 31034 Proposed patch 124749 2 ariya.hidayat 2009-06-08 05:06:24 -0700 Landed in r44495 http://trac.webkit.org/changeset/44495 31034 2009-06-07 12:45:54 -0700 2009-06-08 04:58:14 -0700 Proposed patch patch_26244.txt text/plain 2909 laszlo.gombos SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDQ4OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDktMDYtMDcgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21i b3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gQnVpbGQgZml4IHdoZW4gTkVUU0NBUEVfUExVR0lOX0FQSSBzdXBwb3J0IGlz IHR1cm5lZCBvZmYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTI2MjQ0CisKKyAgICAgICAgKiBXZWJDb3JlLnBybzogRGVmaW5lIFBMVUdJTl9QQUNLQUdF X1NJTVBMRV9IQVNIIG9ubHkgaWYKKyAgICAgICAgTkVUU0NBUEVfUExVR0lOX0FQSSBpcyB0dXJu ZWQgb24KKyAgICAgICAgKiBwbHVnaW5zL1BsdWdpblBhY2thZ2UuY3BwOiBHdWFyZCBpbml0aWFs aXplQnJvd3NlckZ1bmNzKCkKKyAgICAgICAgKiBwbHVnaW5zL1BsdWdpblZpZXdOb25lLmNwcDog TWF0Y2ggZ3VhcmRzIHdpdGggUGx1Z2luVmlldy5oCisKIDIwMDktMDYtMDYgIFNhbSBXZWluaWcg IDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJ bmRleDogV2ViQ29yZS9XZWJDb3JlLnBybwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNvcmUu cHJvCShyZXZpc2lvbiA0NDQ3NikKKysrIFdlYkNvcmUvV2ViQ29yZS5wcm8JKHdvcmtpbmcgY29w eSkKQEAgLTE0Myw3ICsxNDMsNyBAQCBjb250YWlucyhERUZJTkVTLCBFTkFCTEVfU0lOR0xFX1RI UkVBREVECiAgICAgfQogfQogCi1ERUZJTkVTICs9IFdURl9VU0VfSkFWQVNDUklQVENPUkVfQklO RElOR1M9MSBXVEZfQ0hBTkdFUz0xIEVOQUJMRV9QTFVHSU5fUEFDS0FHRV9TSU1QTEVfSEFTSD0x CitERUZJTkVTICs9IFdURl9VU0VfSkFWQVNDUklQVENPUkVfQklORElOR1M9MSBXVEZfQ0hBTkdF Uz0xCiAKICMgRW5zdXJlIHRoYXQgd2UgcGljayB1cCBXZWJDb3JlJ3MgY29uZmlnLmggb3ZlciBK YXZhU2NyaXB0Q29yZSdzCiBJTkNMVURFUEFUSCA9ICQkUFdEICQkSU5DTFVERVBBVEgKQEAgLTEy MTcsNiArMTIxNyw4IEBAIFNPVVJDRVMgKz0gXAogCiBjb250YWlucyhERUZJTkVTLCBFTkFCTEVf TkVUU0NBUEVfUExVR0lOX0FQST0xKSB7CiAKKyAgICBERUZJTkVTICs9IEVOQUJMRV9QTFVHSU5f UEFDS0FHRV9TSU1QTEVfSEFTSD0xCisKICAgICBTT1VSQ0VTICs9IHBsdWdpbnMvbnBhcGkuY3Bw CiAKICAgICB1bml4IHsKSW5kZXg6IFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5QYWNrYWdlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsdWdpbnMvUGx1Z2luUGFja2FnZS5jcHAJKHJldmlzaW9u IDQ0NDc2KQorKysgV2ViQ29yZS9wbHVnaW5zL1BsdWdpblBhY2thZ2UuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yMzksNiArMjM5LDcgQEAgdm9pZCBQbHVnaW5QYWNrYWdlOjpkZXRlcm1pbmVNb2R1 bGVWZXJzaQogfQogI2VuZGlmCiAKKyNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKIHZv aWQgUGx1Z2luUGFja2FnZTo6aW5pdGlhbGl6ZUJyb3dzZXJGdW5jcygpCiB7CiAgICAgbWVtc2V0 KCZtX2Jyb3dzZXJGdW5jcywgMCwgc2l6ZW9mKG1fYnJvd3NlckZ1bmNzKSk7CkBAIC0yOTIsNiAr MjkzLDcgQEAgdm9pZCBQbHVnaW5QYWNrYWdlOjppbml0aWFsaXplQnJvd3NlckZ1bgogICAgIG1f YnJvd3NlckZ1bmNzLmVudW1lcmF0ZSA9IF9OUE5fRW51bWVyYXRlOwogICAgIG1fYnJvd3NlckZ1 bmNzLmNvbnN0cnVjdCA9IF9OUE5fQ29uc3RydWN0OwogfQorI2VuZGlmCiAKICNpZiBFTkFCTEUo UExVR0lOX1BBQ0tBR0VfU0lNUExFX0hBU0gpCiB1bnNpZ25lZCBQbHVnaW5QYWNrYWdlOjpoYXNo KCkgY29uc3QKSW5kZXg6IFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3Tm9uZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXdOb25lLmNwcAkocmV2aXNpb24gNDQ0 NzYpCisrKyBXZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlld05vbmUuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC04NCwxMSArODQsMTMgQEAgY29uc3QgY2hhciogUGx1Z2luVmlldzo6dXNlckFnZW50KCkK ICAgICByZXR1cm4gMDsKIH0KIAorI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogY29u c3QgY2hhciogUGx1Z2luVmlldzo6dXNlckFnZW50U3RhdGljKCkKIHsKICAgICBub3RJbXBsZW1l bnRlZCgpOwogICAgIHJldHVybiAwOwogfQorI2VuZGlmCiAKIE5QRXJyb3IgUGx1Z2luVmlldzo6 aGFuZGxlUG9zdFJlYWRGaWxlKFZlY3RvcjxjaGFyPiYsIHVpbnQzMiwgY29uc3QgY2hhciopCiB7 CkBAIC0xMDMsMTEgKzEwNSwxMyBAQCBOUEVycm9yIFBsdWdpblZpZXc6OmdldFZhbHVlKE5QTlZh cmlhYmxlCiAgICAgcmV0dXJuIDA7CiB9CiAKKyNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQ SSkKIE5QRXJyb3IgUGx1Z2luVmlldzo6Z2V0VmFsdWVTdGF0aWMoTlBOVmFyaWFibGUgdmFyaWFi bGUsIHZvaWQqIHZhbHVlKQogewogICAgIG5vdEltcGxlbWVudGVkKCk7CiAgICAgcmV0dXJuIDA7 CiB9CisjZW5kaWYKIAogdm9pZCBQbHVnaW5WaWV3OjppbnZhbGlkYXRlUmVjdChOUFJlY3QqKQog ewo=