After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 795982 - Meson: bugfixes for glib-networking while cross-compiling and on Windows
Meson: bugfixes for glib-networking while cross-compiling and on Windows
Status: RESOLVED FIXED
Product: glib
Classification: Platform
Component: network
unspecified
Other All
: Normal normal
: ---
Assigned To: gtkdev
gtkdev
Depends on: 796085
Blocks:
 
 
Reported: 2018-05-09 16:22 UTC by Nirbheek Chauhan
Modified: 2018-05-14 12:59 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
meson: Add missing libintl dep for Windows (1.23 KB, patch)
2018-05-09 16:22 UTC, Nirbheek Chauhan
committed Details | Review
meson: Only run gio-querymodules if it's found (1.44 KB, patch)
2018-05-09 16:22 UTC, Nirbheek Chauhan
committed Details | Review
Revert "meson: Add missing libintl dep for Windows" (1.30 KB, patch)
2018-05-14 12:59 UTC, Michael Catanzaro
committed Details | Review

Description Nirbheek Chauhan 2018-05-09 16:22:39 UTC
gio-querymodules is not essential for post-install, make it optional and pick it up from the cross file.

libintl used for translations, but the dependency was not added.
Comment 1 Nirbheek Chauhan 2018-05-09 16:22:45 UTC
Created attachment 371860 [details] [review]
meson: Add missing libintl dep for Windows
Comment 2 Nirbheek Chauhan 2018-05-09 16:22:52 UTC
Created attachment 371861 [details] [review]
meson: Only run gio-querymodules if it's found

And run the correct one if it's found
Comment 3 Michael Catanzaro 2018-05-09 16:38:23 UTC
Review of attachment 371860 [details] [review]:

OK
Comment 4 Michael Catanzaro 2018-05-09 16:40:03 UTC
Review of attachment 371861 [details] [review]:

Do you need me to commit?
Comment 5 Nirbheek Chauhan 2018-05-09 16:57:09 UTC
Attachment 371860 [details] pushed as 3c429ad - meson: Add missing libintl dep for Windows
Attachment 371861 [details] pushed as 1d4a1d9 - meson: Only run gio-querymodules if it's found
Comment 6 Xavier Claessens 2018-05-13 23:47:43 UTC
Actually, I got libintl wrong in glib that's why apps like glib-networking suddenly needs to add that dep. I made a patch for glib in bug #796085 and once that's merged glib-networking should revert the commit 3c429ad.
Comment 7 Michael Catanzaro 2018-05-14 12:58:22 UTC
OK, let's just revert it now so we don't forget, since it hasn't been released yet anyway.
Comment 8 Michael Catanzaro 2018-05-14 12:58:55 UTC
The following fix has been pushed:
407868f Revert "meson: Add missing libintl dep for Windows"
Comment 9 Michael Catanzaro 2018-05-14 12:59:01 UTC
Created attachment 372009 [details] [review]
Revert "meson: Add missing libintl dep for Windows"

This reverts commit 3c429ad4eef89604c7405040daaad83f76d224cc.