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 708750 - [patch] Please include an AppData file
[patch] Please include an AppData file
Status: RESOLVED FIXED
Product: brasero
Classification: Applications
Component: general
git master
Other Linux
: Normal enhancement
: ---
Assigned To: Brasero maintainer(s)
Brasero maintainer(s)
Depends on:
Blocks:
 
 
Reported: 2013-09-25 13:46 UTC by Richard Hughes
Modified: 2013-10-24 08:47 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
patch that works for me (2.64 KB, patch)
2013-09-25 13:46 UTC, Richard Hughes
rejected Details | Review
Rely on intltool 0.50 native gsettings support (14.30 KB, patch)
2013-10-02 20:10 UTC, Michael Catanzaro
accepted-commit_now Details | Review
Add community-produced appdata file (2.84 KB, patch)
2013-10-02 20:10 UTC, Michael Catanzaro
accepted-commit_now Details | Review

Description Richard Hughes 2013-09-25 13:46:58 UTC
Created attachment 255687 [details] [review]
patch that works for me

I've attached a translated AppData file for Brasero. Thanks!
Comment 1 Michael Catanzaro 2013-10-02 15:40:05 UTC
Brasero fails distcheck when I apply this patch with:

make[2]: Entering directory `/home/mcatanzaro/brasero/brasero-3.8.0/_build/po'
INTLTOOL_EXTRACT="/usr/bin/intltool-extract" XGETTEXT="/usr/bin/xgettext" srcdir=../../po /usr/bin/intltool-update --gettext-package brasero --pot
can't open ../../po/../data/brasero.appdata.xml.in: No such file or directory at /usr/bin/intltool-extract line 212.
/usr/bin/xgettext: error while opening "../data/brasero.appdata.xml.in.h" for reading: No such file or directory
ERROR: xgettext failed to generate PO template file. Please consult
       error message above if there is any.

 Two thoughts:

I think you need to distribute appdata_DATA instead of appdata_in_files. (That's surely what's causing distcheck to fail).

Don't you need to use INTLTOOL_XML_RULE (rather than INTLTOOL_XML_NOMERGE_RULE) to merge the translations into brasero.appdata.xml?
Comment 2 Daniel Mustieles 2013-10-02 15:45:58 UTC
Seems to be a bug in the patch:

+data/brasero.appdata.xml.in

should be

+data/brasero.appdata.xml
Comment 3 Michael Catanzaro 2013-10-02 19:47:47 UTC
brasero.appdata.xml.in is processed with intltool to generate brasero.appdata.xml.  The problem is that brasero.appdata.xml is going into the tarball, whereas brasero.appdata.xml.in needs to instead.
Comment 4 Michael Catanzaro 2013-10-02 19:48:17 UTC
Review of attachment 255687 [details] [review]:

Fails distcheck, see above
Comment 5 Michael Catanzaro 2013-10-02 20:10:36 UTC
Created attachment 256322 [details] [review]
Rely on intltool 0.50 native gsettings support

This lets us drop use of INTLTOOL_XML_NOMERGE_RULE in data/Makefile.am
Comment 6 Michael Catanzaro 2013-10-02 20:10:38 UTC
Created attachment 256323 [details] [review]
Add community-produced appdata file
Comment 7 Joshua Lock 2013-10-10 15:34:30 UTC
Review of attachment 256322 [details] [review]:

I'm far from an expert in autofoo but this looks good to me, please feel free to commit.
Comment 8 Joshua Lock 2013-10-10 15:35:04 UTC
Review of attachment 256323 [details] [review]:

This looks great, thanks. Please feel free to commit.
Comment 9 Michael Catanzaro 2013-10-10 22:48:56 UTC
Hm, 3.10 never got released or branched, so this can't be committed right now as master is still under string freeze.  (Is a late 3.10 release planned sometime soon?)
Comment 10 Daniel Mustieles 2013-10-11 07:42:15 UTC
3.10.1 will be out in a few days. Branching now to gnome-3-10 would be nice to land this patch for the new release
Comment 11 Michael Catanzaro 2013-10-11 12:19:25 UTC
(In reply to comment #10)
> 3.10.1 will be out in a few days. Branching now to gnome-3-10 would be nice to
> land this patch for the new release

The issue is that translatable appdata -> new strings -> cannot go into 3.10.
Comment 12 Daniel Mustieles 2013-10-11 12:22:48 UTC
I though that branching now to gnome-3-10 and commiting it into master would be included in the 3.10.1 release.

Thanks for the info!
Comment 13 Daniel Mustieles 2013-10-23 09:38:10 UTC
Could you please branch this module and apply the patch into master branch?

Thanks!
Comment 14 Joshua Lock 2013-10-24 08:45:48 UTC
gnome-3-10 branch created and patches applied to master - thanks.

Apologies for the delay, hardware troubles.
Comment 15 Daniel Mustieles 2013-10-24 08:47:51 UTC
Many thanks Joshua!