From owner-svn-ports-all@freebsd.org Sun Aug 5 13:38:39 2018 Return-Path: Delivered-To: svn-ports-all@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 21732105323E; Sun, 5 Aug 2018 13:38:39 +0000 (UTC) (envelope-from jbeich@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 C25788FFDD; Sun, 5 Aug 2018 13:38:38 +0000 (UTC) (envelope-from jbeich@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 A001D1EF2F; Sun, 5 Aug 2018 13:38:38 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w75DccVe034350; Sun, 5 Aug 2018 13:38:38 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w75DccmV034349; Sun, 5 Aug 2018 13:38:38 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201808051338.w75DccmV034349@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 5 Aug 2018 13:38:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r476414 - head/games/freeorion/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/games/freeorion/files X-SVN-Commit-Revision: 476414 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.27 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: Sun, 05 Aug 2018 13:38:39 -0000 Author: jbeich Date: Sun Aug 5 13:38:38 2018 New Revision: 476414 URL: https://svnweb.freebsd.org/changeset/ports/476414 Log: games/freeorion: update Boost 1.68 fix Obtained from: upstream (0.4.8-rc3) Modified: head/games/freeorion/files/patch-boost168 (contents, props changed) Modified: head/games/freeorion/files/patch-boost168 ============================================================================== --- head/games/freeorion/files/patch-boost168 Sun Aug 5 13:30:30 2018 (r476413) +++ head/games/freeorion/files/patch-boost168 Sun Aug 5 13:38:38 2018 (r476414) @@ -1,24 +1,5 @@ -https://github.com/freeorion/freeorion/pull/2221 +https://github.com/freeorion/freeorion/pull/2241 ---- GG/CMakeLists.txt.orig 2018-06-14 14:12:09 UTC -+++ GG/CMakeLists.txt -@@ -144,6 +144,16 @@ if(USE_STATIC_LIBS) - ) - endif() - -+target_compile_definitions(GiGi -+ PRIVATE -+ -+ # Starting with boost 1.68 boost::gil integrates support for -+ # grayscale-alpha png images, so prefer their implementation -+ # instead of our hacky gilext code. -+ $<$:GIGI_CONFIG_USE_OLD_IMPLEMENTATION_OF_GIL_PNG_IO> -+ $<$:BOOST_GIL_IO_ENABLE_GRAY_ALPHA> -+) -+ - target_include_directories(GiGi SYSTEM - PRIVATE - ${Boost_INCLUDE_DIRS} --- GG/src/GUI.cpp.orig 2018-06-14 14:12:09 UTC +++ GG/src/GUI.cpp @@ -37,14 +37,19 @@ @@ -28,7 +9,7 @@ https://github.com/freeorion/freeorion/pull/2221 -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wunused-local-typedefs" -+# if GIGI_CONFIG_USE_OLD_IMPLEMENTATION_OF_GIL_PNG_IO ++# if BOOST_VERSION < 106800 +# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-local-typedefs" @@ -77,7 +58,7 @@ https://github.com/freeorion/freeorion/pull/2221 #if GG_HAVE_LIBPNG -# include "gilext/io/png_dynamic_io.hpp" -+# if GIGI_CONFIG_USE_OLD_IMPLEMENTATION_OF_GIL_PNG_IO ++# if BOOST_VERSION < 106800 +# include "gilext/io/png_dynamic_io.hpp" +# include "gilext/io/png_io_v2_compat.hpp" +# else