From owner-svn-ports-head@freebsd.org Mon Jul 30 08:11:15 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5A9D5104E744; Mon, 30 Jul 2018 08:11:15 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 107158D16A; Mon, 30 Jul 2018 08:11:15 +0000 (UTC) (envelope-from tobik@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E5BF321A68; Mon, 30 Jul 2018 08:11:14 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6U8BERd084839; Mon, 30 Jul 2018 08:11:14 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6U8BEGR084838; Mon, 30 Jul 2018 08:11:14 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201807300811.w6U8BEGR084838@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 30 Jul 2018 08:11:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475867 - in head/games/flukz: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/games/flukz: . files X-SVN-Commit-Revision: 475867 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2018 08:11:15 -0000 Author: tobik Date: Mon Jul 30 08:11:14 2018 New Revision: 475867 URL: https://svnweb.freebsd.org/changeset/ports/475867 Log: games/flukz: Fix build on 12.0-CURRENT src/soundengine/vorbisdecoder.cpp:352:20: error: cannot initialize return object of type 'unsigned char *' with an rvalue of type 'bool' return false; ^~~~~ http://beefy12.nyi.freebsd.org/data/head-amd64-default/p475478_s336801/logs/errors/flukz-0.4.log - While here add missing dependencies Added: head/games/flukz/files/ head/games/flukz/files/patch-src_soundengine_vorbisdecoder.cpp (contents, props changed) Modified: head/games/flukz/Makefile Modified: head/games/flukz/Makefile ============================================================================== --- head/games/flukz/Makefile Mon Jul 30 08:02:34 2018 (r475866) +++ head/games/flukz/Makefile Mon Jul 30 08:11:14 2018 (r475867) @@ -2,6 +2,7 @@ PORTNAME= flukz PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://download.tuxfamily.org/${PORTNAME}/ DISTNAME= ${PORTNAME}${PORTVERSION} @@ -10,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Vertically scrolling shoot'em up USES= qmake qt:4 -USE_QT= multimedia network moc_build rcc_build +USE_QT= corelib gui multimedia network moc_build rcc_build DESKTOP_ENTRIES= Flukz "" ${PORTNAME} \ ${PORTNAME} "Game;ArcadeGame;" true Added: head/games/flukz/files/patch-src_soundengine_vorbisdecoder.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/flukz/files/patch-src_soundengine_vorbisdecoder.cpp Mon Jul 30 08:11:14 2018 (r475867) @@ -0,0 +1,15 @@ +src/soundengine/vorbisdecoder.cpp:352:20: error: cannot initialize return object of type 'unsigned char *' with an rvalue of type 'bool' + return false; + ^~~~~ + +--- src/soundengine/vorbisdecoder.cpp.orig 2018-07-30 08:05:34 UTC ++++ src/soundengine/vorbisdecoder.cpp +@@ -349,7 +349,7 @@ unsigned char *VorbisDecoder::decodeAll(unsigned int * + if (!vorbisDecode(m_readData, rlen, &leftover, false) || + !m_decSamplesLen) { + DEBUG_INFO("vorbisDecode failed"); +- return false; ++ return NULL; + } + m_readPos += rlen - leftover; +