130014 2014-03-10 03:46:34 -0700 [GTK][CMAKE] Remove compile warnings about GTK+ deprecated API 2014-03-12 11:24:45 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned gustavo mrobinson zan oldest_to_newest 988857 0 cgarcia 2014-03-10 03:46:34 -0700 We need the equivalent to AC_DEFINE([GDK_VERSION_MIN_REQUIRED], [GDK_VERSION_3_6], [Minimum GTK/GDK version required]) 989614 1 226503 cgarcia 2014-03-12 07:27:10 -0700 Created attachment 226503 Patch 989617 2 226503 cgarcia 2014-03-12 07:35:13 -0700 Comment on attachment 226503 Patch hmm, this doesn't seem to work :-( 989620 3 226504 cgarcia 2014-03-12 07:51:32 -0700 Created attachment 226504 Patch This one seems to work 989639 4 mrobinson 2014-03-12 08:48:56 -0700 (In reply to comment #3) > Created an attachment (id=226504) [details] > Patch > > This one seems to work I was testing something like this last night: diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake index a6974e1..caa57bf 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -108,6 +108,7 @@ if (NOT USE_GTK2) set(GTK_API_VERSION 3.0) set(ENABLE_PLUGIN_PROCESS ON) set(ENABLE_WEBKIT2 ON) + set(GDK_VERSION_MIN_REQUIRED "GDK_VERSION_3_6") else () set(WEBKITGTK_API_VERSION 2.0) set(GTK_API_VERSION 2.0) diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake index c9c2f3b..de643b5 100644 --- a/Source/cmakeconfig.h.cmake +++ b/Source/cmakeconfig.h.cmake @@ -127,4 +127,6 @@ #cmakedefine01 WTF_USE_TILED_BACKING_STORE #cmakedefine01 HAVE_LLVM +#define GDK_VERSION_MIN_REQUIRED @GDK_VERSION_MIN_REQUIRED@ + #endif /* CMAKECONFIG_H */ I'd prefer it, if it works, since it avoid adding another command-line compiler argument. 989648 5 cgarcia 2014-03-12 09:19:45 -0700 (In reply to comment #4) > (In reply to comment #3) > > Created an attachment (id=226504) [details] [details] > > Patch > > > > This one seems to work > > I was testing something like this last night: > > diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake > index a6974e1..caa57bf 100644 > --- a/Source/cmake/OptionsGTK.cmake > +++ b/Source/cmake/OptionsGTK.cmake > @@ -108,6 +108,7 @@ if (NOT USE_GTK2) > set(GTK_API_VERSION 3.0) > set(ENABLE_PLUGIN_PROCESS ON) > set(ENABLE_WEBKIT2 ON) > + set(GDK_VERSION_MIN_REQUIRED "GDK_VERSION_3_6") > else () > set(WEBKITGTK_API_VERSION 2.0) > set(GTK_API_VERSION 2.0) > diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake > index c9c2f3b..de643b5 100644 > --- a/Source/cmakeconfig.h.cmake > +++ b/Source/cmakeconfig.h.cmake > @@ -127,4 +127,6 @@ > #cmakedefine01 WTF_USE_TILED_BACKING_STORE > #cmakedefine01 HAVE_LLVM > > +#define GDK_VERSION_MIN_REQUIRED @GDK_VERSION_MIN_REQUIRED@ > + > #endif /* CMAKECONFIG_H */ > > > I'd prefer it, if it works, since it avoid adding another command-line compiler argument. I also prefer this way, but didn't know how to do it :-) 989665 6 226518 cgarcia 2014-03-12 09:46:52 -0700 Created attachment 226518 Updated patch 989675 7 226518 mrobinson 2014-03-12 09:56:09 -0700 Comment on attachment 226518 Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=226518&action=review > Source/cmakeconfig.h.cmake:130 > +#ifndef GTK_API_VERSION_2 We should probably use #if defined(BUILDING_GTK__) && !defined(GTK_API_VERSION_2) so that this doesn't leak into other ports. 989685 8 cgarcia 2014-03-12 10:05:10 -0700 (In reply to comment #7) > (From update of attachment 226518 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=226518&action=review > > > Source/cmakeconfig.h.cmake:130 > > +#ifndef GTK_API_VERSION_2 > > We should probably use #if defined(BUILDING_GTK__) && !defined(GTK_API_VERSION_2) so that this doesn't leak into other ports. Ah, didn't know this was shared file. Another problem of this patch is that it doesn't work for MiniBrowser, I guess it's because it doesn't include this config file. 989697 9 mrobinson 2014-03-12 10:23:18 -0700 (In reply to comment #8) > Ah, didn't know this was shared file. Another problem of this patch is that it doesn't work for MiniBrowser, I guess it's because it doesn't include this config file. It probably should include the file. I had to add it to a few other projects. 989746 10 cgarcia 2014-03-12 11:24:45 -0700 Committed r165488: <http://trac.webkit.org/changeset/165488> 226503 2014-03-12 07:27:10 -0700 2014-03-12 07:51:32 -0700 Patch wk-cmake-deprecated-warnings.diff text/plain 979 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA1NjVlZTc1Li5iM2NhZmI3 IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTQtMDMtMTIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdW0NNQUtFXSBSZW1vdmUgY29tcGlsZSB3YXJuaW5ncyBhYm91dCBHVEsr IGRlcHJlY2F0ZWQgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzAwMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFNvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlOiBTZXQgR0RLX1ZFUlNJT05f TUlOX1JFUVVJUkVEIHRvCisgICAgICAgIEdES19WRVJTSU9OXzNfNi4KKwogMjAxNC0wMy0xMiAg TWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11b Q01BS0VdIFRvbyB2ZXJib3NlIGJ1aWxkIG91dHB1dApkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtl L09wdGlvbnNHVEsuY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQppbmRleCBh Njk3NGUxLi4zMjM5M2NkIDEwMDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFr ZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQpAQCAtMTA4LDYgKzEwOCw3IEBA IGlmIChOT1QgVVNFX0dUSzIpCiAgICAgc2V0KEdUS19BUElfVkVSU0lPTiAzLjApCiAgICAgc2V0 KEVOQUJMRV9QTFVHSU5fUFJPQ0VTUyBPTikKICAgICBzZXQoRU5BQkxFX1dFQktJVDIgT04pCisg ICAgc2V0KEdES19WRVJTSU9OX01JTl9SRVFVSVJFRCBHREtfVkVSU0lPTl8zXzYpCiBlbHNlICgp CiAgICAgc2V0KFdFQktJVEdUS19BUElfVkVSU0lPTiAyLjApCiAgICAgc2V0KEdUS19BUElfVkVS U0lPTiAyLjApCg== 226504 2014-03-12 07:51:32 -0700 2014-03-12 09:46:52 -0700 Patch wk-cmake-deprecated-warnings2.diff text/plain 993 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA1NjVlZTc1Li5iM2NhZmI3 IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTQtMDMtMTIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdW0NNQUtFXSBSZW1vdmUgY29tcGlsZSB3YXJuaW5ncyBhYm91dCBHVEsr IGRlcHJlY2F0ZWQgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzAwMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFNvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlOiBTZXQgR0RLX1ZFUlNJT05f TUlOX1JFUVVJUkVEIHRvCisgICAgICAgIEdES19WRVJTSU9OXzNfNi4KKwogMjAxNC0wMy0xMiAg TWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11b Q01BS0VdIFRvbyB2ZXJib3NlIGJ1aWxkIG91dHB1dApkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtl L09wdGlvbnNHVEsuY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQppbmRleCBh Njk3NGUxLi45YmYyNGQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFr ZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQpAQCAtMTA4LDYgKzEwOCw3IEBA IGlmIChOT1QgVVNFX0dUSzIpCiAgICAgc2V0KEdUS19BUElfVkVSU0lPTiAzLjApCiAgICAgc2V0 KEVOQUJMRV9QTFVHSU5fUFJPQ0VTUyBPTikKICAgICBzZXQoRU5BQkxFX1dFQktJVDIgT04pCisg ICAgYWRkX2RlZmluaXRpb25zKC1ER0RLX1ZFUlNJT05fTUlOX1JFUVVJUkVEPUdES19WRVJTSU9O XzNfNikKIGVsc2UgKCkKICAgICBzZXQoV0VCS0lUR1RLX0FQSV9WRVJTSU9OIDIuMCkKICAgICBz ZXQoR1RLX0FQSV9WRVJTSU9OIDIuMCkK 226518 2014-03-12 09:46:52 -0700 2014-03-12 09:57:43 -0700 Updated patch wk-cmake-deprecated-warnings3.diff text/plain 1403 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA1NjVlZTc1Li5mMDJlZDQ1 IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTQtMDMtMTIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdW0NNQUtFXSBSZW1vdmUgY29tcGlsZSB3YXJuaW5ncyBhYm91dCBHVEsr IGRlcHJlY2F0ZWQgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzAwMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBTZXQgR0RLX1ZFUlNJT05fTUlOX1JFUVVJUkVEIHRvIEdES19WRVJTSU9OXzNfNi4K KworICAgICAgICAqIFNvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlOgorICAgICAgICAqIFNv dXJjZS9jbWFrZWNvbmZpZy5oLmNtYWtlOgorCiAyMDE0LTAzLTEyICBNYXJ0aW4gUm9iaW5zb24g IDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtDTUFLRV0gVG9vIHZlcmJv c2UgYnVpbGQgb3V0cHV0CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFr ZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCmluZGV4IGE2OTc0ZTEuLjMyMzkzY2Qg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCisrKyBiL1NvdXJjZS9j bWFrZS9PcHRpb25zR1RLLmNtYWtlCkBAIC0xMDgsNiArMTA4LDcgQEAgaWYgKE5PVCBVU0VfR1RL MikKICAgICBzZXQoR1RLX0FQSV9WRVJTSU9OIDMuMCkKICAgICBzZXQoRU5BQkxFX1BMVUdJTl9Q Uk9DRVNTIE9OKQogICAgIHNldChFTkFCTEVfV0VCS0lUMiBPTikKKyAgICBzZXQoR0RLX1ZFUlNJ T05fTUlOX1JFUVVJUkVEIEdES19WRVJTSU9OXzNfNikKIGVsc2UgKCkKICAgICBzZXQoV0VCS0lU R1RLX0FQSV9WRVJTSU9OIDIuMCkKICAgICBzZXQoR1RLX0FQSV9WRVJTSU9OIDIuMCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9jbWFrZWNvbmZpZy5oLmNtYWtlIGIvU291cmNlL2NtYWtlY29uZmlnLmgu Y21ha2UKaW5kZXggYzljMmYzYi4uOWUyMGU2NSAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlY29u ZmlnLmguY21ha2UKKysrIGIvU291cmNlL2NtYWtlY29uZmlnLmguY21ha2UKQEAgLTEyNyw0ICsx MjcsOCBAQAogI2NtYWtlZGVmaW5lMDEgV1RGX1VTRV9USUxFRF9CQUNLSU5HX1NUT1JFCiAjY21h a2VkZWZpbmUwMSBIQVZFX0xMVk0KIAorI2lmbmRlZiBHVEtfQVBJX1ZFUlNJT05fMgorI2RlZmlu ZSBHREtfVkVSU0lPTl9NSU5fUkVRVUlSRUQgQEdES19WRVJTSU9OX01JTl9SRVFVSVJFREAKKyNl bmRpZgorCiAjZW5kaWYgLyogQ01BS0VDT05GSUdfSCAqLwo=