[23948] trunk/dports/devel/gnutls

[source_changes at macosforge.org]

Revision: 23948
          http://trac.macosforge.org/projects/macports/changeset/23948
Author:   pipping at macports.org
Date:     2007-04-13 00:09:14 -0700 (Fri, 13 Apr 2007)

Log Message:
-----------
 * add patches i forgot to commit with r23942 as part of #11671

Added Paths:
-----------
    trunk/dports/devel/gnutls/files/
    trunk/dports/devel/gnutls/files/patch-includes_gnutls_gnutlsxx.h
    trunk/dports/devel/gnutls/files/patch-lib_gnutlsxx.cpp

Added: trunk/dports/devel/gnutls/files/patch-includes_gnutls_gnutlsxx.h
===================================================================
--- trunk/dports/devel/gnutls/files/patch-includes_gnutls_gnutlsxx.h	                        (rev 0)
+++ trunk/dports/devel/gnutls/files/patch-includes_gnutls_gnutlsxx.h	2007-04-13 07:09:14 UTC (rev 23948)
@@ -0,0 +1,21 @@
+--- includes/gnutls/gnutlsxx.h	2006-08-07 22:40:23.000000000 +1000
++++ includes/gnutls/gnutlsxx.h	2007-01-25 20:40:43.000000000 +1100
+@@ -233,7 +233,17 @@
+ {
+     public:
+         credentials(gnutls_credentials_type_t t);
+-        credentials( credentials& c);
++#if defined(__APPLE__) || defined(__MACOS__)
++	/* FIXME: This #if is due to a compile bug in Mac OS X.  Give
++	   it some time and then remove this cruft.  See also
++	   lib/gnutlsxx.cpp. */
++	credentials( credentials& c) {
++	  type = c.type;
++	  set_ptr( c.ptr());
++	}
++#else
++	credentials( credentials& c);
++#endif
+         virtual ~credentials() { }
+         gnutls_credentials_type_t get_type() const;
+     protected:

Added: trunk/dports/devel/gnutls/files/patch-lib_gnutlsxx.cpp
===================================================================
--- trunk/dports/devel/gnutls/files/patch-lib_gnutlsxx.cpp	                        (rev 0)
+++ trunk/dports/devel/gnutls/files/patch-lib_gnutlsxx.cpp	2007-04-13 07:09:14 UTC (rev 23948)
@@ -0,0 +1,19 @@
+--- lib/gnutlsxx.cpp	2006-06-02 05:49:01.000000000 +1000
++++ lib/gnutlsxx.cpp	2007-01-25 20:40:26.000000000 +1100
+@@ -822,11 +822,16 @@
+ { 
+ }
+ 
++#if !(defined(__APPLE__) || defined(__MACOS__))
++/* FIXME: This #if is due to a compile bug in Mac OS X.  Give it some
++   time and then remove this cruft.  See also
++   includes/gnutls/gnutlsxx.h. */
+ credentials::credentials( credentials& c)
+ {
+     this->type = c.type;
+     this->set_ptr( c.ptr());
+ }
++#endif
+ 
+ gnutls_credentials_type_t credentials::get_type() const
+ { 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070413/909fd3fe/attachment.html