Date: Fri, 6 Jul 2018 12:08:00 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474008 - in head/devel/clanlib1: . files Message-ID: <201807061208.w66C800G043699@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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::string const, std::pair<int, int> >( ++ std::make_pair( + resource_id, +- std::make_pair<int,int>(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]; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807061208.w66C800G043699>