From owner-svn-ports-all@freebsd.org  Mon Nov 30 02:21:43 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E35DDA33AAA;
 Mon, 30 Nov 2015 02:21:43 +0000 (UTC)
 (envelope-from danfe@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id CF9CB10F3;
 Mon, 30 Nov 2015 02:21:43 +0000 (UTC)
 (envelope-from danfe@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1033)
 id CD5191D5B; Mon, 30 Nov 2015 02:21:43 +0000 (UTC)
Date: Mon, 30 Nov 2015 02:21:43 +0000
From: Alexey Dokuchaev <danfe@FreeBSD.org>
To: Michael Moll <mmoll@FreeBSD.org>
Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: Re: svn commit: r402631 - in head/x11-wm/blackbox: . files
Message-ID: <20151130022143.GA73549@FreeBSD.org>
References: <201511292153.tATLrDbl045927@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201511292153.tATLrDbl045927@repo.freebsd.org>
User-Agent: Mutt/1.5.24 (2015-08-30)
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Nov 2015 02:21:44 -0000

On Sun, Nov 29, 2015 at 09:53:13PM +0000, Michael Moll wrote:
> New Revision: 402631
> URL: https://svnweb.freebsd.org/changeset/ports/402631
> 
> Log:
>   x11-wm/blackbox: fix build on arm

Can you explain what exactly was wrong and how this fix addresses the
problem?

> +.if ${ARCH} == "armv6" || ${ARCH} == "armv6hf"
> +EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_Toolbar.cc
> +.endif

Oh gosh this is so ugly. :(

> +--- 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))

Can we just make this code portable across the gang instead of having
per-architecture EXTRA_PATCHES?

./danfe