[Midnightbsd-cvs] [MidnightBSD/mports] 06bc47: editors/openoffice-4: Fix malformed patch files fo...

[Lucas Holt]

  Branch: refs/heads/master
  Home:   https://github.com/MidnightBSD/mports
  Commit: 06bc47829920a9080a28845981ae2344ddd66389
      https://github.com/MidnightBSD/mports/commit/06bc47829920a9080a28845981ae2344ddd66389
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2026-05-05 (Tue, 05 May 2026)

  Changed paths:
    M editors/openoffice-4/files/icu-midnightbsd.patch
    M editors/openoffice-4/files/patch-unoxml_source_xpath_xpathapi.cxx
    M editors/openoffice-4/files/python-midnightbsd.patch
    M editors/openoffice-4/files/xmlsec-midnightbsd.patch

  Log Message:
  -----------
  editors/openoffice-4: Fix malformed patch files for clean builds

All four patches had incorrect unified diff hunk counts or missing
context lines, causing gpatch to fail with "malformed patch" errors
on a clean build (they were never exercised from scratch as the
previous build reused an existing work directory).

- patch-unoxml_source_xpath_xpathapi.cxx: add missing first context
  line to each hunk (both hunks lacked one before-context line)
- python-midnightbsd.patch: rewrite with correct hunk counts and
  complete 3-line context for all configure hunks; fix LDLIBRARY hunk
  start line (5481 not 5485); fix config.guess new count (16 not 17)
- icu-midnightbsd.patch: fix hunk start line (778 not 779) and
  correct orig/new counts (3/11 not 6/16)
- xmlsec-midnightbsd.patch: fix hunk start line (793 not 787) and
  correct new count (17 not 18)

AI-Assisted-by: Claude Sonnet 4.6 <noreply at anthropic.com>
Signed-off-by: Lucas Holt <luke at foolishgames.com>


  Commit: f6889879e1c1c3b9469e75e8dcc55d66da0eafdb
      https://github.com/MidnightBSD/mports/commit/f6889879e1c1c3b9469e75e8dcc55d66da0eafdb
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2026-05-05 (Tue, 05 May 2026)

  Changed paths:
    M editors/openoffice-4/Makefile
    A editors/openoffice-4/files/patch-libxmlsec_makefile.mk

  Log Message:
  -----------
  editors/openoffice-4: Fix xmlsec1 config.guess not applied on clean build

The post-patch hook was appending xmlsec-midnightbsd.patch to
xmlsec1-update-config-sub-and-guess.patch, but that file is not listed
in PATCH_FILES in libxmlsec/makefile.mk so it was never applied during
the build.  xmlsec1's ./configure then failed with "cannot guess build
type" on MidnightBSD.

Fix: add patch-libxmlsec_makefile.mk to insert xmlsec1-midnightbsd.patch
into PATCH_FILES.  Update the post-patch hook to copy the standalone
patch file into the libxmlsec module directory (where PATCH_FILES expects
it) instead of appending to the unused update-config-sub-and-guess file.

AI-Assisted-by: Claude Sonnet 4.6 <noreply at anthropic.com>
Signed-off-by: Lucas Holt <luke at foolishgames.com>


Compare: https://github.com/MidnightBSD/mports/compare/db5d03e8431a...f6889879e1c1

To unsubscribe from these emails, change your notification settings at https://github.com/MidnightBSD/mports/settings/notifications