svn commit: r402631 - in head/x11-wm/blackbox: . files

[Michael Moll]

Author: mmoll
Date: Sun Nov 29 21:53:12 2015
New Revision: 402631
URL: https://svnweb.freebsd.org/changeset/ports/402631

Log:
  x11-wm/blackbox: fix build on arm
  
  PR:		200124
  Submitted by:	Mikael Urankar <mikael.urankar at gmail.com>
  Approved by:	maintainer (timeout)

Added:
  head/x11-wm/blackbox/files/extra-patch-src_Toolbar.cc   (contents, props changed)
Modified:
  head/x11-wm/blackbox/Makefile

Modified: head/x11-wm/blackbox/Makefile
==============================================================================
--- head/x11-wm/blackbox/Makefile	Sun Nov 29 21:22:21 2015	(r402630)
+++ head/x11-wm/blackbox/Makefile	Sun Nov 29 21:53:12 2015	(r402631)
@@ -24,6 +24,10 @@ TOOLS_ONLY_DESC=	Do not install window m
 
 .include <bsd.port.options.mk>
 
+.if ${ARCH} == "armv6" || ${ARCH} == "armv6hf"
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_Toolbar.cc
+.endif
+
 .if ${PORT_OPTIONS:MTOOLS_ONLY}
 PKGNAMESUFFIX=	-tools
 COMMENT+=	(tools only)

Added: head/x11-wm/blackbox/files/extra-patch-src_Toolbar.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/blackbox/files/extra-patch-src_Toolbar.cc	Sun Nov 29 21:53:12 2015	(r402631)
@@ -0,0 +1,11 @@
+--- src/Toolbar.cc.orig	2015-05-11 11:54:54 UTC
++++ src/Toolbar.cc
+@@ -44,7 +44,7 @@ long nextTimeout(int resolution)
+ {
+   timeval now;
+   gettimeofday(&now, 0);
+-  return (std::max(1000l, ((((resolution - (now.tv_sec % resolution)) * 1000l))
++  return (std::max(1000ll, ((((resolution - (now.tv_sec % resolution)) * 1000l))
+                            - (now.tv_usec / 1000l))));
+ }
+