[virt-tools-list] [virt-viewer][PATCH 1/3 v2] cfg.mk: Don't require bindtextdomain directly

[Martin Kletzander]

On 11/21/2012 05:38 PM, Michal Privoznik wrote:
> On 21.11.2012 17:32, Martin Kletzander wrote:
>> On 11/14/2012 10:58 AM, Michal Privoznik wrote:
>>> With current implementation, all binaries that need it call
>>> bindtextdomain but not directly. They call a helper function
>>> instead.  This makes, however, syntax-check fail as it cannot
>>> recognize it.
>>>
>>> Original patch proposed by Eric Blake <eblake at redhat.com>
>>> ---
>>>  cfg.mk |    4 ++--
>>>  1 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/cfg.mk b/cfg.mk
>>> index 3f9b47b..30392d4 100644
>>> --- a/cfg.mk
>>> +++ b/cfg.mk
>>> @@ -1,5 +1,5 @@
>>>  # Customize Makefile.maint.                           -*- makefile -*-
>>> -# Copyright (C) 2008-2011 Red Hat, Inc.
>>> +# Copyright (C) 2008-2012 Red Hat, Inc.
>>>  # Copyright (C) 2003-2008 Free Software Foundation, Inc.
>>>  
>>>  # This program is free software: you can redistribute it and/or modify
>>> @@ -24,6 +24,7 @@ local-checks-to-skip =			\
>>>    patch-check				\
>>>    sc_GPL_version			\
>>>    sc_always_defined_macros		\
>>> +  sc_bindtextdomain			\
>>>    sc_cast_of_alloca_return_value	\
>>>    sc_cross_check_PATH_usage_in_tests	\
>>>    sc_dd_max_sym_length			\
>>> @@ -133,5 +134,4 @@ exclude_file_name_regexp--sc_require_config_h_first = ^plugin/|src/gbinding\.c|s
>>>  exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = ^icons/
>>>  exclude_file_name_regexp--sc_trailing_blank = ^icons/
>>>  
>>> -exclude_file_name_regexp--sc_bindtextdomain = src/windows-cmdline-wrapper.c
>>>  exclude_file_name_regexp--sc_prohibit_magic_number_exit = src/windows-cmdline-wrapper.c
>>>
>>
>> This works for me, but in order to make syntax-check pass, there is more
>> work to be done, unfortunately :(  Dave is missing from AUTHORS,
>> src/debug-helper.c doesn't include config.h, so I propose squashing this in:
>>
>> diff --git a/AUTHORS b/AUTHORS
>> index ca53f79..1410d14 100644
>> --- a/AUTHORS
>> +++ b/AUTHORS
>> @@ -12,6 +12,7 @@ The Virt Viewer application is maintained by
>>  With additional patches from:
>>
>>      Atsushi SAKAI <sakaia at jp.fujitsu.com>
>> +    Dave Allan <dallan at redhat.com>
>>      Chris Lalancette <clalance at redhat.com>
>>      Guannan Ren <gren at redhat.com>
>>      Guido G\374nther <agx at sigxcpu.org>
>> diff --git a/src/debug-helper.c b/src/debug-helper.c
>> index eeabed8..0a9a923 100644
>> --- a/src/debug-helper.c
>> +++ b/src/debug-helper.c
>> @@ -1,3 +1,4 @@
>> +#include <config.h>
>>  #include <windows.h>
>>  #include <stdio.h>
>>  #include <conio.h>
>> --
>>
>> Martin
>>
> 
> That's what I am doing in 2/3 and 3/3 patches. Thanks, I've pushed the
> whole set now.
> 
> Michal
> 

Those mails are totally missing from my inbox, so good that we've hit
the same note ;)

Martin