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 790151 - Port build system to Meson
Port build system to Meson
Status: RESOLVED OBSOLETE
Product: gnome-maps
Classification: Applications
Component: general
git master
Other Linux
: Normal normal
: ---
Assigned To: gnome-maps-maint
gnome-maps-maint
Depends on:
Blocks:
 
 
Reported: 2017-11-10 08:01 UTC by Marcus Lundblad
Modified: 2018-03-26 14:00 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Remove intltool markers from .appdata and .desktop (3.46 KB, patch)
2018-03-21 21:27 UTC, Marcus Lundblad
none Details | Review
Set launcher script template executable (618 bytes, patch)
2018-03-21 21:28 UTC, Marcus Lundblad
none Details | Review
Switch to build with Meson (48.53 KB, patch)
2018-03-21 21:28 UTC, Marcus Lundblad
none Details | Review
Remove intltool markers from .appdata and .desktop (3.52 KB, patch)
2018-03-22 20:31 UTC, Marcus Lundblad
none Details | Review
Switch to build with Meson (48.83 KB, patch)
2018-03-22 20:56 UTC, Marcus Lundblad
none Details | Review
Switch to build with Meson (48.78 KB, patch)
2018-03-22 22:10 UTC, Marcus Lundblad
none Details | Review

Description Marcus Lundblad 2017-11-10 08:01:53 UTC
We should probably sooner or later look at porting away from GNU Automake to Meson for our build system like other GNOME modules are doing to stay in-line.
Comment 1 Marcus Lundblad 2018-03-21 21:27:52 UTC
Created attachment 369978 [details] [review]
Remove intltool markers from .appdata and .desktop
Comment 2 Marcus Lundblad 2018-03-21 21:28:08 UTC
Created attachment 369979 [details] [review]
Set launcher script template executable

When building with Meson, the resulting script
gets the same permissions as the template. So make
sure it's set as executable.
Comment 3 Marcus Lundblad 2018-03-21 21:28:24 UTC
Created attachment 369980 [details] [review]
Switch to build with Meson

Implement Meson build support.
Re-arrange icons into directory trees
corresponding to the final install directories
under public datadir and package-internal datadir
to avoid parsing icon file names to produce a
directory hierarchy. For this reason, drop
autotools support now.
Comment 4 Piotr Drąg 2018-03-21 22:53:42 UTC
Review of attachment 369978 [details] [review]:

::: data/org.gnome.Maps.desktop.in
@@ +12,3 @@
 DBusActivatable=true
 MimeType=application/vnd.geo+json;x-scheme-handler/geo;application/vnd.google-earth.kml+xml;application/gpx+xml;
 _X-Geoclue-Reason=Allows your location to be shown on the map.

You missed one. :)

It won’t be extracted by default, though, so you need a workaround similar to the one used in Clocks:

https://git.gnome.org/browse/gnome-clocks/tree/data/meson.build#n13
https://git.gnome.org/browse/gnome-clocks/tree/po/meson.build
Comment 5 Marcus Lundblad 2018-03-22 07:26:04 UTC
(In reply to Piotr Drąg from comment #4)
> Review of attachment 369978 [details] [review] [review]:
> 
> ::: data/org.gnome.Maps.desktop.in
> @@ +12,3 @@
>  DBusActivatable=true
>  MimeType=application/vnd.geo+json;x-scheme-handler/geo;application/vnd.
> google-earth.kml+xml;application/gpx+xml;
>  _X-Geoclue-Reason=Allows your location to be shown on the map.
> 
> You missed one. :)
> 
> It won’t be extracted by default, though, so you need a workaround similar
> to the one used in Clocks:
> 
> https://git.gnome.org/browse/gnome-clocks/tree/data/meson.build#n13
> https://git.gnome.org/browse/gnome-clocks/tree/po/meson.build

Thanks!
I'll fix this up! :)
Feel free to try out the build.
Comment 6 Marcus Lundblad 2018-03-22 20:31:20 UTC
Created attachment 370023 [details] [review]
Remove intltool markers from .appdata and .desktop
Comment 7 Marcus Lundblad 2018-03-22 20:56:57 UTC
Created attachment 370025 [details] [review]
Switch to build with Meson

Implement Meson build support.
Re-arrange icons into directory trees
corresponding to the final install directories
under public datadir and package-internal datadir
to avoid parsing icon file names to produce a
directory hierarchy. For this reason, drop
autotools support now.
Comment 8 Piotr Drąg 2018-03-22 21:58:11 UTC
Review of attachment 370025 [details] [review]:

::: data/meson.build
@@ +22,3 @@
+    '--template', '@INPUT@', '-d', po_dir, '-o', '@OUTPUT@',
+    '--keyword=X-GNOME-FullName', '--keyword=X-Geoclue-Reason',
+    '--keyword=Name', '--keyword=GenericName', '--keyword=Comment', '--keyword=Keywords'

Maps doesn’t have X-GNOME-FullName nor GenericName in the .desktop file.
Comment 9 Marcus Lundblad 2018-03-22 22:10:14 UTC
Created attachment 370027 [details] [review]
Switch to build with Meson

Implement Meson build support.
Re-arrange icons into directory trees
corresponding to the final install directories
under public datadir and package-internal datadir
to avoid parsing icon file names to produce a
directory hierarchy. For this reason, drop
autotools support now.
Comment 10 Marcus Lundblad 2018-03-22 22:20:30 UTC
(In reply to Piotr Drąg from comment #8)
> Review of attachment 370025 [details] [review] [review]:
> 
> ::: data/meson.build
> @@ +22,3 @@
> +    '--template', '@INPUT@', '-d', po_dir, '-o', '@OUTPUT@',
> +    '--keyword=X-GNOME-FullName', '--keyword=X-Geoclue-Reason',
> +    '--keyword=Name', '--keyword=GenericName', '--keyword=Comment',
> '--keyword=Keywords'
> 
> Maps doesn’t have X-GNOME-FullName nor GenericName in the .desktop file.

Right, removed those :)
Comment 11 GNOME Infrastructure Team 2018-03-26 14:00:00 UTC
-- GitLab Migration Automatic Message --

This bug has been migrated to GNOME's GitLab instance and has been closed from further activity.

You can subscribe and participate further through the new bug through this link to our GitLab instance: https://gitlab.gnome.org/GNOME/gnome-maps/issues/104.