110850 2013-02-25 23:35:13 -0800 [GTK] No need to manually add system paths to jhbuildrc 2013-03-25 08:50:30 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 csaavedra webkit-unassigned cgarcia d-r gustavo mrobinson oldest_to_newest 841682 0 csaavedra 2013-02-25 23:35:13 -0800 Tools/gtk/jhbuildrc is manually adding system dirs to PKG_CONFIG_PATH: # Use system libraries while building. if use_lib64: _libdir = 'lib64' else: _libdir = 'lib' addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', _libdir, 'pkgconfig')) addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', 'share', 'pkgconfig')) First of all, addpath() seems to be /prefixing/ the path to the env. variable. This might make sense in some cases, but it doesn't when your PKG_CONFIG_PATH is already set to something sensible (for instance, if you are building WebKit from GNOME's jhbuild shell, which sets up the PKG_CONFIG_PATH to the path where GNOME has been built). Moreover, I think this is totally unnecessary. If partial_build is True (see https://mail.gnome.org/archives/desktop-devel-list/2011-July/msg00095.html) and PKG_CONFIG_PATH is empty, Config.setup_env() is already setting it to, at least, use the system libraries. Therefore, I think that our jhbuildrc's addpath(PKG_CONFIG, ..) calls can be safely removed. 841812 1 190245 csaavedra 2013-02-26 02:09:36 -0800 Created attachment 190245 Patch 841908 2 190245 gustavo 2013-02-26 05:19:43 -0800 Comment on attachment 190245 Patch OK, and partial_build is set to True by default, makes sense to me. Do you think this is also true of the other paths we're adding here, like the XDG ones that show up in your hunk? 841933 3 csaavedra 2013-02-26 05:57:29 -0800 Yes, it seems they are also set during initialization: # XDG_DATA_DIRS if self.partial_build: addpath('XDG_DATA_DIRS', '/usr/share') xdgdatadir = os.path.join(self.prefix, 'share') addpath('XDG_DATA_DIRS', xdgdatadir) # XDG_CONFIG_DIRS if self.partial_build: addpath('XDG_CONFIG_DIRS', '/etc') xdgconfigdir = os.path.join(self.prefix, 'etc', 'xdg') addpath('XDG_CONFIG_DIRS', xdgconfigdir) 841953 4 190271 csaavedra 2013-02-26 06:40:22 -0800 Created attachment 190271 Patch 846505 5 csaavedra 2013-03-04 08:07:10 -0800 Committed r144628: <http://trac.webkit.org/changeset/144628> 190245 2013-02-26 02:09:36 -0800 2013-02-26 06:40:17 -0800 Patch bug-110850-20130226120550.patch text/plain 1369 csaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0MDA4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTRhMDBlZTVlZmIxYmJkNDIzOGQyZDNhMGFmMWRkNDk4 YTE1MjdlNi4uYWYxMmE3N2E4NDAwMzg4NGI4YzRmYjgwZTU0MGZmOTEzMmFiNmJhMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDEyLTAyLTI2ICBDbGF1ZGlvIFNhYXZlZHJhICA8Y3NhYXZlZHJhQGlnYWxpYS5jb20+ CisKKyAgICAgICAgW0dUS10gTm8gbmVlZCB0byBtYW51YWxseSBzZXQgUEtHX0NPTkZJR19QQVRI IHRvIHN5c3RlbSBwcmVmaXgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMDg1MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogZ3RrL2poYnVpbGRyYzogUmVtb3ZlIFBLR19DT05GSUdfUEFUSCBzZXR0aW5n LCBqaGJ1aWxkIGRvZXMgdGhpcworICAgICAgICBhbHJlYWR5LgorCiAyMDEzLTAyLTI1ICBBbGFu IEN1dHRlciAgPGFsYW5jdXR0ZXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEdDRSBFV1MgYm90 cyBmYWlsaW5nIGludGVybWl0dGVudGx5IG9uIEhUVFAgNTAyIGVycm9yIHdoaWxlIHVwZGF0aW5n IHRoZWlyIHN0YXR1cwpkaWZmIC0tZ2l0IGEvVG9vbHMvZ3RrL2poYnVpbGRyYyBiL1Rvb2xzL2d0 ay9qaGJ1aWxkcmMKaW5kZXggNmYzM2VkMWNlOTViNGU5OWZlZmU2ZWI3MGY3ODQzNWM0OWViZDQy Mi4uMDcwZjkzODU0ZDk5NWJmODQ3YTMyNDUzNzRiODZjNTRjYTY1NGI2YSAxMDA2NDQKLS0tIGEv VG9vbHMvZ3RrL2poYnVpbGRyYworKysgYi9Ub29scy9ndGsvamhidWlsZHJjCkBAIC00NiwxNCAr NDYsNiBAQCBub25vdGlmeSA9IFRydWUKIG5vdHJheWljb24gPSBUcnVlCiBvcy5lbnZpcm9uWydN QUtFRkxBR1MnXSA9ICctaiVkJyAlIG11bHRpcHJvY2Vzc2luZy5jcHVfY291bnQoKQogCi0jIFVz ZSBzeXN0ZW0gbGlicmFyaWVzIHdoaWxlIGJ1aWxkaW5nLgotaWYgdXNlX2xpYjY0OgotICAgIF9s aWJkaXIgPSAnbGliNjQnCi1lbHNlOgotICAgIF9saWJkaXIgPSAnbGliJwotYWRkcGF0aCgnUEtH X0NPTkZJR19QQVRIJywgb3MucGF0aC5qb2luKG9zLnNlcCwgJ3VzcicsIF9saWJkaXIsICdwa2dj b25maWcnKSkKLWFkZHBhdGgoJ1BLR19DT05GSUdfUEFUSCcsIG9zLnBhdGguam9pbihvcy5zZXAs ICd1c3InLCAnc2hhcmUnLCAncGtnY29uZmlnJykpCi0KIGFkZHBhdGgoJ1hER19EQVRBX0RJUlMn LCAnL3Vzci9zaGFyZScpCiBhZGRwYXRoKCdYREdfQ09ORklHX0RJUlMnLCAnL2V0Yy94ZGcnKQog Cg== 190271 2013-02-26 06:40:22 -0800 2013-03-04 06:49:02 -0800 Patch bug-110850-20130226163637.patch text/plain 1489 csaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0MDA4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTRhMDBlZTVlZmIxYmJkNDIzOGQyZDNhMGFmMWRkNDk4 YTE1MjdlNi4uYjEyNjFlM2NkNjQ4NzdmNWU4NTc5ZTViYjdhY2VjMzgxNjRlZjJmYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDEyLTAyLTI2ICBDbGF1ZGlvIFNhYXZlZHJhICA8Y3NhYXZlZHJhQGlnYWxpYS5jb20+ CisKKyAgICAgICAgW0dUS10gTm8gbmVlZCB0byBtYW51YWxseSBhZGQgc3lzdGVtIHBhdGhzIHRv IGpoYnVpbGRyYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTEwODUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBndGsvamhidWlsZHJjOiBSZW1vdmUgY2FsbHMgdG8gYWRkcGF0aCgpIGZvciBpdGVtcyB0 aGF0IGpoYnVpbGQKKyAgICAgICAgYWxyZWFkeSB0YWtlcyBjYXJlIG9mLgorCiAyMDEzLTAyLTI1 ICBBbGFuIEN1dHRlciAgPGFsYW5jdXR0ZXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEdDRSBF V1MgYm90cyBmYWlsaW5nIGludGVybWl0dGVudGx5IG9uIEhUVFAgNTAyIGVycm9yIHdoaWxlIHVw ZGF0aW5nIHRoZWlyIHN0YXR1cwpkaWZmIC0tZ2l0IGEvVG9vbHMvZ3RrL2poYnVpbGRyYyBiL1Rv b2xzL2d0ay9qaGJ1aWxkcmMKaW5kZXggNmYzM2VkMWNlOTViNGU5OWZlZmU2ZWI3MGY3ODQzNWM0 OWViZDQyMi4uZWVjODlhMWJmMGM3M2VlNmQ2ZWE2N2VlNmI5MWFiZjg1ODY4ZWMwMyAxMDA2NDQK LS0tIGEvVG9vbHMvZ3RrL2poYnVpbGRyYworKysgYi9Ub29scy9ndGsvamhidWlsZHJjCkBAIC00 NiwxNiArNDYsNSBAQCBub25vdGlmeSA9IFRydWUKIG5vdHJheWljb24gPSBUcnVlCiBvcy5lbnZp cm9uWydNQUtFRkxBR1MnXSA9ICctaiVkJyAlIG11bHRpcHJvY2Vzc2luZy5jcHVfY291bnQoKQog Ci0jIFVzZSBzeXN0ZW0gbGlicmFyaWVzIHdoaWxlIGJ1aWxkaW5nLgotaWYgdXNlX2xpYjY0Ogot ICAgIF9saWJkaXIgPSAnbGliNjQnCi1lbHNlOgotICAgIF9saWJkaXIgPSAnbGliJwotYWRkcGF0 aCgnUEtHX0NPTkZJR19QQVRIJywgb3MucGF0aC5qb2luKG9zLnNlcCwgJ3VzcicsIF9saWJkaXIs ICdwa2djb25maWcnKSkKLWFkZHBhdGgoJ1BLR19DT05GSUdfUEFUSCcsIG9zLnBhdGguam9pbihv cy5zZXAsICd1c3InLCAnc2hhcmUnLCAncGtnY29uZmlnJykpCi0KLWFkZHBhdGgoJ1hER19EQVRB X0RJUlMnLCAnL3Vzci9zaGFyZScpCi1hZGRwYXRoKCdYREdfQ09ORklHX0RJUlMnLCAnL2V0Yy94 ZGcnKQotCiAjIEdUSysgMy4wLjEyIG1pc3NlcyB0aGUgLWxtIGZsYWcgd2hlbiBsaW5raW5nIHRo ZSB0ZXN0cy4KIG1vZHVsZV9tYWtlYXJnc1snZ3RrKyddID0gJ0xERkxBR1M9Ii1sbSIgJyArIG1h a2VhcmdzCg==