Fix build on NetBSD-4.99.7/amd64.

Fed upstream in http://bugzilla.gnome.org/show_bug.cgi?id=386990

3 files changed, 40 insertions, 12 deletions

diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index 3f6deab43ff..cd79701b360 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.14 2006/11/29 19:03:38 adam Exp $
+$NetBSD: distinfo,v 1.15 2006/12/26 11:05:56 wiz Exp $
 
 SHA1 (glibmm-2.12.3.tar.bz2) = 23ec4d10e265ac6fe218f13885469a327c0ecdb4
 RMD160 (glibmm-2.12.3.tar.bz2) = 3a18e94eb51289e55ad0a2c5be0b134a11c045bf
 Size (glibmm-2.12.3.tar.bz2) = 2407548 bytes
-SHA1 (patch-aa) = d352b3919cd69391f825bc42e128e8877ae439ce
+SHA1 (patch-aa) = 104df3732246838c18c2be93665ac15671da4af8
 SHA1 (patch-ab) = 0f1b4d0ed15f8edce8f116181a609369c7cd3a8a
+SHA1 (patch-ac) = e06a8801376a3e0e014f1dcd032d046a1161c82b
diff --git a/devel/glibmm/patches/patch-aa b/devel/glibmm/patches/patch-aa
index aa883111754..f8e94cca590 100644
--- a/devel/glibmm/patches/patch-aa
+++ b/devel/glibmm/patches/patch-aa
@@ -1,14 +1,20 @@
-$NetBSD: patch-aa,v 1.2 2006/11/11 20:12:24 adam Exp $
+$NetBSD: patch-aa,v 1.3 2006/12/26 11:05:56 wiz Exp $
 
---- glib/glibmm/date.h.orig	2006-10-16 11:26:32.000000000 +0200
-+++ glib/glibmm/date.h
-@@ -24,7 +24,9 @@
-  */
+--- glib/glibmm/date.cc.orig	2006-09-21 19:47:43.000000000 +0000
++++ glib/glibmm/date.cc
+@@ -78,13 +78,14 @@ void Date::set_time(GTime time)
+   //This method, and the C function that it wraps, are deprecated.
+   g_date_set_time(&gobject_, time);
+ }
+-#endif // GLIBMM_DISABLE_DEPRECATED
++#else
  
  
-+#if !defined(_LP64)
-   #undef G_DISABLE_DEPRECATED //So we can use deprecated functions in our deprecated methods.
-+#endif
-  
- #include <glibmm/ustring.h>
+ void Date::set_time(time_t timet)
+ {
+   g_date_set_time_t(&gobject_, timet);
+ }
++#endif // GLIBMM_DISABLE_DEPRECATED
  
+ void Date::set_time_current()
+ {
diff --git a/devel/glibmm/patches/patch-ac b/devel/glibmm/patches/patch-ac
new file mode 100644
index 00000000000..3c925fcd597
--- /dev/null
+++ b/devel/glibmm/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.1 2006/12/26 11:05:56 wiz Exp $
+
+--- glib/glibmm/date.h.orig	2006-09-21 19:47:43.000000000 +0000
++++ glib/glibmm/date.h
+@@ -128,7 +128,7 @@ enum DMY
+    * @deprecated Please use set_time(time_t) or set_time(const GTimeVal&).
+    */
+   void set_time(GTime time);
+-  #endif // GLIBMM_DISABLE_DEPRECATED
++  #else
+ 
+ 
+   /** Sets the value of a date from a <type>time_t</type> value. 
+@@ -140,6 +140,7 @@ enum DMY
+    * Since: 2.10
+    */
+   void set_time(time_t timet);
++  #endif // GLIBMM_DISABLE_DEPRECATED
+ 
+   /** Sets the value of a date from a GTimeVal value.  Note that the
+    * tv_usec member is ignored, because Glib::Date can't make use of the