summaryrefslogtreecommitdiff
path: root/devel/glibmm/patches
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2006-12-26 11:05:56 +0000
committerwiz <wiz@pkgsrc.org>2006-12-26 11:05:56 +0000
commitd2b3046a17d6223d34a4044fea337dd55906f6a3 (patch)
tree0a66a23a16af3d0eb609e389219d8cedb1718ec9 /devel/glibmm/patches
parentb4beb4c5528e4343eb4d0dfb2e436430922cd401 (diff)
downloadpkgsrc-d2b3046a17d6223d34a4044fea337dd55906f6a3.tar.gz
Fix build on NetBSD-4.99.7/amd64.
Fed upstream in http://bugzilla.gnome.org/show_bug.cgi?id=386990
Diffstat (limited to 'devel/glibmm/patches')
-rw-r--r--devel/glibmm/patches/patch-aa26
-rw-r--r--devel/glibmm/patches/patch-ac21
2 files changed, 37 insertions, 10 deletions
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