From owner-svn-ports-all@freebsd.org Thu Dec 28 14:30:24 2017 Return-Path: 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 E4A88EA1A77; Thu, 28 Dec 2017 14:30:24 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AE79C7D795; Thu, 28 Dec 2017 14:30:24 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBSEUNfv047999; Thu, 28 Dec 2017 14:30:23 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBSEUNe7047997; Thu, 28 Dec 2017 14:30:23 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201712281430.vBSEUNe7047997@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 28 Dec 2017 14:30:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457462 - in head/x11/hsetroot: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/x11/hsetroot: . files X-SVN-Commit-Revision: 457462 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Dec 2017 14:30:25 -0000 Author: danfe Date: Thu Dec 28 14:30:23 2017 New Revision: 457462 URL: https://svnweb.freebsd.org/changeset/ports/457462 Log: Unbreak the build (at least) on powerpc, powerpc64, sparc64, by moving the `for' loop initial declaration variable outside; this was upsetting C99: hsetroot.c: In function 'load_image': hsetroot.c:196: error: 'for' loop initial declaration used outside C99 mode Tested on: powerpc, sparc64 Modified: head/x11/hsetroot/Makefile head/x11/hsetroot/files/patch-hsetroot.c Modified: head/x11/hsetroot/Makefile ============================================================================== --- head/x11/hsetroot/Makefile Thu Dec 28 14:28:38 2017 (r457461) +++ head/x11/hsetroot/Makefile Thu Dec 28 14:30:23 2017 (r457462) @@ -13,8 +13,6 @@ LICENSE= GPLv2 LIB_DEPENDS= libImlib2.so:graphics/imlib2 -BROKEN_powerpc64= fails to compile: hsetroot.c: error: 'for' loop initial declaration used outside C99 mode - USE_GITHUB= yes GH_ACCOUNT= himdel GH_TAGNAME= 47d887b Modified: head/x11/hsetroot/files/patch-hsetroot.c ============================================================================== --- head/x11/hsetroot/files/patch-hsetroot.c Thu Dec 28 14:28:38 2017 (r457461) +++ head/x11/hsetroot/files/patch-hsetroot.c Thu Dec 28 14:30:23 2017 (r457462) @@ -17,6 +17,24 @@ " -tile Render an image tiled\n" " -full Render an image maximum aspect\n" " -extend Render an image max aspect and fill borders\n" +@@ -165,7 +166,7 @@ parse_color(char *arg, PColor c, int a) + int + load_image(ImageMode mode, const char *arg, int alpha, Imlib_Image rootimg, OutputInfo *outputs, int noutputs) + { +- int imgW, imgH, o; ++ int i, imgW, imgH, o; + Imlib_Image buffer = imlib_load_image(arg); + + if (!buffer) +@@ -193,7 +194,7 @@ load_image(ImageMode mode, const char *arg, int alpha, + + imlib_context_set_image(rootimg); + +- for (int i = 0; i < noutputs; i++) { ++ for (i = 0; i < noutputs; i++) { + OutputInfo o = outputs[i]; + printf("output %d: size(%d, %d) pos(%d, %d)\n", i, o.w, o.h, o.x, o.y); + @@ -229,6 +230,20 @@ load_image(ImageMode mode, const char *arg, int alpha, } }