Bug 2400 - pt_BR.UTF-8 support recently added to 6.8.2 branch, was untested, and broken
Summary: pt_BR.UTF-8 support recently added to 6.8.2 branch, was untested, and broken
Status: CLOSED FIXED
Alias: None
Product: xorg
Classification: Unclassified
Component: * Other (show other bugs)
Version: unspecified
Hardware: x86 (IA32) Linux (All)
: high normal
Assignee: Roland Mainz
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-01-27 14:04 UTC by Mike A. Harris
Modified: 2011-10-15 16:23 UTC (History)
4 users (show)

See Also:
i915 platform:
i915 features:


Attachments
[FIXED_X11R68x] Fix problem with pt_BR.UTF-8 comments (7.83 KB, patch)
2005-01-27 15:31 UTC, Kevin E. Martin
roland.mainz: 6.8-branch+
Details | Splinter Review

Description Mike A. Harris 2005-01-27 14:04:31 UTC
Recently, broken pt_BR.UTF-8 support was added to 6.8.1.903.


rm -f pt_BR.UTF-8.lt
cpp -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L                  
        -D_POSIX_SOURCE -D_XOPEN_SOURCE                                
-D_BSD_SOURCE -D_SVID_
SOURCE                           -D_GNU_SOURCE                            
-DWCHAR32=1 <pt_BR.UTF-8 | sed -e '/^#  *[0-9][0-9]*  *.*$/d'                  
     -e '/^#line  *
[0-9][0-9]*  *.*$/d'                    -e '/^[         ]*XCOMM$/s/XCOMM/#/'   
                -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/#/'               
        -e '/^
[       ]*XHASH/s/XHASH/#/'                     -e '/\@\@$/s/\@\@$/\\/'
>pt_BR.UTF-8.lt
<stdin>:1: invalid preprocessing directive #XLocale
<stdin>:3: invalid preprocessing directive #Based
<stdin>:7: invalid preprocessing directive #XLC_FONTSET
<stdin>:15: invalid preprocessing directive #fs0
<stdin>:25: invalid preprocessing directive #fs1
<stdin>:34: invalid preprocessing directive #fs2
<stdin>:43: invalid preprocessing directive #fs3
<stdin>:52: invalid preprocessing directive #fs4
<stdin>:61: invalid preprocessing directive #fs5
<stdin>:71: invalid preprocessing directive #ISO10646
<stdin>:72: invalid preprocessing directive #http
<stdin>:84: invalid preprocessing directive #XLC_XLOCALE
<stdin>:92: invalid preprocessing directive #cs0
<stdin>:99: invalid preprocessing directive #cs1
<stdin>:106: invalid preprocessing directive #cs2
<stdin>:114: invalid preprocessing directive #cs3
<stdin>:122: invalid preprocessing directive #cs4
<stdin>:129: invalid preprocessing directive #cs5
<stdin>:136: invalid preprocessing directive #cs6


It was a debian patch that was aparently created from copying a
preprocessed system locale file, and modifying it for pt_BR.UTF-8,
rather than working from source.  It hadn't been submitted by
Debian upstream because it was not yet fit for upstream.

Branden Robinson (credited in the Xorg changelog for the patch)
just informed me he did not submit this, and it wasn't ready yet
for inclusion:



<mharris>     Add support for pt_BR.UTF-8 locale.
<mharris>     Patch by Gustavo Noronha Silva, Branden Robinson, Julien Lafon.
<ajax> .a is just one or more .o files glommed together
<mharris> <stdin>:1: invalid preprocessing directive #XLocale
<mharris> <stdin>:3: invalid preprocessing directive #Based
<mharris> <stdin>:7: invalid preprocessing directive #XLC_FONTSET
<mharris> ...
<Overfiend> well, yeah, in the real world.
<Overfiend> mharris: it's buggy
<Overfiend> mharris: I didn't submit it.
<mharris> why did it get into 6.8.2?
<Overfiend> mharris: someone forgot to work from source
<mharris> Someone forgot to _test_ things who commited them
<Overfiend> they took a post-processed en_US.UTF-8 and went from there
<mharris> ugh
<Overfiend> mharris: surprise!


Should be fixed or reverted, so 6.8.2 is clean.
Comment 1 Kevin E. Martin 2005-01-27 15:30:01 UTC
As noted, the problem is that the post-processed file was used instead of the
pre-processed file.  Changing "#" to "XCOMM" should fix the problem.

Will attach a patch shortly.
Comment 2 Kevin E. Martin 2005-01-27 15:31:12 UTC
Created attachment 1762 [details] [review]
[FIXED_X11R68x] Fix problem with pt_BR.UTF-8 comments
Comment 3 Kevin E. Martin 2005-01-27 15:33:47 UTC
Comment on attachment 1762 [details] [review]
[FIXED_X11R68x] Fix problem with pt_BR.UTF-8 comments

pt_BR.UTF-8 files were modified from postprocessed files instead of the
originals.  This patch fixes the build problems.
Comment 4 Roland Mainz 2005-01-27 17:11:35 UTC
ienup:
Can you do a quick look at the patch and check whether it is OK, please ?
Comment 5 Ienup Sung 2005-01-27 17:44:02 UTC
The patch appears look good to me for the lines starting with '#' comment char
have been correctly changed to the XCOMM.
Comment 6 Mike A. Harris 2005-01-28 07:51:57 UTC
I've applied Kevin's patch to a test build, and have confirmed that it
cleans up the problem.  Please commit to XORG-6.8-branch and CVS head
(if appropriate).

TIA
Comment 7 Roland Mainz 2005-01-31 19:00:36 UTC
Comment on attachment 1762 [details] [review]
[FIXED_X11R68x] Fix problem with pt_BR.UTF-8 comments

Approved for commit into X11R6.8.x stable branch in the 2005-01-31 Xorg
release-wranglers phone call.
Please do not commit yourself, I'll do that myself in a few mins...
Comment 8 Roland Mainz 2005-01-31 19:07:34 UTC
Taking bug myself for commit into Xorg trunk and X11R6.8.x stable branch...
Comment 9 Roland Mainz 2005-01-31 19:13:13 UTC
Patch checked-in into Xorg trunk...

/cvs/xorg/xc/ChangeLog,v  <--  xc/ChangeLog
new revision: 1.735; previous revision: 1.734
cvs commit: Using deprecated info format strings.  Convert your scripts to use
the new argument format and remove '1's from your info file format strings.
/cvs/xorg/xc/nls/Compose/pt_BR.UTF-8,v  <--  xc/nls/Compose/pt_BR.UTF-8
new revision: 1.2; previous revision: 1.1
cvs commit: Using deprecated info format strings.  Convert your scripts to use
the new argument format and remove '1's from your info file format strings.
/cvs/xorg/xc/nls/XLC_LOCALE/pt_BR.UTF-8,v  <--  xc/nls/XLC_LOCALE/pt_BR.UTF-8
new revision: 1.2; previous revision: 1.1
cvs commit: Using deprecated info format strings.  Convert your scripts to use
the new argument format and remove '1's from your info file format strings.
Mailing the commit message to xorg-commit@lists.freedesktop.org...
Comment 10 Roland Mainz 2005-01-31 19:18:22 UTC
Comment on attachment 1762 [details] [review]
[FIXED_X11R68x] Fix problem with pt_BR.UTF-8 comments

Patch checked-in into X11R6.8.x stable branch:

/cvs/xorg/xc/ChangeLog,v  <--  xc/ChangeLog
new revision: 1.365.2.139; previous revision: 1.365.2.138
cvs commit: Using deprecated info format strings.  Convert your scripts to use
the new argument format and remove '1's from your info file format strings.
/cvs/xorg/xc/nls/Compose/pt_BR.UTF-8,v	<--  xc/nls/Compose/pt_BR.UTF-8
new revision: 1.1.2.2; previous revision: 1.1.2.1
cvs commit: Using deprecated info format strings.  Convert your scripts to use
the new argument format and remove '1's from your info file format strings.
/cvs/xorg/xc/nls/XLC_LOCALE/pt_BR.UTF-8,v  <--	xc/nls/XLC_LOCALE/pt_BR.UTF-8
new revision: 1.1.2.2; previous revision: 1.1.2.1
cvs commit: Using deprecated info format strings.  Convert your scripts to use
the new argument format and remove '1's from your info file format strings.
Mailing the commit message to xorg-commit@lists.freedesktop.org...
Comment 11 Roland Mainz 2005-01-31 19:19:31 UTC
Patch checked-in into Xorg trunk and X11R6.8.x stable branch...

... marking bug as FIXED.


Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.