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 776796 - Desktop file has a "@VERSION@" in it
Desktop file has a "@VERSION@" in it
Status: RESOLVED FIXED
Product: nautilus
Classification: Core
Component: Metadata
unspecified
Other Linux
: Normal normal
: ---
Assigned To: Nautilus Maintainers
Nautilus Maintainers
Depends on:
Blocks:
 
 
Reported: 2017-01-03 07:46 UTC by Arnaud B.
Modified: 2017-01-05 13:24 UTC
See Also:
GNOME target: ---
GNOME version: 3.21/3.22


Attachments
general: fix data file variable substitution (4.00 KB, patch)
2017-01-03 15:55 UTC, Ernestas Kulik
none Details | Review
general: fix data file variable substitution (4.73 KB, patch)
2017-01-03 17:08 UTC, Ernestas Kulik
none Details | Review
general: remove search provider service (848 bytes, patch)
2017-01-04 15:28 UTC, Ernestas Kulik
committed Details | Review
general: remove Bug Buddy metadata from desktop files (2.17 KB, patch)
2017-01-04 15:29 UTC, Ernestas Kulik
committed Details | Review
general: use Autoconf to perform substitution (1.69 KB, patch)
2017-01-04 15:29 UTC, Ernestas Kulik
committed Details | Review
data/Makefile.am: fix up indentation (1.98 KB, patch)
2017-01-04 15:29 UTC, Ernestas Kulik
committed Details | Review

Description Arnaud B. 2017-01-03 07:46:41 UTC
I imagine that (as in many other modules) the desktop file was once upon a time generated by a .desktop.in.in one. If I understood correctly, the goal of this double transformation was first to replace the ‘@VERSION@’ by the version number, and of course second for translating.

Now, the ‘X-GNOME-Bugzilla-Version=@VERSION@’ thing finishes directly in the desktop files (*four* desktop files, I think all linked to Nautilus: mount-archive.desktop, nautilus-autorun-software.desktop, nautilus-classic.desktop, org.gnome.Nautilus.desktop).

I think you should either go back to .in.in files, or I think (that’s a custom solution, so I might have done some errors in it) you could either use the Makefile for doing that like in dconf-editor[1]. Or you might remove the ‘X-GNOME-Bugzilla’ things.

[1] https://git.gnome.org/browse/dconf-editor/commit/?id=74f8e199a1f601cdff2d5788c2ab345f0f7031bb
Comment 1 Ernestas Kulik 2017-01-03 15:55:37 UTC
Created attachment 342775 [details] [review]
general: fix data file variable substitution

Some data files use AC_SUBST’ed variables, but they are not substituted,
because of removed entries from AC_CONFIG_FILES. One of the files is no
longer used, so it was removed.
Comment 2 Ernestas Kulik 2017-01-03 17:08:51 UTC
Created attachment 342779 [details] [review]
general: fix data file variable substitution

Some data files use AC_SUBST’ed variables, but they are not substituted,
because of removed entries from AC_CONFIG_FILES. One of the files is no
longer used, so it was removed.
Comment 3 Carlos Soriano 2017-01-04 09:24:23 UTC
Review of attachment 342779 [details] [review]:

oh I didn't realized that. I wonder, do we really need this at all? I don't see any place where this is convenient... I'm pondering it would be better to just remove it.
Comment 4 Ernestas Kulik 2017-01-04 09:45:39 UTC
(In reply to Carlos Soriano from comment #3)
> Review of attachment 342779 [details] [review] [review]:
> 
> oh I didn't realized that. I wonder, do we really need this at all? I don't
> see any place where this is convenient... I'm pondering it would be better
> to just remove it.

Bug Buddy parses all that schmutz, but I have no idea if anyone uses it.
Comment 5 Carlos Soriano 2017-01-04 09:59:02 UTC
(In reply to Ernestas Kulik from comment #4)
> (In reply to Carlos Soriano from comment #3)
> > Review of attachment 342779 [details] [review] [review] [review]:
> > 
> > oh I didn't realized that. I wonder, do we really need this at all? I don't
> > see any place where this is convenient... I'm pondering it would be better
> > to just remove it.
> 
> Bug Buddy parses all that schmutz, but I have no idea if anyone uses it.

Oh I see, this looks very outdated, let's remove it.
Comment 6 Ernestas Kulik 2017-01-04 15:28:55 UTC
Created attachment 342861 [details] [review]
general: remove search provider service

It was to be removed in 39b4fc320b2a4ef6cfd36f7e2f74cc2cfcf60e9d.
Comment 7 Ernestas Kulik 2017-01-04 15:29:06 UTC
Created attachment 342862 [details] [review]
general: remove Bug Buddy metadata from desktop files

Bug Buddy is no longer actively maintained and probably even less
actively used. ABRT and Apport seem to not parse these things as well.
Comment 8 Ernestas Kulik 2017-01-04 15:29:14 UTC
Created attachment 342863 [details] [review]
general: use Autoconf to perform substitution

Variables in service files are substituted using sed, which takes more
space than a couple of lines in configure.ac.
Comment 9 Ernestas Kulik 2017-01-04 15:29:23 UTC
Created attachment 342864 [details] [review]
data/Makefile.am: fix up indentation
Comment 10 Carlos Soriano 2017-01-04 15:32:46 UTC
Review of attachment 342861 [details] [review]:

+1
Comment 11 Carlos Soriano 2017-01-04 15:33:07 UTC
Review of attachment 342862 [details] [review]:

+1
Comment 12 Carlos Soriano 2017-01-04 15:34:04 UTC
Review of attachment 342863 [details] [review]:

I wonder if we should keep these things in case we switch to a different build system, but oh well we can always recheck the code we used in the past :)
Comment 13 Carlos Soriano 2017-01-04 15:34:23 UTC
Review of attachment 342864 [details] [review]:

+1
Comment 14 Ernestas Kulik 2017-01-04 15:37:29 UTC
Attachment 342861 [details] pushed as 04173f0 - general: remove search provider service
Attachment 342862 [details] pushed as 3868b4c - general: remove Bug Buddy metadata from desktop files
Attachment 342863 [details] pushed as 48cd707 - general: use Autoconf to perform substitution
Attachment 342864 [details] pushed as db8e84d - data/Makefile.am: fix up indentation
Comment 15 Ernestas Kulik 2017-01-04 22:08:52 UTC
(In reply to Carlos Soriano from comment #12)
> I wonder if we should keep these things in case we switch to a different
> build system, but oh well we can always recheck the code we used in the past
> :)

Not only that, it’s required, because running the file through Autoconf only substitutes the variable, but does not expand it. “@bindir@” -> “${exec_prefix}” instead of the actual path.

I have reverted the commit.
Comment 16 Carlos Soriano 2017-01-05 13:24:29 UTC
(In reply to Ernestas Kulik from comment #15)
> (In reply to Carlos Soriano from comment #12)
> > I wonder if we should keep these things in case we switch to a different
> > build system, but oh well we can always recheck the code we used in the past
> > :)
> 
> Not only that, it’s required, because running the file through Autoconf only
> substitutes the variable, but does not expand it. “@bindir@” ->
> “${exec_prefix}” instead of the actual path.
> 
> I have reverted the commit.

Oh I see, thanks for keeping an eye to your commits!