Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 84008 Details for
Bug 128557
sys-devel/gettext-0.15 is released with expat-2.0 support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch I used for testing.
gettext-expat-2.patch (text/plain), 3.36 KB, created by
Samuli Suominen (RETIRED)
on 2006-04-05 12:07:18 UTC
(
hide
)
Description:
Patch I used for testing.
Filename:
MIME Type:
Creator:
Samuli Suominen (RETIRED)
Created:
2006-04-05 12:07:18 UTC
Size:
3.36 KB
patch
obsolete
>diff -r -c3 --exclude='*.po*' --exclude='*.info*' --exclude='*_*.html' --exclude='*.*.html' --exclude='*.[13]' --exclude='*.1.in' --exclude=Makefile.in --exclude=aclocal.m4 --exclude=configure --exclude=version.texi --exclude=stamp-vti --exclude='po-*-gen*.[ch]' --exclude='*.o' --exclude='*.lo' --exclude='*.gmo' --exclude=ABOUT-NLS --exclude='javadoc[12]' --exclude=CVS gettext-cvs/gettext-tools/src/x-glade.c gettext-6/gettext-tools/src/x-glade.c >*** gettext-cvs/gettext-tools/src/x-glade.c Sat Apr 1 23:40:50 2006 >--- gettext-6/gettext-tools/src/x-glade.c Tue Apr 4 02:47:32 2006 >*************** >*** 125,132 **** >--- 125,137 ---- > static void (*p_XML_SetCommentHandler) (XML_Parser parser, XML_CommentHandler handler); > static int (*p_XML_Parse) (XML_Parser parser, const char *s, int len, int isFinal); > static enum XML_Error (*p_XML_GetErrorCode) (XML_Parser parser); >+ #if XML_MAJOR_VERSION >= 2 >+ static XML_Size (*p_XML_GetCurrentLineNumber) (XML_Parser parser); >+ static XML_Size (*p_XML_GetCurrentColumnNumber) (XML_Parser parser); >+ #else > static int (*p_XML_GetCurrentLineNumber) (XML_Parser parser); > static int (*p_XML_GetCurrentColumnNumber) (XML_Parser parser); >+ #endif > static void (*p_XML_ParserFree) (XML_Parser parser); > static const XML_LChar * (*p_XML_ErrorString) (int code); > >*************** >*** 148,154 **** > { > if (libexpat_loaded == 0) > { >! void *handle = dlopen ("libexpat.so.0", RTLD_LAZY); > if (handle != NULL > && (p_XML_ParserCreate = dlsym (handle, "XML_ParserCreate")) != NULL > && (p_XML_SetElementHandler = dlsym (handle, "XML_SetElementHandler")) != NULL >--- 153,166 ---- > { > if (libexpat_loaded == 0) > { >! void *handle; >! /* Be careful to use exactly the version of libexpat that matches the >! binary interface declared in <expat.h>. */ >! #if XML_MAJOR_VERSION >= 2 >! handle = dlopen ("libexpat.so.1", RTLD_LAZY); >! #else >! handle = dlopen ("libexpat.so.0", RTLD_LAZY); >! #endif > if (handle != NULL > && (p_XML_ParserCreate = dlsym (handle, "XML_ParserCreate")) != NULL > && (p_XML_SetElementHandler = dlsym (handle, "XML_SetElementHandler")) != NULL >*************** >*** 413,428 **** > } > > if (XML_Parse (parser, buf, count, 0) == 0) >! error (EXIT_FAILURE, 0, _("%s:%d:%d: %s"), logical_filename, >! XML_GetCurrentLineNumber (parser), >! XML_GetCurrentColumnNumber (parser) + 1, > XML_ErrorString (XML_GetErrorCode (parser))); > } > > if (XML_Parse (parser, NULL, 0, 1) == 0) >! error (EXIT_FAILURE, 0, _("%s:%d:%d: %s"), logical_filename, >! XML_GetCurrentLineNumber (parser), >! XML_GetCurrentColumnNumber (parser) + 1, > XML_ErrorString (XML_GetErrorCode (parser))); > > XML_ParserFree (parser); >--- 425,440 ---- > } > > if (XML_Parse (parser, buf, count, 0) == 0) >! error (EXIT_FAILURE, 0, _("%s:%lu:%lu: %s"), logical_filename, >! (unsigned long) XML_GetCurrentLineNumber (parser), >! (unsigned long) XML_GetCurrentColumnNumber (parser) + 1, > XML_ErrorString (XML_GetErrorCode (parser))); > } > > if (XML_Parse (parser, NULL, 0, 1) == 0) >! error (EXIT_FAILURE, 0, _("%s:%lu:%lu: %s"), logical_filename, >! (unsigned long) XML_GetCurrentLineNumber (parser), >! (unsigned long) XML_GetCurrentColumnNumber (parser) + 1, > XML_ErrorString (XML_GetErrorCode (parser))); > > XML_ParserFree (parser);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 128557
:
83750
|
83758
|
83943
|
83977
|
84007
|
84008