From owner-svn-ports-all@freebsd.org Fri Jul 6 12:08:01 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 121671044487; Fri, 6 Jul 2018 12:08:01 +0000 (UTC) (envelope-from amdmi3@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 B7BD37CE36; Fri, 6 Jul 2018 12:08:00 +0000 (UTC) (envelope-from amdmi3@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 98E08593; Fri, 6 Jul 2018 12:08:00 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w66C80ee043701; Fri, 6 Jul 2018 12:08:00 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w66C800G043699; Fri, 6 Jul 2018 12:08:00 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201807061208.w66C800G043699@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 6 Jul 2018 12:08:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474008 - in head/devel/clanlib1: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/devel/clanlib1: . files X-SVN-Commit-Revision: 474008 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: Fri, 06 Jul 2018 12:08:01 -0000 Author: amdmi3 Date: Fri Jul 6 12:07:59 2018 New Revision: 474008 URL: https://svnweb.freebsd.org/changeset/ports/474008 Log: - Fix build with clang 6 Added: head/devel/clanlib1/files/patch-Sources_Core_IOData_Generic_datafile__inputprovider.h (contents, props changed) head/devel/clanlib1/files/patch-Sources_GUI_inputbox__generic.cpp (contents, props changed) Modified: head/devel/clanlib1/Makefile Modified: head/devel/clanlib1/Makefile ============================================================================== --- head/devel/clanlib1/Makefile Fri Jul 6 11:53:06 2018 (r474007) +++ head/devel/clanlib1/Makefile Fri Jul 6 12:07:59 2018 (r474008) @@ -27,6 +27,8 @@ USE_LDCONFIG= yes USE_SDL= gfx USE_GL= gl glu +CXXFLAGS+= -Wno-c++11-narrowing + GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-docs \ --enable-clanDisplay \ Added: head/devel/clanlib1/files/patch-Sources_Core_IOData_Generic_datafile__inputprovider.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/clanlib1/files/patch-Sources_Core_IOData_Generic_datafile__inputprovider.h Fri Jul 6 12:07:59 2018 (r474008) @@ -0,0 +1,12 @@ +--- Sources/Core/IOData/Generic/datafile_inputprovider.h.orig 2006-10-27 01:55:01 UTC ++++ Sources/Core/IOData/Generic/datafile_inputprovider.h +@@ -144,7 +144,7 @@ protected: + cache.insert( +- std::make_pair >( ++ std::make_pair( + resource_id, +- std::make_pair(data_pos, data_size))); ++ std::make_pair(data_pos, data_size))); + } + + private: Added: head/devel/clanlib1/files/patch-Sources_GUI_inputbox__generic.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/clanlib1/files/patch-Sources_GUI_inputbox__generic.cpp Fri Jul 6 12:07:59 2018 (r474008) @@ -0,0 +1,11 @@ +--- Sources/GUI/inputbox_generic.cpp.orig 2008-04-18 11:16:05 UTC ++++ Sources/GUI/inputbox_generic.cpp +@@ -84,7 +84,7 @@ int CL_InputUndo::doUndo( std::string & + + int CL_InputUndo::doRedo( std::string & text ) + { +- if (!canRedo()) return NULL; ++ if (!canRedo()) return 0; + + OneUndo const & u = undo_array[cur_pos]; +