The diff fails on all po files, it's only me or does it happens to others?
Bye
En/na Klaus Schmidinger ha escrit:
On 08/19/07 16:54, Luca Olivetti wrote:
The diff fails on all po files, it's only me or does it happens to others?
You need to add '-p1' to the patch command.
Yes, I know that, it doesn't prompt me for the filename, but it just FAILS to patch (and stores the rejects).
Bye
On 08/19/07 17:12, Luca Olivetti wrote:
En/na Klaus Schmidinger ha escrit:
On 08/19/07 16:54, Luca Olivetti wrote:
The diff fails on all po files, it's only me or does it happens to others?
You need to add '-p1' to the patch command.
Yes, I know that, it doesn't prompt me for the filename, but it just FAILS to patch (and stores the rejects).
I explicitly tried it with the original 1.5.7, and it went through just fine.
Klaus
En/na Klaus Schmidinger ha escrit:
On 08/19/07 17:12, Luca Olivetti wrote:
En/na Klaus Schmidinger ha escrit:
On 08/19/07 16:54, Luca Olivetti wrote:
The diff fails on all po files, it's only me or does it happens to others?
You need to add '-p1' to the patch command.
Yes, I know that, it doesn't prompt me for the filename, but it just FAILS to patch (and stores the rejects).
I explicitly tried it with the original 1.5.7, and it went through just fine.
you're right, I tried the patch from 1.5.6->1.5.7->1.5.7 (since the last tarball I used was 1.5.3) and it worked. Oh, well, I'll just copy over the files.
Bye
En/na Luca Olivetti ha escrit:
En/na Klaus Schmidinger ha escrit:
On 08/19/07 16:54, Luca Olivetti wrote:
The diff fails on all po files, it's only me or does it happens to others?
You need to add '-p1' to the patch command.
Yes, I know that, it doesn't prompt me for the filename, but it just FAILS to patch (and stores the rejects).
The strange thing is that the context of the rejected hunks seems fine in the original file?!?
Bye
Luca Olivetti wrote:
The diff fails on all po files, it's only me or does it happens to others?
po files are a pain for diff-patches because they have lists of source code line numbers in the comments. If you've applied any other patch to the VDR sources, and did a recompile, then all your po files will have lots of changed line numbers.
Cheers,
Udo
En/na Udo Richter ha escrit:
Luca Olivetti wrote:
The diff fails on all po files, it's only me or does it happens to others?
po files are a pain for diff-patches because they have lists of source code line numbers in the comments. If you've applied any other patch to the VDR sources, and did a recompile, then all your po files will have lots of changed line numbers.
Ah, ok, that's surely it.
Bye
Udo Richter wrote:
Luca Olivetti wrote:
The diff fails on all po files, it's only me or does it happens to others?
po files are a pain for diff-patches because they have lists of source code line numbers in the comments. If you've applied any other patch to the VDR sources, and did a recompile, then all your po files will have lots of changed line numbers.
Maybe they should not be regenerated during compiling, but have a separate make target for that?
On 08/19/07 18:07, Anssi Hannula wrote:
Udo Richter wrote:
Luca Olivetti wrote:
The diff fails on all po files, it's only me or does it happens to others?
po files are a pain for diff-patches because they have lists of source code line numbers in the comments. If you've applied any other patch to the VDR sources, and did a recompile, then all your po files will have lots of changed line numbers.
Maybe they should not be regenerated during compiling, but have a separate make target for that?
Like this?
i18n: $(I18Nmo) @mkdir -p $(LOCALEDIR) for i in $(I18Ndirs); do\ mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\ cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr.mo;\ done
;-)
Klaus
Klaus Schmidinger wrote:
On 08/19/07 18:07, Anssi Hannula wrote:
Udo Richter wrote:
Luca Olivetti wrote:
The diff fails on all po files, it's only me or does it happens to others?
po files are a pain for diff-patches because they have lists of source code line numbers in the comments. If you've applied any other patch to the VDR sources, and did a recompile, then all your po files will have lots of changed line numbers.
Maybe they should not be regenerated during compiling, but have a separate make target for that?
Like this?
i18n: $(I18Nmo) @mkdir -p $(LOCALEDIR) for i in $(I18Ndirs); do\ mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\ cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr.mo;\ done
;-)
Not really. I mean't a separate target for running "xgettext" and "msgmerge", as they are only needed to be run by developers, and cause patch conflicts as Udo noted.
Only "msgfmt" and the copying of the files needs to be done when the user compiles VDR.
I checked few other random projects, and they use a make target "update-po" for running xgettext and msgmerge, which is not done by default.
-
Anssi Hannula -
Dave P -
Klaus Schmidinger -
Luca Olivetti -
Udo Richter