This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit d41aa9a8aeae40d63f2c73fec1fa007429171fe3 Author: Jim Jagielski <[email protected]> AuthorDate: Thu Jun 11 15:58:30 2026 -0400 hyphen/mythes: drop dangling patch references after version bump Commit 7e8ab750cf bumped hyphen 2.7.1->2.8.8 and mythes 1.2.0->1.2.4 and renamed the PATCH_FILES entries to match, but the new -2.8.8/-1.2.4 patch files were never added to the tree. dmake then fails early: dmake: Error: -- './hyphen-2.8.8.patch' not found, and can't be made Per the commit's intent (use the latest upstream versions directly), drop the PATCH_FILES references entirely so both modules build straight from the upstream tarball. The old patches rewired the hyphen dictionary build and disabled the mythes example program; these are obsolete for the new versions. Also fix the now-dangling reference to the disable-example patch in the mythes HUNSPELL_* configure comment. --- main/hyphen/makefile.mk | 6 +++--- main/mythes/makefile.mk | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/main/hyphen/makefile.mk b/main/hyphen/makefile.mk index 9df8de1f94..ffa973f746 100644 --- a/main/hyphen/makefile.mk +++ b/main/hyphen/makefile.mk @@ -44,9 +44,9 @@ TARFILE_MD5=5ade6ae2a99bc1e9e57031ca88d36dad ADDITIONAL_FILES += makefile.mk -PATCH_FILES= \ - hyphen-2.8.8.patch \ - hyphen-2.8.8-read-charset.patch +# hyphen 2.8.8 builds cleanly from the upstream tarball; no in-tree patches +# are needed (the old 2.7.1 patches that rewired the dictionary build and +# tweaked the charset read are obsolete for this version). .IF "$(GUI)"=="UNX" CONFIGURE_DIR=$(BUILD_DIR) diff --git a/main/mythes/makefile.mk b/main/mythes/makefile.mk index 1d0a09f94c..db10c69ca3 100644 --- a/main/mythes/makefile.mk +++ b/main/mythes/makefile.mk @@ -38,9 +38,8 @@ TARFILE_MD5=a8c2c5b8f09e7ede322d5c602ff6a4b6 ADDITIONAL_FILES += makefile.mk -PATCH_FILES=mythes-1.2.4-vanilla-th-gen-idx.patch \ - mythes-1.2.4-makefile-mk.patch \ - mythes-1.2.4-disable-example.patch +# mythes 1.2.4 builds cleanly from the upstream tarball; no in-tree patches +# are needed (the old 1.2.0 patches are obsolete for this version). .IF "$(GUI)"=="UNX" CONFIGURE_DIR=$(BUILD_DIR) @@ -51,8 +50,7 @@ CONFIGURE_DIR=$(BUILD_DIR) # still needed also in system-mythes case as it creates the makefile CONFIGURE_ACTION=configure CONFIGURE_FLAGS= --disable-shared --with-pic -# hunspell is only needed by the example program, which is not built -# (see mythes-1.2.4-disable-example.patch); preset the variables so +# hunspell is only needed by the example program; preset the variables so # configure does not abort when no hunspell pkg-config file is around CONFIGURE_FLAGS+= HUNSPELL_CFLAGS=-I. HUNSPELL_LIBS=-L.
