[pacman-dev] [PATCH] gettext support - part 1
hi http://frugalware.org/~vmiklos/patches/libpacman-proposed/gettext.diff.bz2 here is the first part of the gettext support patch it only adds the necessary gettext function calls. the advantage of this patch: - it contains most of the modifications so once you apply it, probably the other patches will apply without any conflits, the conflicting parts are contained in this patch - it's simple, almost doesn't do anything else so it can be reviewed easily the next patch will modify the build system, but that should be really a separate patch imho as usual, probably it does not apply cleanly, Aurel could you fix it up? (as you said it's not a problem if it does not apply) udv / greetings, VMiklos -- Developer of Frugalware Linux, to make things frugal - http://frugalware.org
On Thu, May 04, 2006 at 12:37:35AM +0200, VMiklos <vmiklos@frugalware.org> wrote:
the next patch will modify the build system, but that should be really a separate patch imho
already done in our tree, i can send here the patches after the part 1 is reviewed udv / greetings, VMiklos -- Developer of Frugalware Linux, to make things frugal - http://frugalware.org
On Fri, May 05, 2006 at 01:15:15AM +0200, VMiklos <vmiklos@frugalware.org> wrote:
already done in our tree, i can send here the patches after the part 1 is reviewed
manpages localization part is done by krix, i hope i can send here the patches after the first 2 parts are reviewed soon :) udv / greetings, VMiklos -- Developer of Frugalware Linux, to make things frugal - http://frugalware.org
On Tue, May 09, 2006 at 04:28:42PM +0200, VMiklos <vmiklos@frugalware.org> wrote:
manpages localization part is done by krix, i hope i can send here the patches after the first 2 parts are reviewed soon :)
hm. any comments? a "looks good", "die plz" or something? ;) maybe i should stop sending this stuff to devnull^H^H^H^H^H^Hhere then you can port it to cvs if you want udv / greetings, VMiklos -- Developer of Frugalware Linux, to make things frugal - http://frugalware.org
On Sat, May 13, 2006 at 08:28:38PM +0200, VMiklos wrote:
hm. any comments?
a "looks good", "die plz" or something? ;)
Looks good. I will commit it soon. Please continue on the i18n-ification if you have the time. After that, are there are any large issues that need to be addressed before we release a beta? Aurelien? Are you alive?
maybe i should stop sending this stuff to devnull^H^H^H^H^H^Hhere then you can port it to cvs if you want
Obviously we do appreciate the work you guys are doing, and it's not lost. But there are many things to take care of, and I believe Aurelien is away (hence his lack of replies recently). Arch/Pacman is not a first priority in most of our lives. The beauty of a mailing list is that nothing is ever lost. - J
On Sat, May 13, 2006 at 11:45:57AM -0700, Judd Vinet <jvinet@zeroflux.org> wrote:
Looks good. I will commit it soon. Please continue on the i18n-ification if you have the time.
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_filediff;...; the 2 POTFILES.in http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; i18n init in pacman.c http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; autotools bits i'm not sure about if you want to merge the po4a patches (manpage localization) http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_filediff;...; we dropped the pacman.8.in -> pacman.8 generation in order to that. if you decide to do so, too then this is the patch to add po4a.cfg http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_filediff;...; Makefile update http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; po4a detection in configure.ac udv / greetings, VMiklos -- Developer of Frugalware Linux, to make things frugal - http://frugalware.org
Cheers! I've merged most of your first patch. A lot of the chunks didn't patch in cleanly, so it's mostly a manual process. Looks like the FW and Arch versions of pacman have diverged quite a bit. Hopefully we can get more of it merged down the road. - J On Sat, May 13, 2006 at 09:34:45PM +0200, VMiklos wrote:
On Sat, May 13, 2006 at 11:45:57AM -0700, Judd Vinet <jvinet@zeroflux.org> wrote:
Looks good. I will commit it soon. Please continue on the i18n-ification if you have the time.
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_filediff;...;
the 2 POTFILES.in
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...;
i18n init in pacman.c
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; autotools bits
i'm not sure about if you want to merge the po4a patches (manpage localization)
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_filediff;...;
we dropped the pacman.8.in -> pacman.8 generation in order to that. if you decide to do so, too then this is the patch to add po4a.cfg
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_filediff;...; Makefile update
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; po4a detection in configure.ac
udv / greetings, VMiklos
-- Developer of Frugalware Linux, to make things frugal - http://frugalware.org
_______________________________________________ pacman-dev mailing list pacman-dev@archlinux.org http://www.archlinux.org/mailman/listinfo/pacman-dev
These patches cause problems for me. See below. The paths generated in po/Makefile and po/POTFILES seem to be incorrect. Did I miss something? make[2]: Entering directory `/home/jvinet/pacman-lib/lib/libalpm' Making all in po make[3]: Entering directory `/home/jvinet/pacman-lib/lib/libalpm/po' make libalpm.pot-update make[4]: Entering directory `/home/jvinet/pacman-lib/lib/libalpm/po' make[4]: *** No rule to make target `../../../add.c', needed by `libalpm.pot-update'. Stop. make[4]: Leaving directory `/home/jvinet/pacman-lib/lib/libalpm/po' make[3]: *** [libalpm.pot] Error 2 - J On Sat, May 13, 2006 at 09:34:45PM +0200, VMiklos wrote:
On Sat, May 13, 2006 at 11:45:57AM -0700, Judd Vinet <jvinet@zeroflux.org> wrote:
Looks good. I will commit it soon. Please continue on the i18n-ification if you have the time.
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_filediff;...;
the 2 POTFILES.in
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...;
i18n init in pacman.c
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; autotools bits
i'm not sure about if you want to merge the po4a patches (manpage localization)
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_filediff;...;
we dropped the pacman.8.in -> pacman.8 generation in order to that. if you decide to do so, too then this is the patch to add po4a.cfg
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_filediff;...; Makefile update
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=plain_commitdif...; po4a detection in configure.ac
udv / greetings, VMiklos
-- Developer of Frugalware Linux, to make things frugal - http://frugalware.org
_______________________________________________ pacman-dev mailing list pacman-dev@archlinux.org http://www.archlinux.org/mailman/listinfo/pacman-dev
On Tue, May 30, 2006 at 11:44:40AM -0700, Judd Vinet <jvinet@zeroflux.org> wrote:
These patches cause problems for me. See below.
The paths generated in po/Makefile and po/POTFILES seem to be incorrect. Did I miss something?
make[2]: Entering directory `/home/jvinet/pacman-lib/lib/libalpm' Making all in po make[3]: Entering directory `/home/jvinet/pacman-lib/lib/libalpm/po' make libalpm.pot-update make[4]: Entering directory `/home/jvinet/pacman-lib/lib/libalpm/po' make[4]: *** No rule to make target `../../../add.c', needed by `libalpm.pot-update'. Stop. make[4]: Leaving directory `/home/jvinet/pacman-lib/lib/libalpm/po' make[3]: *** [libalpm.pot] Error 2
well, krix is the author of the automake stuff, so he's who could reply, but unfortunatelly he won't... automake does not support having po files in a dir != $(topsrcdir)/po a workaround would be to have a separete configure.ac for /src/pacman and /lib/libalpm, too. but this is ugly a better solution is what krix did, except that this way you need to generate the .pot file manually after sh autoclean.sh run "intltool-update --pot --gettext-package=pacman" in /src/pacman/po and it should be ok of course the same true for /lib/libalpm/po :) udv / greetings, VMiklos -- Developer of Frugalware Linux, to make things frugal - http://frugalware.org
On Wed, May 31, 2006 at 02:48:47PM +0200, VMiklos wrote:
a better solution is what krix did, except that this way you need to generate the .pot file manually
after sh autoclean.sh run "intltool-update --pot --gettext-package=pacman" in /src/pacman/po and it should be ok
Hmm, it still hates me... [jvinet@mars po]$ pwd /home/jvinet/pacman-lib/lib/libalpm/po [jvinet@mars po]$ intltool-update --pot --gettext-package=pacman ERROR: xgettext failed to generate PO template file because there is non-ASCII string marked for translation. Please make sure that all strings marked for translation are in uniform encoding (say UTF-8), then *prepend* the following line to POTFILES.in and rerun intltool-update: [encoding: UTF-8] Prepending that string changed nothing. - J
On Wed, May 31, 2006 at 10:08:56AM -0700, Judd Vinet <jvinet@zeroflux.org> wrote:
Hmm, it still hates me...
[jvinet@mars po]$ pwd /home/jvinet/pacman-lib/lib/libalpm/po [jvinet@mars po]$ intltool-update --pot --gettext-package=pacman ERROR: xgettext failed to generate PO template file because there is non-ASCII string marked for translation. Please make sure that all strings marked for translation are in uniform encoding (say UTF-8), then *prepend* the following line to POTFILES.in and rerun intltool-update:
[encoding: UTF-8]
Prepending that string changed nothing.
my bad, i thought Makevars is autogenerated. if you move away that file then it works ( did i mention i hate autotools? ;) ) udv / greetings, VMiklos -- Developer of Frugalware Linux, to make things frugal - http://frugalware.org
On Wed, May 31, 2006 at 08:32:06PM +0200, VMiklos wrote:
my bad, i thought Makevars is autogenerated. if you move away that file then it works
Ah, that's done it, thanks!
( did i mention i hate autotools? ;) )
Ugh, me too. I generated the .pot file properly, but I still get the same error when building: make[3]: Entering directory `/home/jvinet/pacman-lib/lib/libalpm/po' make .pot-update make[4]: Entering directory `/home/jvinet/pacman-lib/lib/libalpm/po' make[4]: *** No rule to make target `../../../add.c', needed by `.pot-update'. Stop. Looking at the po/POTFILES file generated by ./configure, it seems to be putting the wrong pathnames in: ../../../add.c \ ../../../alpm.c \ ../../../backup.c \ ../../../be_files.c \ etc. Do you guys have this problem with the FW pacman? I am no autotools genius. - J
On Wed, May 31, 2006 at 12:07:00PM -0700, Judd Vinet <jvinet@zeroflux.org> wrote:
I generated the .pot file properly, but I still get the same error when building:
if you mean file, not files then either libalpm.pot or pacman.pot is missing
Do you guys have this problem with the FW pacman? I am no autotools genius.
after doing an "rm lib/libalpm/po/libalpm.pot", i get this error, too. but by default not udv / greetings, VMiklos -- Developer of Frugalware Linux, to make things frugal - http://frugalware.org
On Wed, May 31, 2006 at 11:01:50PM +0200, VMiklos wrote:
after doing an "rm lib/libalpm/po/libalpm.pot", i get this error, too. but by default not
Hmm, both are there, but I still receive the error. [jvinet@mars pacman-lib]$ ls lib/libalpm/po/ LINGUAS Makefile.in Makevars.old POTFILES.in Makefile Makefile.in.in POTFILES libalpm.pot [jvinet@mars pacman-lib]$ ls src/pacman/po LINGUAS Makefile.in Makevars.old POTFILES.in Makefile Makefile.in.in POTFILES pacman.pot - J
On Wed, May 31, 2006 at 02:06:31PM -0700, Judd Vinet <jvinet@zeroflux.org> wrote:
Hmm, both are there, but I still receive the error.
[jvinet@mars pacman-lib]$ ls lib/libalpm/po/ LINGUAS Makefile.in Makevars.old POTFILES.in Makefile Makefile.in.in POTFILES libalpm.pot [jvinet@mars pacman-lib]$ ls src/pacman/po LINGUAS Makefile.in Makevars.old POTFILES.in Makefile Makefile.in.in POTFILES pacman.pot
i've removed all the .po files from our po dirs, so now i have this: $ ls lib/libalpm/po/ libalpm.pot LINGUAS Makefile Makefile.in Makefile.in.in Makevars POTFILES POTFILES.in stamp-po $ ls src/pacman/po LINGUAS Makefile Makefile.in Makefile.in.in Makevars pacman.pot POTFILES POTFILES.in stamp-po that stamp-po is the difference. the weird fact is that it should be generated by configure, since: 1) after autoclean.sh it isn't there 2) after autogen.sh it isn't there 3) after ./configure it's there maybe try to "touch lib/libalpm/po/stamp-po" manually, if that helps then we know the problem, just need to figure out why those files are not created :) udv / greetings, VMiklos -- Developer of Frugalware Linux, to make things frugal - http://frugalware.org
participants (2)
-
Judd Vinet
-
VMiklos