Date: Sun, 19 Aug 2018 08:13:51 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477558 - in head/games/gtkpool: . files Message-ID: <201808190813.w7J8DpLE062369@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Sun Aug 19 08:13:51 2018 New Revision: 477558 URL: https://svnweb.freebsd.org/changeset/ports/477558 Log: games/gtkpool: Fix build with Clang Modified: head/games/gtkpool/Makefile head/games/gtkpool/files/patch-gtkpool_application.cpp Modified: head/games/gtkpool/Makefile ============================================================================== --- head/games/gtkpool/Makefile Sun Aug 19 07:47:22 2018 (r477557) +++ head/games/gtkpool/Makefile Sun Aug 19 08:13:51 2018 (r477558) @@ -3,7 +3,7 @@ PORTNAME= gtkpool PORTVERSION= 0.5.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MASTER_SITES= ftp://ftp.seul.org/pub/gtkpool/ \ http://www.sourcefiles.org/Games/Sports/Pool/ @@ -11,11 +11,14 @@ MASTER_SITES= ftp://ftp.seul.org/pub/gtkpool/ \ MAINTAINER= ports@FreeBSD.org COMMENT= 2D pool game using the GTK+ toolkit -USES= autoreconf gmake perl5 pkgconfig +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= autoreconf compiler:c++11-lang gmake perl5 pkgconfig +USE_CXXSTD= c++11 USE_GNOME= gtk20 USE_PERL5= build GNU_CONFIGURE= yes -USE_GCC= any PLIST_FILES= bin/gtkpool \ share/icons/gtkpool.png Modified: head/games/gtkpool/files/patch-gtkpool_application.cpp ============================================================================== --- head/games/gtkpool/files/patch-gtkpool_application.cpp Sun Aug 19 07:47:22 2018 (r477557) +++ head/games/gtkpool/files/patch-gtkpool_application.cpp Sun Aug 19 08:13:51 2018 (r477558) @@ -1,6 +1,6 @@ ---- gtkpool/application.cpp.orig 2002-08-06 13:02:45.000000000 +0900 -+++ gtkpool/application.cpp 2011-08-19 04:36:56.000000000 +0900 -@@ -67,11 +67,11 @@ +--- gtkpool/application.cpp.orig 2002-08-06 04:02:45 UTC ++++ gtkpool/application.cpp +@@ -67,11 +67,11 @@ Application::Application(){ message_colours[14] = new GdkColor; buf_pixmap = NULL; @@ -17,7 +17,16 @@ running = true; placing_cue = false; sunk_tf = collide_tf = bounce_tf = false; connected = false; -@@ -530,7 +530,7 @@ +@@ -234,7 +234,7 @@ reiterated until there are no more collisions left in + } + + update_rack(); +- balls.erase(std::vector<Ball>::iterator(bnc)); // get rid of it ++ balls.erase(std::remove_if(balls.begin(), balls.end(), [bnc](Ball const &b) { return &b == bnc; }), balls.end()); // get rid of it + sunk_tf = true; + } + else // otherwise bounce it off the bumper +@@ -530,7 +530,7 @@ void Application::mouse_down (double x, double y) { bb = find_if(balls.begin(), balls.end(), pointer_selects( x, y, hit_moving)); if(bb != balls.end()) { @@ -26,7 +35,7 @@ // FIXME: horrible, non-portable, converting a vector iterator // to a pointer using g++ 3.0 private interface :-( // -- Philip Martin <philip_martin@ntlworld.com> -@@ -815,12 +815,18 @@ +@@ -815,12 +815,18 @@ void Application::init_sound() load_sounds(); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808190813.w7J8DpLE062369>