diff options
| author | Patrick Luby <plubius@neooffice.org> | 2023-07-14 17:32:37 -0400 |
|---|---|---|
| committer | Patrick Luby <plubius@neooffice.org> | 2023-07-15 02:25:39 +0200 |
| commit | 693411e60c6bbd1c2ef25490cc3902f6b2461682 (patch) | |
| tree | f37df15c1f0921de9bfeb38c95ab2369e56e15bd | |
| parent | e4ae409b8e57f5efe53af7bacd08b0d226a0d96f (diff) | |
Related tdf#155125: add MacPorts to GPG's fallback search on macOS
Change-Id: I52a5031b531dc542b2eea72191a1c240f78820bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154474
Tested-by: Jenkins
Reviewed-by: Patrick Luby <plubius@neooffice.org>
| -rw-r--r-- | external/gpgmepp/UnpackedTarball_gpgmepp.mk | 1 | ||||
| -rw-r--r-- | external/gpgmepp/macos-macports-path.patch | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk b/external/gpgmepp/UnpackedTarball_gpgmepp.mk index d1b8dfae32eb..d7b7a8ab4dbe 100644 --- a/external/gpgmepp/UnpackedTarball_gpgmepp.mk +++ b/external/gpgmepp/UnpackedTarball_gpgmepp.mk @@ -33,5 +33,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \ external/gpgmepp/configure.patch \ external/gpgmepp/w32-include.patch \ external/gpgmepp/Wincompatible-function-pointer-types.patch \ + external/gpgmepp/macos-macports-path.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/gpgmepp/macos-macports-path.patch b/external/gpgmepp/macos-macports-path.patch new file mode 100644 index 000000000000..de7e8f68e69f --- /dev/null +++ b/external/gpgmepp/macos-macports-path.patch @@ -0,0 +1,11 @@ +--- src/posix-util.c 2023-04-20 07:35:50.000000000 -0400 ++++ src/posix-util.c 2023-07-14 17:28:21.000000000 -0400 +@@ -145,7 +145,7 @@ + the browser interface we should look into some additional + fallback paths. */ + const char *additional_path +- = "/usr/local/bin:/usr/local/MacGPG2/bin:/opt/homebrew/bin"; ++ = "/usr/local/bin:/usr/local/MacGPG2/bin:/opt/homebrew/bin:/opt/local/bin"; + if (!ret) + { + ret = walk_path_str (additional_path, pgm); |