diff options
| author | mmoll <mmoll@FreeBSD.org> | 2015-11-30 05:53:12 +0800 |
|---|---|---|
| committer | mmoll <mmoll@FreeBSD.org> | 2015-11-30 05:53:12 +0800 |
| commit | 20fdc8b9dd6c09b05afdfb49f886849034c74920 (patch) | |
| tree | ac2aa9dd7d6acc81f3f039ac28a0f5a7dfb841aa /x11-wm | |
| parent | 896744125b30c6937f2c603c5ccf9e26be0af476 (diff) | |
| download | freebsd-ports-gnome-20fdc8b9dd6c09b05afdfb49f886849034c74920.tar.gz freebsd-ports-gnome-20fdc8b9dd6c09b05afdfb49f886849034c74920.tar.zst freebsd-ports-gnome-20fdc8b9dd6c09b05afdfb49f886849034c74920.zip | |
x11-wm/blackbox: fix build on arm
PR: 200124
Submitted by: Mikael Urankar <mikael.urankar@gmail.com>
Approved by: maintainer (timeout)
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/blackbox/Makefile | 4 | ||||
| -rw-r--r-- | x11-wm/blackbox/files/extra-patch-src_Toolbar.cc | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile index 9a737c36bb6c..849b0a9b27c9 100644 --- a/x11-wm/blackbox/Makefile +++ b/x11-wm/blackbox/Makefile @@ -24,6 +24,10 @@ TOOLS_ONLY_DESC= Do not install window manager, only tools .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) diff --git a/x11-wm/blackbox/files/extra-patch-src_Toolbar.cc b/x11-wm/blackbox/files/extra-patch-src_Toolbar.cc new file mode 100644 index 000000000000..a28ee9cfe505 --- /dev/null +++ b/x11-wm/blackbox/files/extra-patch-src_Toolbar.cc @@ -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)))); + } + |