87096 2012-05-22 01:25:46 -0700 Use PluginDataNone.cpp always when NETSCAPE_PLUGIN_API is OFF 2012-06-04 23:28:26 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 88296 1 naginenis naginenis aestes andersca cmarcelo kkristof ossy webkit.review.bot oldest_to_newest 630068 0 naginenis 2012-05-22 01:25:46 -0700 I'm getting the following build error when PLATFORM_STRATEGIES is ON and NETSCAPE_PLUGIN_API is OFF. The reason for this is PluginDataNone.cpp is included in platform specific build system(e.g. PlatformEfl.cmake) in case of NETSCAPE_PLUGIN_API is OFF. We can fix this by adding an extra check in PluginData.cpp to use empty functions in PluginDataNone.cpp when NETSCAPE_PLUGIN_API is OFF. ^[[B/usr/bin/ld.gold.real: error: CMakeFiles/webcore_efl.dir/plugins/PluginDataNone.cpp.o: multiple definition of 'WebCore::PluginData::initPlugins(WebCore::Page const*)' /usr/bin/ld.gold.real: CMakeFiles/webcore_efl.dir/plugins/PluginData.cpp.o: previous definition here /usr/bin/ld.gold.real: error: CMakeFiles/webcore_efl.dir/plugins/PluginDataNone.cpp.o: multiple definition of 'WebCore::PluginData::refresh()' /usr/bin/ld.gold.real: CMakeFiles/webcore_efl.dir/plugins/PluginData.cpp.o: previous definition here collect2: ld returned 1 exit status 630205 1 143266 naginenis 2012-05-22 04:04:10 -0700 Created attachment 143266 Patch Fix build error by adding an extra check in PluginData.cpp 630747 2 naginenis 2012-05-22 14:17:56 -0700 Anders, could you please review this patch? 631767 3 143266 webkit.review.bot 2012-05-23 10:30:45 -0700 Comment on attachment 143266 Patch Clearing flags on attachment: 143266 Committed r118197: <http://trac.webkit.org/changeset/118197> 631768 4 webkit.review.bot 2012-05-23 10:30:49 -0700 All reviewed patches have been landed. Closing bug. 632457 5 ossy 2012-05-23 23:45:12 -0700 This buildfix broke the Qt minimal build :) /usr/bin/gold: /ramdisk/qt-linux-release-minimal/build/WebKitBuild/Release/Source/WebCore/release/libWebCore.a(PluginData.o): in function WebCore::PluginData::PluginData(WebCore::Page const*):PluginData.cpp(.text._ZN7WebCore10PluginDataC1EPKNS_4PageE+0x6d): error: undefined reference to 'WebCore::PluginData::initPlugins(WebCore::Page const*)' /usr/bin/gold: /ramdisk/qt-linux-release-minimal/build/WebKitBuild/Release/Source/WebCore/release/libWebCore.a(PluginData.o): in function WebCore::PluginData::PluginData(WebCore::Page const*):PluginData.cpp(.text._ZN7WebCore10PluginDataC2EPKNS_4PageE+0x6d): error: undefined reference to 'WebCore::PluginData::initPlugins(WebCore::Page const*)' collect2: ld returned 1 exit status 632474 6 ossy 2012-05-24 00:10:59 -0700 36 initPlugins(page); --> This call is outside of ifdef guards, but the function is inside ... It isn't correct. 632499 7 kkristof 2012-05-24 01:14:00 -0700 Committed r118335: <http://trac.webkit.org/changeset/118335> 632500 8 kkristof 2012-05-24 01:14:49 -0700 I've fixed the Qt minimal build. 632651 9 naginenis 2012-05-24 05:26:26 -0700 (In reply to comment #6) > 36 initPlugins(page); > > --> This call is outside of ifdef guards, but the function is inside ... It isn't correct. Sorry for the trouble. This function is outside ifdefs in PluginDataNone.cpp, but I guess the file is not included in the qt buildsystem when NETSCAPE_PLUGIN_API flag is OFF. 641200 10 aestes 2012-06-04 22:48:21 -0700 This turns out to be wrong for the OS X port when we disable NETSCAPE_PLUGIN_API. The Mac port supports non-Netscape plug-ins, so we need to call into PlatformStrategies even if Netscape plug-ins are disabled. 641207 11 aestes 2012-06-04 23:21:43 -0700 It looks like PluginDataNone.cpp is no longer included in the EFL build when NETSCAPE_PLUGIN_API is off (as of <http://trac.webkit.org/changeset/119208>), so I'm not sure if this change is still needed. I'm going to have sherrifbot roll this out and see if it breaks any builds. 641211 12 aestes 2012-06-04 23:28:26 -0700 I'm going to work on this in https://bugs.webkit.org/show_bug.cgi?id=88296 143266 2012-05-22 04:04:10 -0700 2012-05-23 10:30:44 -0700 Patch 87096.patch text/plain 1314 naginenis ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0MjY1YzFkLi5jMzI0NzQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTItMDUtMjIgIFN1ZGFyc2FuYSBOYWdpbmVuaSAgPHN1ZGFyc2FuYS5uYWdpbmVuaUBs aW51eC5pbnRlbC5jb20+CisKKyAgICAgICAgVXNlIFBsdWdpbkRhdGFOb25lLmNwcCBhbHdheXMg d2hlbiBORVRTQ0FQRV9QTFVHSU5fQVBJIGlzIE9GRgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODcwOTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGaXggYSBidWlsZCBlcnJvciBieSBhZGRpbmcgYW4gZXh0 cmEgY2hlY2sgaW4gUGx1Z2luRGF0YS5jcHAgdG8gdXNlCisgICAgICAgIFBsdWdpblN0cmF0ZWd5 IG9ubHkgd2hlbiBORVRTQ0FQRV9QTFVHSU5fQVBJIGlzIE9OLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cy4gVGhpcyBpcyBvbmx5IGEgYnVpbGQgZml4LgorCisgICAgICAgICogcGx1Z2lucy9QbHVn aW5EYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorCiAyMDEyLTA1LTIyICBZb3NoaWZ1bWkg SW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Zvcm1zXVtNZXRlcl1bUHJv Z3Jlc3NdIENoYW5nZSBmdW5jdGlvbiBzaWduYXR1cmUgb2YgcGFyc2VUb0RvdWJsZUZvck51bWJl clR5cGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpbkRhdGEuY3BwCmluZGV4IGI4ZTc1MWQuLjU1 NWUyYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhLmNwcApAQCAtNjQsNyArNjQs NyBAQCBTdHJpbmcgUGx1Z2luRGF0YTo6cGx1Z2luTmFtZUZvck1pbWVUeXBlKGNvbnN0IFN0cmlu ZyYgbWltZVR5cGUpIGNvbnN0CiAgICAgcmV0dXJuIFN0cmluZygpOwogfQogCi0jaWYgVVNFKFBM QVRGT1JNX1NUUkFURUdJRVMpCisjaWYgVVNFKFBMQVRGT1JNX1NUUkFURUdJRVMpICYmIEVOQUJM RShORVRTQ0FQRV9QTFVHSU5fQVBJKQogdm9pZCBQbHVnaW5EYXRhOjpyZWZyZXNoKCkKIHsKICAg ICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGx1Z2luU3RyYXRlZ3koKS0+cmVmcmVzaFBsdWdpbnMo KTsK