When I apply the patch i18n_includes.patch it tells me:
$ patch -i ../modules/i18n/patches/i18n_includes.patch --verbose
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: bootstrap.inc
|===================================================================
|RCS file: /var/cvs/mydrupal/includes/bootstrap.inc,v
|retrieving revision 1.4
|diff -u -r1.4 bootstrap.inc
|--- bootstrap.inc 16 Apr 2005 14:08:12 -0000 1.4
|+++ bootstrap.inc 16 Apr 2005 16:04:29 -0000
--------------------------
Patching file bootstrap.inc using Plan A...
Hunk #1 succeeded at 152.
Hunk #2 succeeded at 170.
patch: **** malformed patch at line 175: + }
$
So it doesn't continue. I've tried making it work but patch does not cooperate. Would it be possible to supply a correct patch?
Thank you.
Comment | File | Size | Author |
---|---|---|---|
#3 | i18n_includes_460.patch | 10.45 KB | Jose Reyero |
#2 | i18n_includes.patch | 10.12 KB | u4ikclmr |
Comments
Comment #1
pingus CreditAttribution: pingus commentedI tried to patch the files, too, but got the same error message.
Used command within the include directory was:
$ patch --dry-run < ../modules/i18n/patches/i18n_includes.patch
patching file bootstrap.inc
patch: **** malformed patch at line 175: + }
Does anyone know how to patch the patchfile? Maybe I'm just missing the ultimate command line option?
Thanks in advance
Pingus
Comment #2
u4ikclmr CreditAttribution: u4ikclmr commentedOpen the i18n_includes.patch file and go to line #28 which reads:
@@ -634,6 +640,146 @@
Change the 146 to 150 so that it reads:
@@ -634,6 +640,150 @@
This worked for me and the file patched properly. For the time pressured, find a remplacement i18n_includes.patch attached.
Comment #3
Jose Reyero CreditAttribution: Jose Reyero commentedOhh, I hate patches :-(
Well, I do not use that 'patch' thing, but Eclipse, and all the patches work here. Anyway, I've done some clean up, got a 4.6.0 version, applied patches, re issued patches... Just some notes:
- Patches are Unified diff
- They're against 4.6.0
- I think they meet Drupal standards for patches: http://drupal.org/patch
Please, someone try this new one and let me know whether it works, so I include it with the module...
Comment #4
miope CreditAttribution: miope commentedIt works, gracias José. Only one detail:
$ patch -p0 < i18n_includes_460.patch
(Stripping trailing CRs from patch.)
patching file bootstrap.inc
(Stripping trailing CRs from patch.)
patching file common.inc
It seems that the patch is in windows/dos format. Maybe you could remove the trailing CRs:
$ dos2unix i18n_includes_460.patch
$ patch -p0 < i18n_includes_460.patch
patching file bootstrap.inc
patching file common.inc
Thanks again!
Comment #5
wiksupport CreditAttribution: wiksupport commentedI think everyone would benefit if this updated patch was added to the original module dowload so everyone doesn't have to struggle with it until they find this new version. Is there something I can do to make this happen or does it need to be done by Jose?
Comment #6
kennyg CreditAttribution: kennyg commentedFails on 4.6.0 cvs:
Comment #7
Jose Reyero CreditAttribution: Jose Reyero commentedComment #8
yesme CreditAttribution: yesme commentedDear all,
Could anybody can patch the boostrap.inc, common.inc, and the taxonomy.module of the Drupal 4.6.0 and send all these patched files to me.
I use Windows XP and my site on a friend's server. I don't know how to patch in my case.
Thanks a lot,
Comment #9
(not verified) CreditAttribution: commented