Opened 5 years ago

Closed 5 years ago

Last modified 5 years ago

#58523 closed defect (fixed)

libiconv +cp932fix fails in patch phase

Reported by: MarcusCalhoun-Lopez (Marcus Calhoun-Lopez) Owned by: ryandesign (Ryan Carsten Schmidt)
Priority: Normal Milestone:
Component: ports Version:
Keywords: Cc: chrstphrchvz (Christopher Chavez)
Port: libiconv

Description (last modified by ryandesign (Ryan Carsten Schmidt))

The recent update to libiconv, from a pull request, seems to have broken libiconv +cp932fix. The patchfile no longer applies.

Change History (7)

comment:1 Changed 5 years ago by chrstphrchvz (Christopher Chavez)

I did not try compiling the +cp932fix variant, so I did not notice this issue earlier.

I believe this is the upstream change in 1.16 that broke the patch: https://git.savannah.gnu.org/cgit/libiconv.git/commit/tests/Makefile.in?id=1badfd5d85cedfe06a2d8262f0ae91b121e86fa5

Since the patch is not in macports-ports, how should this be resolved? The patch is from over 12 years ago ([2f85b61c43/macports-ports]), is it still needed?

comment:2 Changed 5 years ago by ryandesign (Ryan Carsten Schmidt)

Description: modified (diff)

comment:3 in reply to:  1 Changed 5 years ago by ryandesign (Ryan Carsten Schmidt)

Replying to chrstphrchvz:

Since the patch is not in macports-ports, how should this be resolved?

See #36921 for an example of how I solved a similar problem with the suhosin variant/patch in the php port.

comment:4 Changed 5 years ago by MarcusCalhoun-Lopez (Marcus Calhoun-Lopez)

I have opened a pull request to remove the cp932fix variant.

comment:5 Changed 5 years ago by MarcusCalhoun-Lopez (Marcus Calhoun-Lopez)

Resolution: fixed
Status: assignedclosed

In 0e53304b6930f96bbb89bee1eef0e525bb9192e0/macports-ports (master):

libiconv: remove cp932fix variant

The cp932fix patch is quite old and no longer applies.
Fixes #58523

comment:6 Changed 5 years ago by ryandesign (Ryan Carsten Schmidt)

In 7bf3e59a0347141083c6c10312c85e76c82dd48c/macports-ports (master):

libiconv: Remove stray backslash and patch_sites

Both were leftover after removing the cp932fix variant.

See: #58523

comment:7 Changed 5 years ago by ryandesign (Ryan Carsten Schmidt)

In ccdb2539719d5d9eef5ef4b3adbdb82dc01a9af7/macports-ports (master):

libiconv: No longer use -p1 for patches

This is no longer needed now that the cp932fix patch is gone.

See: #58523

Note: See TracTickets for help on using tickets.