24693 2009-03-18 19:07:25 -0700 Disable all the SVG features for WebKit/Qt if ENABLE_SVG=0 2009-05-05 22:47:31 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 laszlo.gombos laszlo.gombos eric hausmann zecke oldest_to_newest 114274 0 laszlo.gombos 2009-03-18 19:07:25 -0700 This might not be a bug per se; this is a request to have a simple way of disabling all the SVG features for WebKit/Qt. A similar build logic exist for Gtk builds (see ChangeSet r33926 in configure.ac), this is a request to bring the Qt build up-to-par with Gtk. 114275 1 28744 laszlo.gombos 2009-03-18 19:11:56 -0700 Created attachment 28744 Patch to disable all the SVG features for WebKit/Qt if ENABLE_SVG=0 115113 2 28744 zecke 2009-03-25 00:15:31 -0700 Comment on attachment 28744 Patch to disable all the SVG features for WebKit/Qt if ENABLE_SVG=0 Looks sensible and will work with the below macros. Another way would be to put the ENABLE_SVG_* macros into a block... e.g. contains(DEFINES, ENABLE_SVG=1) { !contains(FOO): DEFINES += ENABLE_FOO=1 } but I would have to check the qmake manual... it would be nice if you could do a follow up. 115186 3 laszlo.gombos 2009-03-25 12:05:03 -0700 (In reply to comment #2) > (From update of attachment 28744 [review]) > Looks sensible and will work with the below macros. Another way would be to put > the ENABLE_SVG_* macros into a block... > > e.g. contains(DEFINES, ENABLE_SVG=1) { > !contains(FOO): DEFINES += ENABLE_FOO=1 > } > > but I would have to check the qmake manual... it would be nice if you could do > a follow up. > Thanks for the review ! It seems to me that one of the goals of the build system is to make sure that all the ENABLE_FOO flags are defined (either to 0 or 1) instead of leaving them undefined (as an example ENABLE_WML is set to 0 if it is not defined otherwise). The patch originally proposed maintains this goal, but the suggestion above does not maintain this goal and will leave ENABLE_FOO undefined if ENABLE_SVG is set to 0. This might be a matter of taste, but I think that the original patch is more consistent with the existing code. 115287 4 zecke 2009-03-25 19:50:43 -0700 (In reply to comment #3) > This might be a matter of taste, but I think that the original patch is more > consistent with the existing code. hehe, you can always add an else { } makes this even more symmetric, minor details though. 115370 5 28973 laszlo.gombos 2009-03-26 11:51:52 -0700 Created attachment 28973 Revised patch based on feedback ! 116400 6 28973 zecke 2009-04-02 23:16:07 -0700 Comment on attachment 28973 Revised patch based on feedback ! > +!contains(DEFINES, ENABLE_SVG=0) { > + !contains(DEFINES, ENABLE_SVG=.): DEFINES += ENABLE_SVG=1 this looks a bit weird but should still do what you wanted. 116412 7 laszlo.gombos 2009-04-03 05:37:03 -0700 (In reply to comment #6) > (From update of attachment 28973 [review]) > > +!contains(DEFINES, ENABLE_SVG=0) { > > + !contains(DEFINES, ENABLE_SVG=.): DEFINES += ENABLE_SVG=1 > this looks a bit weird but should still do what you wanted. The intention was not to define ENABLE_SVG=1 one more time if it was already defined. 119351 8 28973 eric 2009-04-29 14:45:15 -0700 Comment on attachment 28973 Revised patch based on feedback ! This patch has rotted and no longer applies. marking r- 119368 9 28744 eric 2009-04-29 14:57:02 -0700 Comment on attachment 28744 Patch to disable all the SVG features for WebKit/Qt if ENABLE_SVG=0 Clearing review flag to remove from commit queue. 119436 10 29904 laszlo.gombos 2009-04-30 00:17:30 -0700 Created attachment 29904 Update patch to apply to trunk 119770 11 29904 eric 2009-05-03 21:50:19 -0700 Comment on attachment 29904 Update patch to apply to trunk Looks fine. 120065 12 eric 2009-05-05 22:47:31 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/WebCore.pro Committed r43281 28744 2009-03-18 19:11:56 -0700 2009-04-29 14:57:02 -0700 Patch to disable all the SVG features for WebKit/Qt if ENABLE_SVG=0 patch_24693.txt text/plain 1330 laszlo.gombos SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MTgyMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTIgQEAKKzIwMDktMDMtMTggIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21i b3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIERpc2FibGUgYWxsIHRoZSBTVkcgZmVhdHVyZXMgZm9yIFdlYktpdC9RdCBpZiBFTkFC TEVfU1ZHPTAgCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNDY5MworCisgICAgICAgICogV2ViQ29yZS5wcm86CisKIDIwMDktMDMtMTggIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2lt b24gRnJhc2VyLgpJbmRleDogV2ViQ29yZS9XZWJDb3JlLnBybwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL1dlYkNvcmUucHJvCShyZXZpc2lvbiA0MTgyMSkKKysrIFdlYkNvcmUvV2ViQ29yZS5wcm8J KHdvcmtpbmcgY29weSkKQEAgLTEwMSw2ICsxMDEsMTEgQEAgQ09ORklHKFFURElSX2J1aWxkKSB7 CiAhY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1hQQVRIPS4pOiBERUZJTkVTICs9IEVOQUJMRV9Y UEFUSD0xCiAjIWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9YQkw9Lik6IERFRklORVMgKz0gRU5B QkxFX1hCTD0xCiAhY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1dNTD0uKTogREVGSU5FUyArPSBF TkFCTEVfV01MPTAKKworIyBTVkcgc3VwcG9ydAorY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1NW Rz0wKSB7CisgICAgREVGSU5FUyArPSBFTkFCTEVfU1ZHX0ZPTlRTPTAgRU5BQkxFX1NWR19GSUxU RVJTPTAgRU5BQkxFX1NWR19GT1JFSUdOX09CSkVDVD0wIEVOQUJMRV9TVkdfQU5JTUFUSU9OPTAg RU5BQkxFX1NWR19BU19JTUFHRT0wIEVOQUJMRV9TVkdfVVNFPTAKK30KICFjb250YWlucyhERUZJ TkVTLCBFTkFCTEVfU1ZHPS4pOiBERUZJTkVTICs9IEVOQUJMRV9TVkc9MQogIWNvbnRhaW5zKERF RklORVMsIEVOQUJMRV9TVkdfRk9OVFM9Lik6IERFRklORVMgKz0gRU5BQkxFX1NWR19GT05UUz0x CiAhY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1NWR19GSUxURVJTPS4pOiBERUZJTkVTICs9IEVO QUJMRV9TVkdfRklMVEVSUz0xCg== 28973 2009-03-26 11:51:52 -0700 2009-04-30 00:17:30 -0700 Revised patch based on feedback ! patch_24693_v2.txt text/plain 2266 laszlo.gombos SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MjAwNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTIgQEAKKzIwMDktMDMtMjYgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21i b3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIERpc2FibGUgYWxsIHRoZSBTVkcgZmVhdHVyZXMgZm9yIFdlYktpdC9RdCBpZiBFTkFC TEVfU1ZHPTAgCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNDY5MworCisgICAgICAgICogV2ViQ29yZS5wcm86CisKIDIwMDktMDMtMjYgIEVsaSBGaWRs ZXIgIDxlbGkuZmlkbGVyQHRvcmNobW9iaWxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBH ZW9yZ2UgU3RhaWtvcy4KSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5wcm8KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9XZWJDb3JlLnBybwkocmV2aXNpb24gNDIwMDUpCisrKyBXZWJDb3JlL1dlYkNvcmUu cHJvCSh3b3JraW5nIGNvcHkpCkBAIC0xMDEsMTMgKzEwMSwxOSBAQCBDT05GSUcoUVRESVJfYnVp bGQpIHsKICFjb250YWlucyhERUZJTkVTLCBFTkFCTEVfWFBBVEg9Lik6IERFRklORVMgKz0gRU5B QkxFX1hQQVRIPTEKICMhY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1hCTD0uKTogREVGSU5FUyAr PSBFTkFCTEVfWEJMPTEKICFjb250YWlucyhERUZJTkVTLCBFTkFCTEVfV01MPS4pOiBERUZJTkVT ICs9IEVOQUJMRV9XTUw9MAotIWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9TVkc9Lik6IERFRklO RVMgKz0gRU5BQkxFX1NWRz0xCi0hY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1NWR19GT05UUz0u KTogREVGSU5FUyArPSBFTkFCTEVfU1ZHX0ZPTlRTPTEKLSFjb250YWlucyhERUZJTkVTLCBFTkFC TEVfU1ZHX0ZJTFRFUlM9Lik6IERFRklORVMgKz0gRU5BQkxFX1NWR19GSUxURVJTPTEKLSFjb250 YWlucyhERUZJTkVTLCBFTkFCTEVfU1ZHX0ZPUkVJR05fT0JKRUNUPS4pOiBERUZJTkVTICs9IEVO QUJMRV9TVkdfRk9SRUlHTl9PQkpFQ1Q9MQotIWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9TVkdf QU5JTUFUSU9OPS4pOiBERUZJTkVTICs9IEVOQUJMRV9TVkdfQU5JTUFUSU9OPTEKLSFjb250YWlu cyhERUZJTkVTLCBFTkFCTEVfU1ZHX0FTX0lNQUdFPS4pOiBERUZJTkVTICs9IEVOQUJMRV9TVkdf QVNfSU1BR0U9MQotIWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9TVkdfVVNFPS4pOiBERUZJTkVT ICs9IEVOQUJMRV9TVkdfVVNFPTEKKworIyBTVkcgc3VwcG9ydAorIWNvbnRhaW5zKERFRklORVMs IEVOQUJMRV9TVkc9MCkgeworICAgICFjb250YWlucyhERUZJTkVTLCBFTkFCTEVfU1ZHPS4pOiBE RUZJTkVTICs9IEVOQUJMRV9TVkc9MQorICAgICFjb250YWlucyhERUZJTkVTLCBFTkFCTEVfU1ZH X0ZPTlRTPS4pOiBERUZJTkVTICs9IEVOQUJMRV9TVkdfRk9OVFM9MQorICAgICFjb250YWlucyhE RUZJTkVTLCBFTkFCTEVfU1ZHX0ZJTFRFUlM9Lik6IERFRklORVMgKz0gRU5BQkxFX1NWR19GSUxU RVJTPTEKKyAgICAhY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1NWR19GT1JFSUdOX09CSkVDVD0u KTogREVGSU5FUyArPSBFTkFCTEVfU1ZHX0ZPUkVJR05fT0JKRUNUPTEKKyAgICAhY29udGFpbnMo REVGSU5FUywgRU5BQkxFX1NWR19BTklNQVRJT049Lik6IERFRklORVMgKz0gRU5BQkxFX1NWR19B TklNQVRJT049MQorICAgICFjb250YWlucyhERUZJTkVTLCBFTkFCTEVfU1ZHX0FTX0lNQUdFPS4p OiBERUZJTkVTICs9IEVOQUJMRV9TVkdfQVNfSU1BR0U9MQorICAgICFjb250YWlucyhERUZJTkVT LCBFTkFCTEVfU1ZHX1VTRT0uKTogREVGSU5FUyArPSBFTkFCTEVfU1ZHX1VTRT0xCit9IGVsc2Ug eworICAgIERFRklORVMgKz0gRU5BQkxFX1NWR19GT05UUz0wIEVOQUJMRV9TVkdfRklMVEVSUz0w IEVOQUJMRV9TVkdfRk9SRUlHTl9PQkpFQ1Q9MCBFTkFCTEVfU1ZHX0FOSU1BVElPTj0wIEVOQUJM RV9TVkdfQVNfSU1BR0U9MCBFTkFCTEVfU1ZHX1VTRT0wCit9CiAKICMgSFRNTDUgbWVkaWEgc3Vw cG9ydAogIWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9WSURFTz0uKSB7Cg== 29904 2009-04-30 00:17:30 -0700 2009-05-03 21:50:19 -0700 Update patch to apply to trunk patch_24693_v3.txt text/plain 2381 laszlo.gombos SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MzA0NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTIgQEAKKzIwMDktMDQtMjkgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21i b3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIERpc2FibGUgYWxsIHRoZSBTVkcgZmVhdHVyZXMgZm9yIFdlYktpdC9RdCBpZiBFTkFC TEVfU1ZHPTAgCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNDY5MworCisgICAgICAgICogV2ViQ29yZS5wcm86CisKIDIwMDktMDQtMjkgIERhbiBCZXJu c3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFz ZXIuCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUucHJvCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvV2Vi Q29yZS5wcm8JKHJldmlzaW9uIDQzMDQ1KQorKysgV2ViQ29yZS9XZWJDb3JlLnBybwkod29ya2lu ZyBjb3B5KQpAQCAtMTAxLDE1ICsxMDEsMjEgQEAgQ09ORklHKFFURElSX2J1aWxkKSB7CiAhY29u dGFpbnMoREVGSU5FUywgRU5BQkxFX1hQQVRIPS4pOiBERUZJTkVTICs9IEVOQUJMRV9YUEFUSD0x CiAjIWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9YQkw9Lik6IERFRklORVMgKz0gRU5BQkxFX1hC TD0xCiAhY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1dNTD0uKTogREVGSU5FUyArPSBFTkFCTEVf V01MPTAKLSFjb250YWlucyhERUZJTkVTLCBFTkFCTEVfU1ZHPS4pOiBERUZJTkVTICs9IEVOQUJM RV9TVkc9MQotIWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9TVkdfRk9OVFM9Lik6IERFRklORVMg Kz0gRU5BQkxFX1NWR19GT05UUz0xCi0hY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1NWR19GSUxU RVJTPS4pOiBERUZJTkVTICs9IEVOQUJMRV9TVkdfRklMVEVSUz0xCi0hY29udGFpbnMoREVGSU5F UywgRU5BQkxFX1NWR19GT1JFSUdOX09CSkVDVD0uKTogREVGSU5FUyArPSBFTkFCTEVfU1ZHX0ZP UkVJR05fT0JKRUNUPTEKLSFjb250YWlucyhERUZJTkVTLCBFTkFCTEVfU1ZHX0FOSU1BVElPTj0u KTogREVGSU5FUyArPSBFTkFCTEVfU1ZHX0FOSU1BVElPTj0xCi0hY29udGFpbnMoREVGSU5FUywg RU5BQkxFX1NWR19BU19JTUFHRT0uKTogREVGSU5FUyArPSBFTkFCTEVfU1ZHX0FTX0lNQUdFPTEK LSFjb250YWlucyhERUZJTkVTLCBFTkFCTEVfU1ZHX1VTRT0uKTogREVGSU5FUyArPSBFTkFCTEVf U1ZHX1VTRT0xCiAhY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1dPUktFUlM9Lik6IERFRklORVMg Kz0gRU5BQkxFX1dPUktFUlM9MQogCisjIFNWRyBzdXBwb3J0CishY29udGFpbnMoREVGSU5FUywg RU5BQkxFX1NWRz0wKSB7CisgICAgIWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9TVkc9Lik6IERF RklORVMgKz0gRU5BQkxFX1NWRz0xCisgICAgIWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9TVkdf Rk9OVFM9Lik6IERFRklORVMgKz0gRU5BQkxFX1NWR19GT05UUz0xCisgICAgIWNvbnRhaW5zKERF RklORVMsIEVOQUJMRV9TVkdfRklMVEVSUz0uKTogREVGSU5FUyArPSBFTkFCTEVfU1ZHX0ZJTFRF UlM9MQorICAgICFjb250YWlucyhERUZJTkVTLCBFTkFCTEVfU1ZHX0ZPUkVJR05fT0JKRUNUPS4p OiBERUZJTkVTICs9IEVOQUJMRV9TVkdfRk9SRUlHTl9PQkpFQ1Q9MQorICAgICFjb250YWlucyhE RUZJTkVTLCBFTkFCTEVfU1ZHX0FOSU1BVElPTj0uKTogREVGSU5FUyArPSBFTkFCTEVfU1ZHX0FO SU1BVElPTj0xCisgICAgIWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9TVkdfQVNfSU1BR0U9Lik6 IERFRklORVMgKz0gRU5BQkxFX1NWR19BU19JTUFHRT0xCisgICAgIWNvbnRhaW5zKERFRklORVMs IEVOQUJMRV9TVkdfVVNFPS4pOiBERUZJTkVTICs9IEVOQUJMRV9TVkdfVVNFPTEKK30gZWxzZSB7 CisgICAgREVGSU5FUyArPSBFTkFCTEVfU1ZHX0ZPTlRTPTAgRU5BQkxFX1NWR19GSUxURVJTPTAg RU5BQkxFX1NWR19GT1JFSUdOX09CSkVDVD0wIEVOQUJMRV9TVkdfQU5JTUFUSU9OPTAgRU5BQkxF X1NWR19BU19JTUFHRT0wIEVOQUJMRV9TVkdfVVNFPTAKK30KKwogIyBIVE1MNSBtZWRpYSBzdXBw b3J0CiAhY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1ZJREVPPS4pIHsKICAgICBjb250YWlucyhR VF9DT05GSUcsIHBob25vbik6REVGSU5FUyArPSBFTkFCTEVfVklERU89MQo=