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.

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

pingus’s picture

I 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

u4ikclmr’s picture

FileSize
10.12 KB

Open 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.

Jose Reyero’s picture

FileSize
10.45 KB

Ohh, 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...

miope’s picture

It 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!

wiksupport’s picture

I 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?

kennyg’s picture

Fails on 4.6.0 cvs:

[root@mybizguard modules]# patch -p0 < i18n_taxonomy_module.patch --verbose
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: taxonomy.module
|===================================================================
|RCS file: /var/cvs/mydrupal/modules/taxonomy.module,v
|retrieving revision 1.4
|diff -u -r1.4 taxonomy.module
|--- taxonomy.module    16 Apr 2005 14:08:14 -0000      1.4
|+++ taxonomy.module    16 Apr 2005 16:22:04 -0000
--------------------------
Patching file taxonomy.module using Plan A...
Hunk #1 succeeded at 110 (offset 11 lines).
Hunk #2 FAILED at 134.
Hunk #3 succeeded at 191.
Hunk #4 succeeded at 246 (offset 11 lines).
Hunk #5 succeeded at 246 with fuzz 1.
Hunk #6 succeeded at 473 (offset 52 lines).
Hunk #7 succeeded at 455 with fuzz 2.
Hunk #8 succeeded at 537 (offset 71 lines).
Hunk #9 succeeded at 481.
Hunk #10 succeeded at 670 (offset 129 lines).
Hunk #11 succeeded at 574.
Hunk #12 succeeded at 745 (offset 129 lines).
Hunk #13 succeeded at 720.
Hunk #14 succeeded at 1057 (offset 132 lines).
1 out of 14 hunks FAILED -- saving rejects to file taxonomy.module.rej
done
Jose Reyero’s picture

yesme’s picture

Dear 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,

Anonymous’s picture