Date: Fri, 31 Aug 2018 22:07:05 +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: r478613 - in head/japanese/scim-anthy: . files Message-ID: <201808312207.w7VM75FV069422@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Fri Aug 31 22:07:04 2018 New Revision: 478613 URL: https://svnweb.freebsd.org/changeset/ports/478613 Log: japanese/scim-anthy: Fix build with Clang 6 /usr/local/include/scim-1.0/scim_types.h:38:11: warning: '__STDC_ISO_10646__' macro redefined [-Wmacro-redefined] # define __STDC_ISO_10646__ ^ <command line>:6:9: note: previous definition is here #define __STDC_ISO_10646__ 1 ^ scim_anthy_prefs.cpp:98:9: error: cannot initialize a member subobject of type 'void *' with an rvalue of type 'bool' false, ^~~~~ http://beefy12.nyi.freebsd.org/data/head-amd64-default/p478276_s338342/logs/errors/ja-scim-anthy-1.2.7_5.log - scim-anthy finds dependencies in LOCALBASE on its own - __STDC_ISO_10646__ no longer needs to be specified manually - Add license while here Added: head/japanese/scim-anthy/files/ head/japanese/scim-anthy/files/patch-src_scim__anthy__prefs.cpp (contents, props changed) Modified: head/japanese/scim-anthy/Makefile Modified: head/japanese/scim-anthy/Makefile ============================================================================== --- head/japanese/scim-anthy/Makefile Fri Aug 31 21:41:41 2018 (r478612) +++ head/japanese/scim-anthy/Makefile Fri Aug 31 22:07:04 2018 (r478613) @@ -10,6 +10,9 @@ MASTER_SITES= OSDN/scim-imengine/37309 MAINTAINER= ports@FreeBSD.org COMMENT= SCIM IMEngine module using Anthy +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + BUILD_DEPENDS= scim:textproc/scim LIB_DEPENDS= libanthy.so:japanese/anthy RUN_DEPENDS:= ${BUILD_DEPENDS} \ @@ -17,8 +20,5 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \ USES= gmake iconv libtool:keepla pkgconfig GNU_CONFIGURE= yes - -CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__ -LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> Added: head/japanese/scim-anthy/files/patch-src_scim__anthy__prefs.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/scim-anthy/files/patch-src_scim__anthy__prefs.cpp Fri Aug 31 22:07:04 2018 (r478613) @@ -0,0 +1,56 @@ +Add missing initializers + +scim_anthy_prefs.cpp:98:9: error: cannot initialize a member subobject of type 'void *' with an rvalue of type 'bool' + false, + ^~~~~ + +--- src/scim_anthy_prefs.cpp.orig 2008-04-24 03:49:53 UTC ++++ src/scim_anthy_prefs.cpp +@@ -95,6 +95,7 @@ BoolConfigData config_bool_common [] = + N_("A_llow spliting romaji on editing preedit string"), + NULL, + N_("If this check is enabled, you can delete each letter."), ++ NULL, + false, + }, + { +@@ -104,6 +105,7 @@ BoolConfigData config_bool_common [] = + N_("_Entering the pseudo ASCII input mode with capital letters."), + NULL, + N_("If this check is enabled, capital letters will becomes a trigger to enter the pseudo ASCII input mode."), ++ NULL, + false, + }, + { +@@ -113,6 +115,7 @@ BoolConfigData config_bool_common [] = + N_("Insert a _blank with a blank key."), + NULL, + N_("If this check is enabled, a blank key will works to insert a blank when entering the pseudo ASCII input mode."), ++ NULL, + false, + }, + { +@@ -122,6 +125,7 @@ BoolConfigData config_bool_common [] = + N_("_Show predicted candidates while inputting letters"), + NULL, + NULL, ++ NULL, + false, + }, + { +@@ -131,6 +135,7 @@ BoolConfigData config_bool_common [] = + N_("Use _direct select keys while predicting"), + NULL, + NULL, ++ NULL, + false, + }, + { +@@ -269,6 +274,7 @@ IntConfigData config_int_common [] = + 0, + 0, + 0, 0, 0, ++ NULL, + NULL, + NULL, + NULL,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808312207.w7VM75FV069422>