Index: branches/2020Q4/security/py-python-nss/files/patch-src_py__nss.h
===================================================================
--- branches/2020Q4/security/py-python-nss/files/patch-src_py__nss.h	(nonexistent)
+++ branches/2020Q4/security/py-python-nss/files/patch-src_py__nss.h	(revision 552573)
@@ -0,0 +1,36 @@
+Rename structs to avoid conflict with C API after NSS 3.58 changes to pk11pub.h
+https://hg.mozilla.org/projects/nss/rev/6e3bc17f0508
+
+In file included from src/py_nss.c:341:
+src/py_nss.h:126:3: error: typedef redefinition with different types ('struct RSAPublicKey' vs 'struct RSAPublicKeyStr')
+} RSAPublicKey;
+  ^
+/usr/local/include/nss/blapit.h:281:32: note: previous definition is here
+typedef struct RSAPublicKeyStr RSAPublicKey;
+                               ^
+In file included from src/py_nss.c:341:
+src/py_nss.h:136:3: error: typedef redefinition with different types ('struct DSAPublicKey' vs 'struct DSAPublicKeyStr')
+} DSAPublicKey;
+  ^
+/usr/local/include/nss/blapit.h:323:32: note: previous definition is here
+typedef struct DSAPublicKeyStr DSAPublicKey;
+                               ^
+
+--- src/py_nss.h.orig	2016-02-16 16:40:14 UTC
++++ src/py_nss.h
+@@ -119,6 +119,7 @@ typedef struct {
+ /* ============================ RSAPublicKey Class ========================== */
+ /* ========================================================================== */
+ 
++#define RSAPublicKey PyRSAPublicKey
+ typedef struct {
+     PyObject_HEAD
+     PyObject *py_modulus;
+@@ -129,6 +130,7 @@ typedef struct {
+ /* ============================ DSAPublicKey Class ========================== */
+ /* ========================================================================== */
+ 
++#define DSAPublicKey PyDSAPublicKey
+ typedef struct {
+     PyObject_HEAD
+     PyObject *py_pqg_params;

Property changes on: branches/2020Q4/security/py-python-nss/files/patch-src_py__nss.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 552572)
+++ branches/2020Q4	(revision 552573)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r552572