Mon May 14 05:01:24 2012 UTC ()
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.


(sbd)
diff -r1.4 -r1.5 pkgsrc/inputmethod/scim/distinfo
diff -r0 -r1.3 pkgsrc/inputmethod/scim/patches/patch-configure

cvs diff -r1.4 -r1.5 pkgsrc/inputmethod/scim/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/scim/distinfo 2012/04/29 12:15:55 1.4
+++ pkgsrc/inputmethod/scim/distinfo 2012/05/14 05:01:24 1.5
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: distinfo,v 1.4 2012/04/29 12:15:55 obache Exp $ 1$NetBSD: distinfo,v 1.5 2012/05/14 05:01:24 sbd Exp $
2 2
3SHA1 (scim-1.4.13.tar.gz) = dafe08bbdd3faa0324800cb63e44926d71be2e47 3SHA1 (scim-1.4.13.tar.gz) = dafe08bbdd3faa0324800cb63e44926d71be2e47
4RMD160 (scim-1.4.13.tar.gz) = 411fe876139120b2dc8df97d9b99405fcec70840 4RMD160 (scim-1.4.13.tar.gz) = 411fe876139120b2dc8df97d9b99405fcec70840
5Size (scim-1.4.13.tar.gz) = 1301625 bytes 5Size (scim-1.4.13.tar.gz) = 1301625 bytes
6SHA1 (patch-ab) = c5220c83ec8125f75b1e5d7b41f4438ec73becbf 6SHA1 (patch-ab) = c5220c83ec8125f75b1e5d7b41f4438ec73becbf
7SHA1 (patch-ac) = c8c4a54b1b6ffd82211616c3b99de1239b29c652 7SHA1 (patch-ac) = c8c4a54b1b6ffd82211616c3b99de1239b29c652
8SHA1 (patch-ad) = 2812ded533f29bd69bad180c33c81fd49e6213e6 8SHA1 (patch-ad) = 2812ded533f29bd69bad180c33c81fd49e6213e6
9SHA1 (patch-ae) = 61909935f6226d2126392d0990f81243dc2bb933 9SHA1 (patch-ae) = 61909935f6226d2126392d0990f81243dc2bb933
10SHA1 (patch-af) = 010d4f31d684b8163672d2521ebff74230591d66 10SHA1 (patch-af) = 010d4f31d684b8163672d2521ebff74230591d66
11SHA1 (patch-ag) = 2f97e1d9c9a96096524903c43ba4f7626956450d 11SHA1 (patch-ag) = 2f97e1d9c9a96096524903c43ba4f7626956450d
12SHA1 (patch-ah) = abb315ac44a36e99d8c456b1cb3af9290a29be12 12SHA1 (patch-ah) = abb315ac44a36e99d8c456b1cb3af9290a29be12
13SHA1 (patch-bb) = 69e001995a8caa65b885e438123a7efb0ad9995b 13SHA1 (patch-bb) = 69e001995a8caa65b885e438123a7efb0ad9995b
14SHA1 (patch-bc) = 5caafe0a6ca44ccacb5532e26d9c11950ea6c7da 14SHA1 (patch-bc) = 5caafe0a6ca44ccacb5532e26d9c11950ea6c7da
15SHA1 (patch-bd) = 15982bf8a9aee6f6ccd94f186bff20b70b1a93cf 15SHA1 (patch-bd) = 15982bf8a9aee6f6ccd94f186bff20b70b1a93cf
16SHA1 (patch-be) = 85a98134d77038d20544241410ec8130df2ea94c 16SHA1 (patch-be) = 85a98134d77038d20544241410ec8130df2ea94c
 17SHA1 (patch-configure) = 36d9699ea7f6471b2b4fd3daf6ccde47c8730106
17SHA1 (patch-src_scim__helper__manager__server.cpp) = 3a1130f37c7c93389e2ae7db65af7438bac5de51 18SHA1 (patch-src_scim__helper__manager__server.cpp) = 3a1130f37c7c93389e2ae7db65af7438bac5de51

File Added: pkgsrc/inputmethod/scim/patches/Attic/patch-configure
$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;
 }