GNOME Bugzilla – Bug 769362
Port from gnome-common and intltool
Last modified: 2016-08-03 11:07:50 UTC
As other projects are moving from intltool to gettext, I thought it would be a good idea to do some cleaning up here as well. For starters, this patch kills gnome-common.
Created attachment 332450 [details] [review] Port from gnome-common gnome-common has been deprecated for quite some time now and using upstream autoconf-archive macros is now recommended. This commit makes changes to the project files as per the GNOME migration guide.
Review of attachment 332450 [details] [review]: Hey, this is indeed something we want, thanks! We use git.mk, so I believe that needs changing right? Also the workarounds in POTFILES.skip. I'm reading this https://blogs.gnome.org/mcatanzaro/2016/07/27/on-the-killing-of-intltool/ and this https://blogs.gnome.org/mclasen/2016/07/21/using-modern-gettext/
(In reply to Carlos Soriano from comment #2) > Review of attachment 332450 [details] [review] [review]: > > Hey, this is indeed something we want, thanks! > > We use git.mk, so I believe that needs changing right? > Also the workarounds in POTFILES.skip. > > I'm reading this > https://blogs.gnome.org/mcatanzaro/2016/07/27/on-the-killing-of-intltool/ > and this https://blogs.gnome.org/mclasen/2016/07/21/using-modern-gettext/ The patch only takes care of the issue here: https://wiki.gnome.org/Projects/GnomeCommon/Migration As for the using git.mk, it is not a problem. It generates .gitignores for us and it indeed does add the mentioned po/Makevars.template file. If the patch gets committed, I will update the bug and look into moving from intltool as well. Trying not to rush things too much. :)
The patch also implies a hard dependency on m4-common, meaning that the jhbuild moduleset will have to be updated accordingly.
Review of attachment 332450 [details] [review]: As discussed on IRC, this is just for porting from gnome-common, not to killing inittool. So this looks good to me, thanks!
Comment on attachment 332450 [details] [review] Port from gnome-common Attachment 332450 [details] pushed as da85fce - Port from gnome-common
Created attachment 332520 [details] [review] Port from intltool gettext has been continuously improving, up to a point where intltool can be deprecated in favor of it. This commit ports the project files to use upstream gettext.
Yes, the patch is a little bigger than the ones attached to other projects, but I can assure you that this is all for the better. I have distchecked with the changes and it seems to work just fine with no immediately visible regressions.
Review of attachment 332520 [details] [review]: Hey, thanks a lot for this work! Several places look cleaner now. I have one doubt, where is Makevars included/run? Apart of the aforementioned question, I'm going to kinda trust you on this one, reviewed with my current knowledge on this, which is not big. So LGTM!
(In reply to Carlos Soriano from comment #9) > I have one doubt, where is Makevars included/run? The contents of po/Makevars get inserted into po/Makefile during configuration. I found a little bug, going to attach an update in a bit.
Created attachment 332574 [details] [review] Port from intltool gettext has been continuously improving, up to a point where intltool can be deprecated in favor of it. This commit ports the project files to use upstream gettext.
(In reply to Ernestas Kulik from comment #11) > Created attachment 332574 [details] [review] [review] > Port from intltool > > gettext has been continuously improving, up to a point where intltool > can be deprecated in favor of it. This commit ports the project files to > use upstream gettext. what's the change?
(In reply to Carlos Soriano from comment #12) > what's the change? I messed up a rule for some of the desktop files. nautilus-autorun-software.desktop, nautilus-classic.desktop and org.gnome.Nautilus.desktop were all being generated from org.gnome.Nautilus.desktop.in. That seems to be it, though.
Review of attachment 332574 [details] [review]: Ok, let's test the waters! :)
Attachment 332574 [details] pushed as fc2139c - Port from intltool
Piotr, thanks for taking your time to fix my mess-ups!
No problem. It's just nitpicks really, I'm not even sure if that variable in Makevars is used at all.