mono-2.6.3 patches fail on Leopard

[matthewapeters@…]

sudo port install -d mono
--->  Computing dependencies for mono
--->  Applying patches to mono
Error: Target org.macports.patch returned: shell command " cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_devel_mono/work/mono-2.6.3" && /usr/bin/patch -p0 < '/opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/mono/files/patch-configure.diff'" returned error 1
Command output: patching file configure
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file configure.rej

Error: Status 1 encountered during processing.
Before reporting a bug, first run the command again with the -d flag to get complete output.

Contents of configure.rej:

  1 ***************$
  2 *** 18146,18154 ****$
  3   main ()$
  4   {$
  5   $
  6 -    void main () {$
  7      #if defined(ZLIB_VERNUM) && (ZLIB_VERNUM >= 0x1230)$
  8 -    }$
  9      #else$
 10      #error No good zlib found$
 11      #endif$
 12 --- 18146,18152 ----$
 13   main ()$
 14   {$
 15   $
 16      #if defined(ZLIB_VERNUM) && (ZLIB_VERNUM >= 0x1230)$
 17      #else$
 18      #error No good zlib found$
 19      #endif$

[jmroot (Joshua Root)]

Please remember to cc the maintainer.

[claes.mogren@…]

Fails for me too. Looks like the patch isn't needed any more.

[richbwood@…]

Fails for me too!

[ryandesign (Ryan Carsten Schmidt)]

The configure patch is not the problem. You didn't clean before running with the debug switch, so you're seeing an irrelevant error. The problem is the other Leopard-specific patches, which might need to be adjusted or removed, per comments in #24371:

--->  Applying /Volumes/data/macports/ports/devel/mono/files/patch-mono-mini-mini-x86.h.diff
DEBUG: Environment: MACOSX_DEPLOYMENT_TARGET='10.5'
DEBUG: Assembled command: 'cd "/mp/var/macports/build/_Volumes_data_macports_ports_devel_mono/work/mono-2.6.3" && /usr/bin/patch -p0'
patching file mono/mini/mini-x86.h
Hunk #1 FAILED at 152.
Hunk #2 FAILED at 162.
2 out of 2 hunks FAILED -- saving rejects to file mono/mini/mini-x86.h.rej
Error: Target org.macports.patch returned: shell command " cd "/mp/var/macports/build/_Volumes_data_macports_ports_devel_mono/work/mono-2.6.3" && /usr/bin/patch -p0 < '/Volumes/data/macports/ports/devel/mono/files/patch-mono-mini-mini-x86.h.diff'" returned error 1

[ryandesign (Ryan Carsten Schmidt)]

Jeremy H fixed the problems with the patches in #17996.