diff options
| author | dholland <dholland@pkgsrc.org> | 2012-06-28 05:24:22 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2012-06-28 05:24:22 +0000 |
| commit | 164ccfaaff30c516a7b505c0643add9b33e37fb3 (patch) | |
| tree | a6a48780f5d0c21257852274709639818db60280 | |
| parent | 472eb47fa00d8a67a9bd3e5277ac2023802b50b1 (diff) | |
| download | pkgsrc-164ccfaaff30c516a7b505c0643add9b33e37fb3.tar.gz | |
Fix build failure when time_t is 64 bits on a 32-bit machine.
| -rw-r--r-- | wm/blackbox70/distinfo | 3 | ||||
| -rw-r--r-- | wm/blackbox70/patches/patch-src-Toolbar.cc | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/wm/blackbox70/distinfo b/wm/blackbox70/distinfo index 3e4953e2359..f4ff7db4cd0 100644 --- a/wm/blackbox70/distinfo +++ b/wm/blackbox70/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2011/11/22 20:02:48 joerg Exp $ +$NetBSD: distinfo,v 1.5 2012/06/28 05:24:22 dholland Exp $ SHA1 (blackbox-0.70.1.tar.gz) = f0ab7e4b44ae6ee4c2a2136651afc567c47fe2cd RMD160 (blackbox-0.70.1.tar.gz) = ab80c43d42dbfac23c9f981885f25a42c66f51a6 @@ -11,5 +11,6 @@ SHA1 (patch-lib-Util.hh) = b0bbf923ee06d200666ce96b6bf5ad648b361fd8 SHA1 (patch-lib-XDG.cc) = 55422803fd20b8f100816a204de7af22f00ba51c SHA1 (patch-src-BlackboxResource.cc) = 66d022f7a91f2054c45c3f38a0fe98da4ddce3de SHA1 (patch-src-ScreenResource.cc) = ec09befadf9e92bd9e9543f7e9b472639bf6e8d5 +SHA1 (patch-src-Toolbar.cc) = 6f301302c3370b67feb22dc066ed4aac0624d23d SHA1 (patch-src-main.cc) = 1b004b5860473300afc02fa50d6fc89523ab1b59 SHA1 (patch-util-bsetroot.cc) = 87b3e5aab03facfce88286f25df14580c39582c6 diff --git a/wm/blackbox70/patches/patch-src-Toolbar.cc b/wm/blackbox70/patches/patch-src-Toolbar.cc new file mode 100644 index 00000000000..aae1fbc6722 --- /dev/null +++ b/wm/blackbox70/patches/patch-src-Toolbar.cc @@ -0,0 +1,18 @@ +$NetBSD: patch-src-Toolbar.cc,v 1.1 2012/06/28 05:24:22 dholland Exp $ + +Fix build failure when time_t is 64 bits on a 32-bit machine. + +--- src/Toolbar.cc~ 2005-04-12 07:38:00.000000000 +0000 ++++ src/Toolbar.cc +@@ -43,8 +43,10 @@ + long nextTimeout(int resolution) + { + timeval now; ++ int secs; + gettimeofday(&now, 0); +- return (std::max(1000l, ((((resolution - (now.tv_sec % resolution)) * 1000l)) ++ secs = now.tv_sec % resolution; ++ return (std::max(1000l, ((((resolution - secs) * 1000l)) + - (now.tv_usec / 1000l)))); + } + |