135934 2014-08-14 03:03:10 -0700 [GTK] REGRESSION(r171598, CMake): Introspection files are installed at the wrong path 2014-08-14 06:11:01 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk, Regression P2 Normal --- 1 cgarcia webkit-unassigned bunhere commit-queue gyuyoung.kim mcatanzaro mrobinson pnormand rakuco sergio oldest_to_newest 1029059 0 cgarcia 2014-08-14 03:03:10 -0700 Since r171598 gir files are installed under $datadir/webkitgtk-4.0/gir-1.0/. The gir files should installed in $datadir/gir-1.0/ together with all other gir files. We don't need to install introspection files in a versioned directory because their filenames already contain the binary version. But before r171598, the files were only installed to the right directory if the gobject-instrospection pkg-config file was in the same prefix than the one we wanted to install, because the gir and typelibs directories were extracted from the pkg-config file. We should define INTROSPECTION_INSTALL_GIRDIR and INTROSPECTION_INSTALL_TYPELIBDIR in OptionsGTK.cmake based on $datadir and $libdir like we do in the autotools build (grep for girdir and typelibsdir in GNUmakefile.am) 1029060 1 cgarcia 2014-08-14 03:09:22 -0700 See also https://bugzilla.gnome.org/show_bug.cgi?id=734327 1029061 2 236585 cgarcia 2014-08-14 03:10:12 -0700 Created attachment 236585 Patch 1029070 3 236585 gustavo 2014-08-14 06:06:40 -0700 Comment on attachment 236585 Patch Yeah, I think that makes sense. 1029071 4 cgarcia 2014-08-14 06:11:01 -0700 Committed r172583: <http://trac.webkit.org/changeset/172583> 236585 2014-08-14 03:10:12 -0700 2014-08-14 06:06:39 -0700 Patch wk-introspection.diff text/plain 3461 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA3OTY0YzZkLi5iYjJlZmY3 IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjggQEAK IDIwMTQtMDgtMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgog CisgICAgICAgIFtHVEtdIFJFR1JFU1NJT04ocjE3MTU5OCwgQ01ha2UpOiBJbnRyb3NwZWN0aW9u IGZpbGVzIGFyZSBpbnN0YWxsZWQgYXQgdGhlIHdyb25nIHBhdGgKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTkzNAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNpbmNlIHIxNzE1OTggZ2lyIGZpbGVzIGFy ZSBpbnN0YWxsZWQgdW5kZXIgJGRhdGFkaXIvd2Via2l0Z3RrLTQuMC9naXItMS4wLy4KKyAgICAg ICAgVGhlIGdpciBmaWxlcyBzaG91bGQgaW5zdGFsbGVkIGluICRkYXRhZGlyL2dpci0xLjAvIHRv Z2V0aGVyIHdpdGggYWxsIG90aGVyCisgICAgICAgIGdpciBmaWxlcy4gV2UgZG9uJ3QgbmVlZCB0 byBpbnN0YWxsIGludHJvc3BlY3Rpb24gZmlsZXMgaW4gYSB2ZXJzaW9uZWQKKyAgICAgICAgZGly ZWN0b3J5IGJlY2F1c2UgdGhlaXIgZmlsZW5hbWVzIGFscmVhZHkgY29udGFpbiB0aGUgYmluYXJ5 IHZlcnNpb24uIEJ1dCBiZWZvcmUKKyAgICAgICAgcjE3MTU5OCwgdGhlIGZpbGVzIHdlcmUgb25s eSBpbnN0YWxsZWQgdG8gdGhlIHJpZ2h0IGRpcmVjdG9yeSBpZiB0aGUKKyAgICAgICAgZ29iamVj dC1pbnN0cm9zcGVjdGlvbiBwa2ctY29uZmlnIGZpbGUgd2FzIGluIHRoZSBzYW1lIHByZWZpeCB0 aGFuIHRoZSBvbmUgd2UKKyAgICAgICAgd2FudGVkIHRvIGluc3RhbGwsIGJlY2F1c2UgdGhlIGdp ciBhbmQgdHlwZWxpYnMgZGlyZWN0b3JpZXMgd2VyZSBleHRyYWN0ZWQgZnJvbQorICAgICAgICB0 aGUgcGtnLWNvbmZpZyBmaWxlLiBXZSBzaG91bGQgZGVmaW5lIElOVFJPU1BFQ1RJT05fSU5TVEFM TF9HSVJESVIgYW5kCisgICAgICAgIElOVFJPU1BFQ1RJT05fSU5TVEFMTF9UWVBFTElCRElSIGlu IE9wdGlvbnNHVEsuY21ha2UgYmFzZWQgb24gJGRhdGFkaXIgYW5kICRsaWJkaXIKKyAgICAgICAg bGlrZSB3ZSBkbyBpbiB0aGUgYXV0b3Rvb2xzIGJ1aWxkLgorCisgICAgICAgICogU291cmNlL2Nt YWtlL0ZpbmRHT2JqZWN0SW50cm9zcGVjdGlvbi5jbWFrZTogRG8gbm90IGRlZmluZQorICAgICAg ICBJTlRST1NQRUNUSU9OX0lOU1RBTExfR0lSRElSIGFuZCBJTlRST1NQRUNUSU9OX0lOU1RBTExf VFlQRUxJQkRJUi4KKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZTogRGVm aW5lCisgICAgICAgIElOVFJPU1BFQ1RJT05fSU5TVEFMTF9HSVJESVIgYW5kIElOVFJPU1BFQ1RJ T05fSU5TVEFMTF9UWVBFTElCRElSLgorCisyMDE0LTA4LTE0ICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKwogICAgICAgICBbR1RLXSBXZWJLaXQgRE9NIGRvY3Vt ZW50YXRpb24gKHdlYmtpdGRvbWd0aykgbm90IGluc3RhbGxlZCBhZnRlciBtYWtlIGluc3RhbGwK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTgzNgog CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvRmluZEdPYmplY3RJbnRyb3NwZWN0aW9uLmNtYWtl IGIvU291cmNlL2NtYWtlL0ZpbmRHT2JqZWN0SW50cm9zcGVjdGlvbi5jbWFrZQppbmRleCAwZmI4 NWYwLi5lMWY0OWI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvRmluZEdPYmplY3RJbnRyb3Nw ZWN0aW9uLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9GaW5kR09iamVjdEludHJvc3BlY3Rpb24u Y21ha2UKQEAgLTQ0LDggKzQ0LDYgQEAgaWYgKFBLR19DT05GSUdfRk9VTkQpCiAgICAgICAgIF9n aXJfZ2V0X3BrZ2NvbmZpZ192YXIoSU5UUk9TUEVDVElPTl9HRU5FUkFURSAiZ19pcl9nZW5lcmF0 ZSIgIiIpCiAgICAgICAgIF9naXJfZ2V0X3BrZ2NvbmZpZ192YXIoSU5UUk9TUEVDVElPTl9HSVJE SVIgImdpcmRpciIgIiIpCiAgICAgICAgIF9naXJfZ2V0X3BrZ2NvbmZpZ192YXIoSU5UUk9TUEVD VElPTl9UWVBFTElCRElSICJ0eXBlbGliZGlyIiAiIikKLSAgICAgICAgX2dpcl9nZXRfcGtnY29u ZmlnX3ZhcihJTlRST1NQRUNUSU9OX0lOU1RBTExfR0lSRElSICJnaXJkaXIiICItLWRlZmluZS12 YXJpYWJsZT1kYXRhZGlyPSR7REFUQV9JTlNUQUxMX0RJUn0iKQotICAgICAgICBfZ2lyX2dldF9w a2djb25maWdfdmFyKElOVFJPU1BFQ1RJT05fSU5TVEFMTF9UWVBFTElCRElSICJ0eXBlbGliZGly IiAiLS1kZWZpbmUtdmFyaWFibGU9bGliZGlyPSR7TElCX0lOU1RBTExfRElSfSIpCiAgICAgICAg IHNldChJTlRST1NQRUNUSU9OX0NGTEFHUyAiJHtfcGNfZ2lyX0NGTEFHU30iKQogICAgICAgICBz ZXQoSU5UUk9TUEVDVElPTl9MSUJTICIke19wY19naXJfTElCU30iKQogICAgIGVuZGlmICgpCkBA IC01OSw2ICs1Nyw0IEBAIG1hcmtfYXNfYWR2YW5jZWQoCiAgICAgSU5UUk9TUEVDVElPTl9UWVBF TElCRElSCiAgICAgSU5UUk9TUEVDVElPTl9DRkxBR1MKICAgICBJTlRST1NQRUNUSU9OX0xJQlMK LSAgICBJTlRST1NQRUNUSU9OX0lOU1RBTExfR0lSRElSCi0gICAgSU5UUk9TUEVDVElPTl9JTlNU QUxMX1RZUEVMSUJESVIKICkKZGlmZiAtLWdpdCBhL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNt YWtlIGIvU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2UKaW5kZXggMzUyZDcxYy4uYTMzNmU3 MiAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2UKKysrIGIvU291cmNl L2NtYWtlL09wdGlvbnNHVEsuY21ha2UKQEAgLTI1LDYgKzI1LDggQEAgc2V0KExJQkVYRUNfSU5T VEFMTF9ESVIgIiR7Q01BS0VfSU5TVEFMTF9GVUxMX0xJQkVYRUNESVJ9L3dlYmtpdGd0ay0ke1dF QktJVEdUS18KIHNldChEQVRBX0JVSUxEX0RJUiAiJHtDTUFLRV9CSU5BUllfRElSfS9zaGFyZS8k e1dlYktpdF9PVVRQVVRfTkFNRX0iKQogc2V0KERBVEFfSU5TVEFMTF9ESVIgIiR7Q01BS0VfSU5T VEFMTF9EQVRBRElSfS93ZWJraXRndGstJHtXRUJLSVRHVEtfQVBJX1ZFUlNJT059IikKIHNldChX RUJLSVRHVEtfSEVBREVSX0lOU1RBTExfRElSICIke0NNQUtFX0lOU1RBTExfSU5DTFVERURJUn0v d2Via2l0Z3RrLSR7V0VCS0lUR1RLX0FQSV9WRVJTSU9OfSIpCitzZXQoSU5UUk9TUEVDVElPTl9J TlNUQUxMX0dJUkRJUiAiJHtDTUFLRV9JTlNUQUxMX0ZVTExfREFUQURJUn0vZ2lyLTEuMCIpCitz ZXQoSU5UUk9TUEVDVElPTl9JTlNUQUxMX1RZUEVMSUJESVIgIiR7TElCX0lOU1RBTExfRElSfS9n aXJlcG9zaXRvcnktMS4wIikKIAogZmluZF9wYWNrYWdlKENhaXJvIDEuMTAuMiBSRVFVSVJFRCkK IGZpbmRfcGFja2FnZShGb250Y29uZmlnIDIuOC4wIFJFUVVJUkVEKQo=