head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2012.02.20.21.40.49;	author flo;	state dead;
branches;
next	1.1;

1.1
date	2012.01.31.21.51.27;	author flo;	state Exp;
branches;
next	;


desc
@@


1.2
log
@update to 3.13.2
@
text
@Taken from here:
https://bug702090.bugzilla.mozilla.org/attachment.cgi?id=575453

--- ../../security/nss/lib/util/pkcs11n.h.orig	2011-09-14 10:21:10.000000000 +0900
+++ ../../security/nss/lib/util/pkcs11n.h	2011-11-19 00:45:01.131860104 +0900
@@@@ -346,7 +346,7 @@@@
  * labels have never been accurate to what was really implemented.
  * The new labels correctly reflect what the values effectively mean.
  */
-#if __GNUC__ > 3
+#if defined(__GNUC__) && (__GNUC__ > 3)
 /* make GCC warn when we use these #defines */
 /*
  *  This is really painful because GCC doesn't allow us to mark random
@@@@ -362,7 +362,7 @@@@
  *  cast the resulting value to the deprecated type in the #define, thus
  *  producting the warning when the #define is used.
  */
-#if (__GNUC__  == 4) && (__GNUC_MINOR < 5)
+#if (__GNUC__  == 4) && (__GNUC_MINOR__ < 5)
 /* The mac doesn't like the friendlier deprecate messages. I'm assuming this
  * is a gcc version issue rather than mac or ppc specific */
 typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated));@


1.1
log
@add upstream patch, to fix "__GNUC_MINOR is not defined" build error that
causes some ports depending on nss to fail. e.g. net-im/pidgin-sipe.
The patch is taken from https://bugzilla.mozilla.org/show_bug.cgi?id=702090

This patch will be part of the next nss release and can be removed with the next
update.

PR:		ports/164655
PR:		ports/164391
Submitted by:	rm
@
text
@@

