external/nss/nss-ios.patch |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

New commits:
commit f2f320b98bc0a8c377a0f4ba66bb6938f9fad4a6
Author:     Michael Stahl <[email protected]>
AuthorDate: Thu Nov 6 20:07:56 2025 +0100
Commit:     Michael Stahl <[email protected]>
CommitDate: Mon Nov 10 17:56:36 2025 +0100

    nss: try to unbreak iOS build
    
    (regression from commit e39a1baeb4441e1736022a7fd07668bd5db2cb6e)
    
    Change-Id: I8955f772dd2ccb9d66142115f2c9a2aafc06d8f3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193559
    Reviewed-by: Michael Stahl <[email protected]>
    Tested-by: Jenkins

diff --git a/external/nss/nss-ios.patch b/external/nss/nss-ios.patch
index f52c588f859e..8f2b7bee5e61 100644
--- a/external/nss/nss-ios.patch
+++ b/external/nss/nss-ios.patch
@@ -58,6 +58,15 @@
  
 --- a/a/nss/lib/pk11wrap/pk11load.c
 +++ a/a/nss/lib/pk11wrap/pk11load.c
+@@ -31,6 +31,8 @@
+ #include "debug_module.c"
+ #endif
+ 
++extern CK_RV NSSCKBI_C_GetFunctionList();
++
+ /* build the PKCS #11 2.01 lock files */
+ CK_RV PR_CALLBACK
+ secmodCreateMutext(CK_VOID_PTR_PTR pmutex)
 @@ -456,6 +456,7 @@
  /* load the library. If this succeeds, then we have to remember to
   * unload the library if anything goes wrong from here on out...
@@ -91,16 +100,6 @@
      return SECFailure;
  }
  
-@@ -656,6 +664,8 @@
- /*
-  * load a new module into our address space and initialize it.
-  */
-+extern CK_RV NSSCKBI_C_GetFunctionList();
-+
- SECStatus
- secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule)
- {
-
 --- a/a/nss/lib/ckfw/nssck.api
 +++ a/a/nss/lib/ckfw/nssck.api
 @@ -1842,7 +1842,11 @@

Reply via email to