diff options
| author | Patrick Luby <plubius@neooffice.org> | 2023-07-14 17:32:37 -0400 |
|---|---|---|
| committer | Patrick Luby <plubius@neooffice.org> | 2023-07-19 14:15:55 +0200 |
| commit | 28d736113317da3e6373f27d6ce5d75fd40d68e2 (patch) | |
| tree | b064b78476d2b00a5e30b15255e42e79c4c9444d | |
| parent | fdcd9ad20eda56d6532f21bbb302fc0c3ab63020 (diff) | |
Related tdf#155125: add MacPorts to GPG's fallback search on macOS
Change-Id: I52a5031b531dc542b2eea72191a1c240f78820bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154457
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 | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk b/external/gpgmepp/UnpackedTarball_gpgmepp.mk index be2b616d1268..f2dd62cefe89 100644 --- a/external/gpgmepp/UnpackedTarball_gpgmepp.mk +++ b/external/gpgmepp/UnpackedTarball_gpgmepp.mk @@ -36,5 +36,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \ external/gpgmepp/Wincompatible-function-pointer-types.patch \ external/gpgmepp/0001-cpp-Fix-building-with-C-11.patch.1 \ external/gpgmepp/macos-include.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..dbc757b741b4 --- /dev/null +++ b/external/gpgmepp/macos-macports-path.patch @@ -0,0 +1,12 @@ +--- src/posix-util.c 2020-07-15 06:14:17.000000000 -0400 ++++ src/posix-util.c 2023-07-14 19:09:58.000000000 -0400 +@@ -135,7 +135,8 @@ + /* On apple, especially when started through gpgme-json via + the browser interface we should look into some additional + fallback paths. */ +- const char *additional_path = "/usr/local/bin:/usr/local/MacGPG2/bin"; ++ const char *additional_path ++ = "/usr/local/bin:/usr/local/MacGPG2/bin:/opt/homebrew/bin:/opt/local/bin"; + if (!ret) + { + ret = walk_path_str (additional_path, pgm); |