Le Mon, 17 Jun 2013 00:23:41 +0200, Thomas Funk <t.f...@web.de> a écrit :
> Dominique Michel wrote: > > PATCH COMMAND: patch -p1 -g0 -E --no-backup-if-mismatch < > > > '/var/lib/layman/test/x11-wm/fvwm/files/fvwm-menu-desktop-config.fpl.gettext.patch' > > > > ====================================================== > > checking file bin/fvwm-menu-desktop-config.fpl > > Hunk #2 FAILED at 48. > > Hunk #3 succeeded at 205 (offset 16 lines). > > Hunk #4 FAILED at 225. > > 2 out of 4 hunks FAILED > > > > I included the rej file. It is against the svn of today. Portage doesn't give rej file. I used patch -p0 < fvwm-menu-desktop-config.fpl.gettext.patch to get it. > I used your patch command and it worked on my machine with the latest > CVS update. But I copied fvwm-menu-desktop-config.fpl.in together with > the patch into a temp directory: > tf@t61:/media/daten/shared/sourcen/Fvwm/temp$ patch -p1 -g0 -E > --no-backup-if-mismatch < fvwm-menu-desktop-config.fpl.gettext.patch > can't find file to patch at input line 3 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |--- ../cvs/fvwm/bin/fvwm-menu-desktop-config.fpl.in 2012-07-28 > 20:20:30.000000000 +0200 > |+++ fvwm-menu-desktop-config.fpl 2013-06-15 17:41:33.654376217 > +0200 -------------------------- > File to patch: ./fvwm-menu-desktop-config.fpl.in > patching file ./fvwm-menu-desktop-config.fpl.in > > Also with the simpler command patch -p0: > tf@t61:/media/daten/shared/sourcen/Fvwm/temp$ patch -p0 > fvwm-menu-desktop-config.fpl.in > fvwm-menu-desktop-config.fpl.gettext.patch patching file > fvwm-menu-desktop-config.fpl.in I get the same result with your command. That's strange. I know portage want patch generated with "diff -u" Maybe this have to do not with portage, but with the patch version in gentoo. Akso, to get portage to work with the other patches, it was needed to edit them and remove the ../cvs in the path. It don't want relative path. > > If I diffing my version with the patched one no differences occur on > both patch tries. > > >> fvwm.pot: > >> - update to support translations for fvwm-menu-desktop and > >> fvwm-menu-desktop-config.fpl > >> > >> fvwm.de.po: > >> - update of the German translation > > > > The other patches are working fine. But I still doesn't get > > anything into Fvwm-Nightshade menu configurator: > > > > cut: champs et positions sont numérotés à partir de 1 > > which mean > > cut: fields and positions are numbered from 1 > What does fvwm-menu-desktop -v prints out? Also --version? > > I tested the changed fvwm-menu-desktop on Xubuntu 13.04 which > use python-xdg 0.25 and on my Mint LMDE which uses 0.19. > > What is your default Python version? Type 'python' in a terminal to > start the interactive python console. It is important that it is 2.x > because fvwm-menu-desktop isn't usable with Python 3.x. It work know. I removed ~/.fbwm-nightshade. Maybe something get screwed when it was not working. The .menu file was existing but was empty. Also, the default python version doesn't matter much on gentoo, because portage adjust the shebangs of all python files in its sandbox, that for them to use the correct version. It also install wrapper scripts sometime. It is a big mess when writing ebuilds, and a mess that change all the time, but the result work fine. BTW, I took a lock at the files in /etc/xdg/menus. They doesn't support the freedesktop additional categories. The freedesktop guys are amazing, they write a norm and don't respect it. Or I missed something, but the result is the generated menus in Fvwm-NightShade only use the main categories, which is a mess when you have a lot of apps in one category. Cheers, Dominique > > >> @Dominique: > >> Would you update the french translation file, please? > > > > It is join. > Thanks :) > Thomas > -- "We have the heroes we deserve."
