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 784179 - meson build port flags fixes
meson build port flags fixes
Status: RESOLVED FIXED
Product: totem
Classification: Core
Component: general
unspecified
Other Linux
: Normal enhancement
: ---
Assigned To: General Totem maintainer(s)
General Totem maintainer(s)
Depends on:
Blocks:
 
 
Reported: 2017-06-25 09:36 UTC by Iñigo Martínez
Modified: 2017-06-26 10:23 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Changed gir file to be formed by variables (900 bytes, patch)
2017-06-25 09:36 UTC, Iñigo Martínez
committed Details | Review
Removed plugins_vala_sources variable (2.27 KB, patch)
2017-06-25 10:16 UTC, Iñigo Martínez
committed Details | Review
Removed duplicated po_dir definition (790 bytes, patch)
2017-06-25 10:17 UTC, Iñigo Martínez
committed Details | Review
Use of a variable for the AppStream XML file name (1.11 KB, patch)
2017-06-25 10:18 UTC, Iñigo Martínez
needs-work Details | Review
build: Use of a variable for the AppStream XML file name (1.05 KB, patch)
2017-06-25 17:17 UTC, Bastien Nocera
committed Details | Review
Use meson to translate desktop file (1.40 KB, patch)
2017-06-26 09:55 UTC, Iñigo Martínez
committed Details | Review
Renamed desktop file (2.35 KB, patch)
2017-06-26 09:58 UTC, Iñigo Martínez
committed Details | Review
Replaced thumbnailer template file (1.70 KB, patch)
2017-06-26 10:01 UTC, Iñigo Martínez
committed Details | Review

Description Iñigo Martínez 2017-06-25 09:36:22 UTC
Created attachment 354412 [details] [review]
Changed gir file to be formed by variables

The change allows an easier transition between api versions, if they happen, by forming the gir file name using variables in the main meson build file.
Comment 1 Iñigo Martínez 2017-06-25 10:16:42 UTC
Created attachment 354413 [details] [review]
Removed plugins_vala_sources variable

Removed plugins_vala_sources variable which is not necessary any more.
Comment 2 Iñigo Martínez 2017-06-25 10:17:25 UTC
Created attachment 354414 [details] [review]
Removed duplicated po_dir definition

po_dir is defined in the main meson build file and can be reused when merging translations.
Comment 3 Iñigo Martínez 2017-06-25 10:18:04 UTC
Created attachment 354415 [details] [review]
Use of a variable for the AppStream XML file name

The name of the AppStream XML has been moved to a variable making it less error prone.
Comment 4 Bastien Nocera 2017-06-25 17:13:48 UTC
Review of attachment 354412 [details] [review]:

Not that useful, but sure.
Comment 5 Bastien Nocera 2017-06-25 17:14:28 UTC
Review of attachment 354413 [details] [review]:

Looks correct.
Comment 6 Bastien Nocera 2017-06-25 17:15:03 UTC
Review of attachment 354414 [details] [review]:

Sure.
Comment 7 Bastien Nocera 2017-06-25 17:16:58 UTC
Review of attachment 354415 [details] [review]:

If you don't change the indentation, there's only one line added and 2 changed.
Comment 8 Bastien Nocera 2017-06-25 17:17:11 UTC
Created attachment 354422 [details] [review]
build: Use of a variable for the AppStream XML file name

The name of the AppStream XML has been moved to a variable making it
less error prone.
Comment 9 Bastien Nocera 2017-06-25 17:17:36 UTC
Review of attachment 354422 [details] [review]:

Like so.
Comment 10 Iñigo Martínez 2017-06-25 17:46:33 UTC
There are some subtle changes in the patch. I have changed the indentation on purpose, simply to be consistent with the whole meson port's indentation. The name of the target was also intentionally changed from 'appdata' string to appdata variable, which holds the name of the resulting file name, being consistent in addition with the rest of the meson port.

However, if you consider it's better that way, feel free to change it :)
Comment 11 Iñigo Martínez 2017-06-26 09:55:14 UTC
Created attachment 354495 [details] [review]
Use meson to translate desktop file

totem has started using meson translation capabilities for some files[0]. This patchs also uses meson's translation feature for the destkop file.

[0] https://git.gnome.org/browse/totem/commit/?id=a13d42100ab3337de5050e82da81577c46cc6a64
Comment 12 Bastien Nocera 2017-06-26 09:58:14 UTC
(In reply to Iñigo Martínez from comment #10)
> There are some subtle changes in the patch. I have changed the indentation
> on purpose, simply to be consistent with the whole meson port's indentation.

Can't say I like it.

> The name of the target was also intentionally changed from 'appdata' string
> to appdata variable, which holds the name of the resulting file name, being
> consistent in addition with the rest of the meson port.

But what does it fix/change?

> However, if you consider it's better that way, feel free to change it :)

The rest of the reordering I don't understand how you can justify, really. So yes, I prefer my version ;)
Comment 13 Iñigo Martínez 2017-06-26 09:58:26 UTC
Created attachment 354496 [details] [review]
Renamed desktop file

Since the autotools removal, org.gnome.Totem.desktop.in.in.in file was unnecessary. This patch removes this file and renames org.gnome.Totem.desktop.meson to org.gnome.Totem.desktop.in.in, to denote the two steps in its generation, variable removal and translation merge, and to maintain the consistency with the rest of the files.
Comment 14 Iñigo Martínez 2017-06-26 10:01:04 UTC
Created attachment 354497 [details] [review]
Replaced thumbnailer template file

The totem.thumbnailer.in file, which is not used any more on the meson build port, has been replaced by the meson template, whose contents were used but renaming it in order to make its filename consistent with the rest of the files.