From 228799774fdce134198de65181d9b9710d2d6be4 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 16 Jul 2026 12:47:54 -0400 Subject: [PATCH] Sign both per-arch JNA .jnilibs in LibreOffice plugin during Mac build JNA 5.x ships per-architecture macOS native libraries instead of a single com/sun/jna/darwin/ directory, so the notarization re-signing step failed with "filename not matched". This step can be removed entirely once the plugin ships a jna.jar without the macOS natives, which are never loaded. --- app/build.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/build.sh b/app/build.sh index ff1e862e16..e391af1528 100755 --- a/app/build.sh +++ b/app/build.sh @@ -773,14 +773,17 @@ if [ $BUILD_MAC == 1 ]; then # Sign .jnilib (Java native shared library) within LibreOffice extension, since notarization # started failing without this. The .jnilib is within a .jar within the .oxt, so we have to - # extract both, sign the library, and then update each ZIP. + # extract both, sign the libraries, and then update each ZIP. + # + # TODO: Remove this block once the plugin ships a jna.jar without the macOS native + # libraries, which are never loaded (JNA is used only on Windows) pushd "$BUILD_DIR" mkdir libreoffice-repack cd libreoffice-repack unzip -q "$APPDIR/Contents/Resources/integration/libreoffice/Zotero_LibreOffice_Integration.oxt" external_jars/jna.jar - unzip -q external_jars/jna.jar com/sun/jna/darwin/libjnidispatch.jnilib - /usr/bin/codesign --force --options runtime --sign "$DEVELOPER_ID" com/sun/jna/darwin/libjnidispatch.jnilib - zip -u external_jars/jna.jar com/sun/jna/darwin/libjnidispatch.jnilib + unzip -q external_jars/jna.jar 'com/sun/jna/darwin*/libjnidispatch.jnilib' + /usr/bin/codesign --force --options runtime --sign "$DEVELOPER_ID" com/sun/jna/darwin*/libjnidispatch.jnilib + zip -u external_jars/jna.jar com/sun/jna/darwin*/libjnidispatch.jnilib zip -u "$APPDIR/Contents/Resources/integration/libreoffice/Zotero_LibreOffice_Integration.oxt" external_jars/jna.jar cd .. rm -rf libreoffice-repack