From 5852b7390da1196e73e177b3cf08dfe531d6b7cd Mon Sep 17 00:00:00 2001 From: sbd Date: Mon, 14 May 2012 05:01:24 +0000 Subject: Change the the cast on gettext() when testing for it so the gcc doesn't complain with "error: cast from 'char*' to 'int' loses precision", which causes the test to fail and NLS to be disabled. --- inputmethod/scim/distinfo | 3 ++- inputmethod/scim/patches/patch-configure | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 inputmethod/scim/patches/patch-configure (limited to 'inputmethod/scim') diff --git a/inputmethod/scim/distinfo b/inputmethod/scim/distinfo index e70c982a2b1..bb3da2bb46d 100644 --- a/inputmethod/scim/distinfo +++ b/inputmethod/scim/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2012/04/29 12:15:55 obache Exp $ +$NetBSD: distinfo,v 1.5 2012/05/14 05:01:24 sbd Exp $ SHA1 (scim-1.4.13.tar.gz) = dafe08bbdd3faa0324800cb63e44926d71be2e47 RMD160 (scim-1.4.13.tar.gz) = 411fe876139120b2dc8df97d9b99405fcec70840 @@ -14,4 +14,5 @@ SHA1 (patch-bb) = 69e001995a8caa65b885e438123a7efb0ad9995b SHA1 (patch-bc) = 5caafe0a6ca44ccacb5532e26d9c11950ea6c7da SHA1 (patch-bd) = 15982bf8a9aee6f6ccd94f186bff20b70b1a93cf SHA1 (patch-be) = 85a98134d77038d20544241410ec8130df2ea94c +SHA1 (patch-configure) = 36d9699ea7f6471b2b4fd3daf6ccde47c8730106 SHA1 (patch-src_scim__helper__manager__server.cpp) = 3a1130f37c7c93389e2ae7db65af7438bac5de51 diff --git a/inputmethod/scim/patches/patch-configure b/inputmethod/scim/patches/patch-configure new file mode 100644 index 00000000000..d8178b6dea2 --- /dev/null +++ b/inputmethod/scim/patches/patch-configure @@ -0,0 +1,35 @@ +$NetBSD: patch-configure,v 1.3 2012/05/14 05:01:24 sbd Exp $ + +Change the the cast on gettext() when testing for it so the gcc doesn't +complain with "error: cast from 'char*' to 'int' loses precision", +which causes the test to fail and NLS to be disabled. + +--- configure.orig 2012-04-29 05:43:20.000000000 +0000 ++++ configure +@@ -17725,7 +17725,7 @@ int + main () + { + bindtextdomain ("", ""); +-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings ++return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + ; + return 0; + } +@@ -18247,7 +18247,7 @@ int + main () + { + bindtextdomain ("", ""); +-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) ++return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) + ; + return 0; + } +@@ -18274,7 +18274,7 @@ int + main () + { + bindtextdomain ("", ""); +-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) ++return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) + ; + return 0; + } -- cgit v1.2.3