132530 2014-05-03 14:11:30 -0700 Allow CMake to find GLib on FreeBSD 2014-08-01 17:46:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield bunhere cgarcia commit-queue gyuyoung.kim kwm mrobinson rakuco sergio oldest_to_newest 1006383 0 mmaxfield 2014-05-03 14:11:30 -0700 Allow CMake to find GLib on FreeBSD 1006384 1 230764 mmaxfield 2014-05-03 14:15:15 -0700 Created attachment 230764 Patch 1006391 2 rakuco 2014-05-03 15:10:08 -0700 My local version looks like this instead. It achieves the same thing while being a bit more generic. Index: Source/cmake/FindGLIB.cmake =================================================================== --- Source/cmake/FindGLIB.cmake (revision 166850) +++ Source/cmake/FindGLIB.cmake (working copy) @@ -56,6 +56,7 @@ find_path(GLIBCONFIG_INCLUDE_DIR NAMES glibconfig.h HINTS ${PC_LIBDIR} ${PC_LIBRARY_DIRS} ${_GLIB_LIBRARY_DIR} + ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0/include ) I have mixed feelings about this since it's FreeBSD that shouldn't be patching glib to install glibconfig.h into a different location, but I guess the cat is already out of the bag at this point. 1009901 3 231608 mmaxfield 2014-05-16 18:13:06 -0700 Created attachment 231608 Patch 1026235 4 231608 gustavo 2014-08-01 06:29:16 -0700 Comment on attachment 231608 Patch … yeah, but that should not cause any issues 1026408 5 231608 commit-queue 2014-08-01 17:46:41 -0700 Comment on attachment 231608 Patch Clearing flags on attachment: 231608 Committed r171962: <http://trac.webkit.org/changeset/171962> 1026409 6 commit-queue 2014-08-01 17:46:46 -0700 All reviewed patches have been landed. Closing bug. 230764 2014-05-03 14:15:15 -0700 2014-05-16 18:12:51 -0700 Patch bug-132530-20140503141453.patch text/plain 1251 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4MjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvRmlu ZEdMSUIuY21ha2UgYi9Tb3VyY2UvY21ha2UvRmluZEdMSUIuY21ha2UKaW5kZXggYzQ3YWVlYmNj OTg5MjQxMjEwOGIwN2Q3N2NiMWIyMDNiYTRiMTBkMi4uNDQ5YTRmYjIwNTM5OTBmZWQ4OGQxZDdl YjE2ZjVkZDMwMmE0Mzg1MCAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL0ZpbmRHTElCLmNtYWtl CisrKyBiL1NvdXJjZS9jbWFrZS9GaW5kR0xJQi5jbWFrZQpAQCAtNTYsNyArNTYsNyBAQCBnZXRf ZmlsZW5hbWVfY29tcG9uZW50KF9HTElCX0xJQlJBUllfRElSICR7R0xJQl9MSUJSQVJJRVN9IFBB VEgpCiBmaW5kX3BhdGgoR0xJQkNPTkZJR19JTkNMVURFX0RJUgogICAgIE5BTUVTIGdsaWJjb25m aWcuaAogICAgIEhJTlRTICR7UENfTElCRElSfSAke1BDX0xJQlJBUllfRElSU30gJHtfR0xJQl9M SUJSQVJZX0RJUn0KLSAgICBQQVRIX1NVRkZJWEVTIGdsaWItMi4wL2luY2x1ZGUKKyAgICBQQVRI X1NVRkZJWEVTIGdsaWItMi4wL2luY2x1ZGUgZ2xpYi0yLjAKICkKIAogZmluZF9wYXRoKEdMSUJf SU5DTFVERV9ESVIKZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAyYzlh YWY1YTNhYTk0MmMxMjQ3ZmNiOWFhZDU2YjVhMmEwMzA3YWZhLi5iODYwOWQwNzg3MzlmYmEyZjcy YzdkNDdhOTU2N2EyNTU2ZjZjNTM1IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTQtMDUtMDMgIE15bGVzIEMuIE1heGZpZWxkICA8bGl0 aGVydW1AZ21haWwuY29tPgorCisgICAgICAgIFtDTWFrZV0gQWxsb3cgQ01ha2UgdG8gZmluZCBH TGliIG9uIEZyZWVCU0QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzMjUzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE9uIEZyZWVCU0QsIGdsaWJjb25maWcuaCBpcyBhdCAvdXNyL2xvY2FsL2luY2x1ZGUv Z2xpYi0yLjAvZ2xpYmNvbmZpZy5oLgorCisgICAgICAgICogU291cmNlL2NtYWtlL0ZpbmRHTElC LmNtYWtlOgorCiAyMDE0LTA1LTAzICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxyYXBoYWVsLmt1 Ym8uZGEuY29zdGFAaW50ZWwuY29tPgogCiAgICAgICAgIFtDTWFrZV0gRGVmaW5lIFNIT1VMRF9J TlNUQUxMX0pTX1NIRUxMIGJlZm9yZSBpbmNsdWRpbmcgcG9ydHMgT3B0aW9ucyBmaWxlcy4K 231608 2014-05-16 18:13:06 -0700 2014-08-01 17:46:41 -0700 Patch bug-132530-20140516181236.patch text/plain 1297 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4OTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTI3NWRjYjUyMTA1ZWJm MzkyYmFlOTMzNThjNzdhNmMyZTJjYTE2Mi4uMDdlMzYxNzI2MWQ4MzUyYTgzMDc3YTBjOWEzMWUw MDkyOWIyZGFjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE0LTA1LTAzICBNeWxl cyBDLiBNYXhmaWVsZCAgPGxpdGhlcnVtQGdtYWlsLmNvbT4KKworICAgICAgICBbQ01ha2VdIEFs bG93IENNYWtlIHRvIGZpbmQgR0xpYiBvbiBGcmVlQlNECisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI1MzAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPbiBGcmVlQlNELCBnbGliY29uZmlnLmggaXMgYXQg L3Vzci9sb2NhbC9pbmNsdWRlL2dsaWItMi4wL2dsaWJjb25maWcuaC4KKworICAgICAgICAqIFNv dXJjZS9jbWFrZS9GaW5kR0xJQi5jbWFrZToKKwogMjAxNC0wNS0xNiAgQmVuamFtaW4gUG91bGFp biAgPGJwb3VsYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBTY3JvbGxWaWV3Ojp2aXNp YmxlQ29udGVudFJlY3RJbnRlcm5hbCBpcyBieXBhc3NpbmcgdGhlIGlPUyBjb2RlIGZvciB1bm9i c2N1cmVkQ29udGVudFJlY3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9jbWFrZS9GaW5kR0xJQi5jbWFr ZSBiL1NvdXJjZS9jbWFrZS9GaW5kR0xJQi5jbWFrZQppbmRleCBjNDdhZWViY2M5ODkyNDEyMTA4 YjA3ZDc3Y2IxYjIwM2JhNGIxMGQyLi41MTllOGI5NTk3ODQzMzYzYThkNmQwMGYzMDdmNWMzZWU2 ZTkzMTlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvRmluZEdMSUIuY21ha2UKKysrIGIvU291 cmNlL2NtYWtlL0ZpbmRHTElCLmNtYWtlCkBAIC01Niw2ICs1Niw3IEBAIGdldF9maWxlbmFtZV9j b21wb25lbnQoX0dMSUJfTElCUkFSWV9ESVIgJHtHTElCX0xJQlJBUklFU30gUEFUSCkKIGZpbmRf cGF0aChHTElCQ09ORklHX0lOQ0xVREVfRElSCiAgICAgTkFNRVMgZ2xpYmNvbmZpZy5oCiAgICAg SElOVFMgJHtQQ19MSUJESVJ9ICR7UENfTElCUkFSWV9ESVJTfSAke19HTElCX0xJQlJBUllfRElS fQorICAgICAgICAgICR7UENfR0xJQl9JTkNMVURFRElSfSAke1BDX0dMSUJfSU5DTFVERV9ESVJT fQogICAgIFBBVEhfU1VGRklYRVMgZ2xpYi0yLjAvaW5jbHVkZQogKQogCg==