xfmedia 0.9.0 released

[Brian J. Tarricone]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Benedikt Meurer wrote:
> Brian J. Tarricone wrote:
>>>>>>Ok, checked po/Makefile.in.in, and the DISTFILES line is missing
>>>>>>$(GMOFILES), which would make the .gmo files get included in the
>>>>>>tarball.  This is stock from gettext 0.14.5... might this be a gettext
>>>>>>bug?  I could hack the file, but that would of course get overwritten
>>>>>>the next time I run autogen...
>>>>>
>>>>>Uhm, you shouldn't use gettext at all. You should use glib-gettext.
>>>>
>>>>Er, whatever.  Whatever xfce4-dev-tools uses is what I use.  Meh.
>>>
>>>Works for me: xfmedia/trunk/po/Makefile contains
>>>
>>>DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
>>>$(POFILES) $(GMOFILES) $(SOURCES)
>>>
>>>What version of glib do you use?
>>
>>2.6.5.
> 
> Should be ok. Dunno what could cause that problem for you. Maybe a
> gentoo patch?

Ok, I did a bit more looking.  No, there aren't any Gentoo patches
applied to glib at all.  I looked at /usr/bin/glib-gettextize, and it
copies stuff from /usr/share/glib-2.0/gettext/.  The file
po/Makefile.in.in in that directory *is correct* - that is, it does
include $(GMOFILES) in the DISTDIRS= line.

So I did 'cd ~/src/xfmedia/trunk', and just ran 'glib-gettextize --copy
- --force'.  And the resulting po/Makefile.in.in was correct (it did have
$(GMOFILES) on the DISTDIRS= line).

Then I rand autogen.sh and watched the output.  This seems to be the
"problem":

Running intltoolize --automake --copy --force
Patching file 'po/Makefile.in.in'

So I tried running a test:

$ intltoolize --dry-run --automake --copy --force
rm -f intltool-extract.in
cp -f /usr/share/intltool/intltool-extract.in intltool-extract.in
rm -f intltool-merge.in
cp -f /usr/share/intltool/intltool-merge.in intltool-merge.in
rm -f intltool-update.in
cp -f /usr/share/intltool/intltool-update.in intltool-update.in
rm -f po/Makefile.in.in
cp -f /usr/share/intltool/Makefile.in.in po/Makefile.in.in

Well lookie there: it looks like glib-gettextize just got the shaft.  So
I found /usr/share/intltool/Makefile.in.in.  It's not identical to the
Makefile.in.in that's finally present in ~/src/xfmedia/trunk/po, oddly,
so maybe the "Patching file..." isn't related to intltool.  Ok, right,
/opt/xfce4-svn/bin/xdt-autogen patches that file to change a few things,
and that seems to explain the differences.  But anyway, it is indeed
missing $(GMOFILES) on the DISTDIRS= line.

So it looks like the culprit here is intltool.  'intltoolize --version'
says 'intltoolize (GNU intltool) 0.34.1'.  There are no Gentoo patches.

It looks like there are quite a few differences between the stock
Makefile.in.in that glib-gettextize installs, and the one that intltool
installs, so it looks like the solution here is, when patching
Makefile.in.in, to also check for $(GMOFILES) in $(DISTFILES), and patch
if it's not there.  Of course, that's annoying, because the DISTFILES=
line spans two lines.

I'm out of ideas, anyway.

	-brian

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

iD8DBQFDJUXm6XyW6VEeAnsRAk5qAKC6Rs89ckrZL9BfNjx5KCbEte9qDwCbBGd6
dpB1m4h21p3ghPA5CZaLJTo=
=oMqU
-----END PGP SIGNATURE-----