diff options
| author | dholland <dholland> | 2012-05-07 01:41:44 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2012-05-07 01:41:44 +0000 |
| commit | f43c47166f9cf7aa6bc7933084e9b00e58a1511b (patch) | |
| tree | 02bdf4b5929b5f943a3b0a773d33bb0633c37d23 /x11 | |
| parent | c725cacb07a6cd0a1403c54fd44848375afc6c8c (diff) | |
| download | pkgsrc-f43c47166f9cf7aa6bc7933084e9b00e58a1511b.tar.gz | |
Build fixes for the new glib2. And, while here, fix incorrect time_t cast
in patch-aa.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gtkmm-utils/distinfo | 5 | ||||
| -rw-r--r-- | x11/gtkmm-utils/patches/patch-aa | 23 | ||||
| -rw-r--r-- | x11/gtkmm-utils/patches/patch-glibmm-utils_ustring_cc | 16 |
3 files changed, 38 insertions, 6 deletions
diff --git a/x11/gtkmm-utils/distinfo b/x11/gtkmm-utils/distinfo index 9ea30f2b67d..bf1ea89d94a 100644 --- a/x11/gtkmm-utils/distinfo +++ b/x11/gtkmm-utils/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/04/30 10:17:46 wiz Exp $ +$NetBSD: distinfo,v 1.2 2012/05/07 01:41:44 dholland Exp $ SHA1 (gtkmm-utils-0.4.1.tar.gz) = dbf1af7f0ee27c380786651591ef83549ce97ca0 RMD160 (gtkmm-utils-0.4.1.tar.gz) = 1db5390fc26f0f55fa19511e63b9d4ea6edb7250 Size (gtkmm-utils-0.4.1.tar.gz) = 388799 bytes -SHA1 (patch-aa) = cd31f835896047fa8cf964759b0dfa249b89ea40 +SHA1 (patch-aa) = 6bcc502c2901da1b468d9b9cb5d02f0d426828d6 SHA1 (patch-ab) = 1ac7b0b9cf87176264d12711b7e57f26fff30adf SHA1 (patch-ac) = 81d58f752d8cc0383b9c3d532360e2cc7426ea01 +SHA1 (patch-glibmm-utils_ustring_cc) = fe4d4ca52ea15b3e7619da072faf4e0becc20260 diff --git a/x11/gtkmm-utils/patches/patch-aa b/x11/gtkmm-utils/patches/patch-aa index 75e825daeab..a0bfe53d5b6 100644 --- a/x11/gtkmm-utils/patches/patch-aa +++ b/x11/gtkmm-utils/patches/patch-aa @@ -1,13 +1,28 @@ -$NetBSD: patch-aa,v 1.1.1.1 2010/04/30 10:17:46 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2012/05/07 01:41:44 dholland Exp $ ---- glibmm-utils/date.cc.orig 2008-01-16 18:22:26.000000000 +0100 +- fix build with latest glib2 +- use time_t correctly + +--- glibmm-utils/date.cc.orig 2008-01-16 17:22:26.000000000 +0000 +++ glibmm-utils/date.cc -@@ -50,7 +50,7 @@ get_current_daytime_generic(Glib::ustrin +@@ -25,7 +25,7 @@ + + #include <sys/time.h> + +-#include <glib/gmessages.h> ++#include <glib.h> + + #include <glibmm/convert.h> + #include <glibmm/date.h> +@@ -50,7 +50,10 @@ get_current_daytime_generic(Glib::ustrin // Obtain the time of day, and convert it to a tm struct. gettimeofday(&tv, NULL); - ptm = localtime(&tv.tv_sec); -+ ptm = localtime((time_t *)&tv.tv_sec); ++ { ++ time_t thetime = tv.tv_sec; ++ ptm = localtime(&thetime); ++ } strftime(time_string, sizeof (time_string), format, ptm); diff --git a/x11/gtkmm-utils/patches/patch-glibmm-utils_ustring_cc b/x11/gtkmm-utils/patches/patch-glibmm-utils_ustring_cc new file mode 100644 index 00000000000..5519ea30101 --- /dev/null +++ b/x11/gtkmm-utils/patches/patch-glibmm-utils_ustring_cc @@ -0,0 +1,16 @@ +$NetBSD: patch-glibmm-utils_ustring_cc,v 1.1 2012/05/07 01:41:44 dholland Exp $ + +Fix build with latest glib2. + +--- glibmm-utils/ustring.cc~ 2008-06-19 13:12:29.000000000 +0000 ++++ glibmm-utils/ustring.cc +@@ -20,8 +20,7 @@ + */ + + #include <cstring> // for g++ 4.3 +-#include <glib/gmem.h> +-#include <glib/gmessages.h> ++#include <glib.h> + #include "ustring.h" + + namespace Glib { |