From ea2d1b8be03ba4304cf4ef68f5bba3ff5645eb1f Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Fri, 13 Jan 2012 00:08:55 +0000 Subject: [PATCH] Add patch from 1.3.15 that reorders #includes in msxml3 to fix building with libxml2[icu] (bug #397993, thanks to Marcin Szamotulski for reporting). Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- app-emulation/wine/ChangeLog | 9 +- app-emulation/wine/Manifest | 11 +- .../wine-1.2.3-msxml3-libxml2-headers.patch | 574 ++++++++++++++++++ app-emulation/wine/wine-1.2.3.ebuild | 5 +- 4 files changed, 590 insertions(+), 9 deletions(-) create mode 100644 app-emulation/wine/files/wine-1.2.3-msxml3-libxml2-headers.patch diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index 94108249510a..3cce60b4ba3a 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/wine -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.393 2011/12/31 06:42:09 tetromino Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.394 2012/01/13 00:08:55 tetromino Exp $ + + 13 Jan 2012; Alexandre Rostovtsev wine-1.2.3.ebuild, + +files/wine-1.2.3-msxml3-libxml2-headers.patch: + Add patch from 1.3.15 that reorders #includes in msxml3 to fix building with + libxml2[icu] (bug #397993, thanks to Marcin Szamotulski for reporting). 31 Dec 2011; Alexandre Rostovtsev wine-9999.ebuild: Sync with dbus/udisks USE flag update in 1.3.36. diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index 87adf7d3ce2a..48d3246e37e6 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -2,6 +2,7 @@ Hash: SHA256 AUX wine-1.1.15-winegcc.patch 1556 RMD160 ca7e0df0a45507e7d31ed81c5712111b83ed9bfa SHA1 4b155fe7cb5e831b7f92757d52aa1ab12569b232 SHA256 dbd89db561d7583faf317d795b8c11231575d885e21c6414add39079604dbd0d +AUX wine-1.2.3-msxml3-libxml2-headers.patch 14328 RMD160 84409dda4e680967048dceaf057c007d5e78d3c9 SHA1 a396cafc13e6b72e5fb101433d54a87cde0ae20d SHA256 0a046e532343f9a4508307434a2f39e0a3a50a66c165b69e56dd671488d4ba7d DIST wine-1.2.1.tar.bz2 17629106 RMD160 8652ac4f7c4fd2b3da22a840706b3adcb9901467 SHA1 02df427698de8a6d937e722923c8ac1cf886ca27 SHA256 43d1c4d8441221708e6e15ddcddf113308ce875c87f5a8c0f380c6a5b8b63701 DIST wine-1.2.2.tar.bz2 17665449 RMD160 0388547d56d0676354406d52e62de0b843d8be5d SHA1 8b37c8e0230dd6a665d310054f4e36dcbdab7330 SHA256 c3daead3d40a7c00111200a8e9271d4647369ee4eee2d5d866c2032ef37c09db DIST wine-1.2.3.tar.bz2 17651336 RMD160 5bc41a4623ee087e57ebd424a15c6743d0874194 SHA1 072184c492cc9d137138407732de3bb62ba6c091 SHA256 3fd8d3f2b466d07eb90b8198cdc9ec3005917a4533db7b8c6c69058a2e57c61f @@ -57,7 +58,7 @@ DIST winepulse-0.36.patch 101815 RMD160 9a20076436a7e49c317bc624dd71b61c93acddff DIST winepulse-0.38-winecfg.patch 13088 RMD160 e7aa8f91c20b6d706fc12e11677440f19890f4c7 SHA1 55b785636d2982f19e0634b26eafffbe46b79c60 SHA256 051ef1cb5598c319152ad28b85733927a711b45e0bfa92f0b0b2331588f5894e EBUILD wine-1.2.1.ebuild 5673 RMD160 0fe11da327a9c0e3aee43a86bcd7b98eb3df6af7 SHA1 4d205afb59bb2167b9e8d72de26a70cd4ca96606 SHA256 8ac340db36a8bc601433541bdd15ce4eb4e9c80a661a3df04b8a2dc6976a7998 EBUILD wine-1.2.2.ebuild 5749 RMD160 77804d56bde52d859a4902187d04978481f135bd SHA1 dd4e4bc451cec11790cac33312041a92e6dd45d3 SHA256 05d62ce5c8891881a84f7829e2fb0d28a6776b374fdd389f6ae3960b6bbcd756 -EBUILD wine-1.2.3.ebuild 5749 RMD160 396a1d984caf873a15bf1c628280f94069f3ad82 SHA1 36e6d87f66580cca09adac78af6c917cc53821ad SHA256 5ea9941ca04f4980788b7ce0288778acc9b483ea401cf93467ad8387ec75e73e +EBUILD wine-1.2.3.ebuild 5820 RMD160 461a61b1ad772ead6d797e5315fba941f5f5afee SHA1 9b14603059ce0444ebaebe6bb0bc8d00d25d02de SHA256 622f2a03d9b639ca2fcb789869629e27560801b463e8f6bbbab2a8730a3e7ecc EBUILD wine-1.2.ebuild 5212 RMD160 7068569ca45428c628f31ed9469ed7323a89b9b7 SHA1 84e9c01eb5247b39bd28f4bc813f3bddadddc608 SHA256 2fff671f121a99f426f1ae52d7b7841f60f2c590f1025f7bff2577c8c3b80a15 EBUILD wine-1.3.0.ebuild 5282 RMD160 c3ac01a9eb4af70042d9884ddda82359dc45a939 SHA1 801bdf860391f5d25237e1de3ad2b2b1522b163a SHA256 865d318da168426bb71907495a999a874692aef1d38e8609862102efa7b04446 EBUILD wine-1.3.1.ebuild 5282 RMD160 5e29c316a5e20df92662846352cb168980d7b992 SHA1 48d656f464794f22c7520a37affaf3baedfceb18 SHA256 d81c4037ba6522b6d22ba2dd6a82ddebb90e258502b6c5f27c274ab2f63f547e @@ -97,12 +98,12 @@ EBUILD wine-1.3.7.ebuild 5532 RMD160 07ec7829151126b9d6a91152bf0c7bd787d99bab SH EBUILD wine-1.3.8.ebuild 5532 RMD160 1835d32b102f8386570c3f136c72768d7e616c8e SHA1 7ea7ac53e32c575bcb4aaa26ef394cee66ebadde SHA256 b52572a30de0148908ff5571d966613111453bb37e2310abe760fd9d1d2e2ee8 EBUILD wine-1.3.9.ebuild 5590 RMD160 4dd88ea3b9d2363a56a14d60f9159ed9a2d08721 SHA1 0276879922960c64598474ea07aaff4081d7408c SHA256 2c01211516050f7c3d396e35a86742c4fcc2e347da61d84f3e84d8eb8b8ee5a4 EBUILD wine-9999.ebuild 5524 RMD160 db4af4b4d41ee23082080f5164324afaac524c3b SHA1 20cdeae0b0df768eab8a1690c6601f8e12e40e6f SHA256 90d8cba5540638d8ce6157d030a1e01dfd3b5f4067cd0f4d4907b1d592ab9a82 -MISC ChangeLog 80135 RMD160 3219314df6e2df57d92449e478b341ef3de75578 SHA1 4191dbc3c30ad8c1028920b44ddf4a11d3bb7e33 SHA256 2e7700a92ba4ffd9c4fb5d9e60c6e81a8fc359b63360845688b1424922952b56 +MISC ChangeLog 80417 RMD160 1b720f41901dc80bddef171e3ead5befd322c04d SHA1 2db02d8b9b41b6213fa4bb16fdb8c2d8278edeb0 SHA256 5ce87fc1f99ca5ecba0776bf903a4274d8e5ca7ccac9ebb60b84a57243545179 MISC metadata.xml 1558 RMD160 54a67744e1e3b273da447b7501bedbd995de7464 SHA1 831b9f52b00d99bac3f10073c9c59be2fd721542 SHA256 fa58b3b055a5f848f6861fa85ca2d5cb922ba9723a8a26d7e69dd78481209616 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk7+rsYACgkQdjK8w9WeBnBqOAD+KFKc5hGAtCpTweXYTOnPjR/D -qaWikLHaAy+jUriFeX8A/jZq2ifrcxa/UEL4GB/ItgIpbl79AMb/enxUyJ2zHaqB -=E1l/ +iF4EAREIAAYFAk8PdhwACgkQdjK8w9WeBnBjIwEAinvJGaPRd20HXMuQO/+Myuy7 +QFKQatDqfQ/Zuh2Qa/oA/1h6U6yKpDrEVnGsoeC4Xw6Duw1vEdsmXtPd4RUxIyCW +=5q0I -----END PGP SIGNATURE----- diff --git a/app-emulation/wine/files/wine-1.2.3-msxml3-libxml2-headers.patch b/app-emulation/wine/files/wine-1.2.3-msxml3-libxml2-headers.patch new file mode 100644 index 000000000000..c1a80d3c408a --- /dev/null +++ b/app-emulation/wine/files/wine-1.2.3-msxml3-libxml2-headers.patch @@ -0,0 +1,574 @@ +From 26603f25f73142a45b5b964bb9bb2e59bc0908d4 Mon Sep 17 00:00:00 2001 +From: Alexandre Julliard +Date: Thu, 24 Feb 2011 13:11:53 +0100 +Subject: [PATCH] msxml3: Include the system libxml headers before the Windows + headers. + +[Alexandre Rostovtsev : backport to wine-1.2.3] +--- + dlls/msxml3/attribute.c | 6 ++++++ + dlls/msxml3/bsc.c | 6 ++++++ + dlls/msxml3/cdata.c | 5 +++++ + dlls/msxml3/comment.c | 5 +++++ + dlls/msxml3/dispex.c | 5 +++++ + dlls/msxml3/docfrag.c | 5 +++++ + dlls/msxml3/domdoc.c | 11 +++++++++-- + dlls/msxml3/domimpl.c | 5 +++++ + dlls/msxml3/element.c | 5 +++++ + dlls/msxml3/entityref.c | 5 +++++ + dlls/msxml3/factory.c | 5 +++++ + dlls/msxml3/httprequest.c | 6 ++++++ + dlls/msxml3/main.c | 15 +++++++++++++++ + dlls/msxml3/msxml_private.h | 23 ----------------------- + dlls/msxml3/node.c | 31 +++++++++++++++++++++++++++---- + dlls/msxml3/nodelist.c | 5 +++++ + dlls/msxml3/nodemap.c | 5 +++++ + dlls/msxml3/parseerror.c | 5 +++++ + dlls/msxml3/pi.c | 5 +++++ + dlls/msxml3/queryresult.c | 9 +++++++-- + dlls/msxml3/regsvr.c | 4 ++++ + dlls/msxml3/saxreader.c | 10 +++++++--- + dlls/msxml3/schema.c | 12 ++++++++++++ + dlls/msxml3/text.c | 5 +++++ + dlls/msxml3/xmldoc.c | 5 +++++ + dlls/msxml3/xmlelem.c | 5 +++++ + 26 files changed, 174 insertions(+), 34 deletions(-) + +diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c +index d78fa47..3df93d6 100644 +--- a/dlls/msxml3/attribute.c ++++ b/dlls/msxml3/attribute.c +@@ -23,6 +23,12 @@ + #include "config.h" + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c +index b24e04c..01a09a5 100644 +--- a/dlls/msxml3/bsc.c ++++ b/dlls/msxml3/bsc.c +@@ -23,6 +23,12 @@ + + #include + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c +index 3fba66c..caf8cd8 100644 +--- a/dlls/msxml3/cdata.c ++++ b/dlls/msxml3/cdata.c +@@ -23,6 +23,11 @@ + #include "config.h" + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c +index e74de07..1cabfa3 100644 +--- a/dlls/msxml3/comment.c ++++ b/dlls/msxml3/comment.c +@@ -23,6 +23,11 @@ + #include "config.h" + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c +index 09b71fe..6b01b15 100644 +--- a/dlls/msxml3/dispex.c ++++ b/dlls/msxml3/dispex.c +@@ -22,6 +22,11 @@ + + #include + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c +index fff3f62..bebd252 100644 +--- a/dlls/msxml3/docfrag.c ++++ b/dlls/msxml3/docfrag.c +@@ -23,6 +23,11 @@ + #include "config.h" + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c +index 0007503..e6a61e4 100644 +--- a/dlls/msxml3/domdoc.c ++++ b/dlls/msxml3/domdoc.c +@@ -25,6 +25,15 @@ + + #include + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++# include ++# include ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +@@ -47,8 +56,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); + + #ifdef HAVE_LIBXML2 + +-#include +- + /* not defined in older versions */ + #define XML_SAVE_FORMAT 1 + #define XML_SAVE_NO_DECL 2 +diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c +index dd518a1..c6794ac 100644 +--- a/dlls/msxml3/domimpl.c ++++ b/dlls/msxml3/domimpl.c +@@ -23,6 +23,11 @@ + #include "config.h" + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c +index 617c008..1b5c693 100644 +--- a/dlls/msxml3/element.c ++++ b/dlls/msxml3/element.c +@@ -23,6 +23,11 @@ + #include "config.h" + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c +index db46193..1baea6e 100644 +--- a/dlls/msxml3/entityref.c ++++ b/dlls/msxml3/entityref.c +@@ -23,6 +23,11 @@ + #include "config.h" + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c +index 3fd229c..45df9f0 100644 +--- a/dlls/msxml3/factory.c ++++ b/dlls/msxml3/factory.c +@@ -24,6 +24,11 @@ + #include "config.h" + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c +index 4585484..be1a5f7 100644 +--- a/dlls/msxml3/httprequest.c ++++ b/dlls/msxml3/httprequest.c +@@ -22,6 +22,12 @@ + #include "config.h" + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c +index 60b0cbd..47a89b1 100644 +--- a/dlls/msxml3/main.c ++++ b/dlls/msxml3/main.c +@@ -25,6 +25,21 @@ + #define COBJMACROS + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++# ifdef SONAME_LIBXSLT ++# ifdef HAVE_LIBXSLT_PATTERN_H ++# include ++# endif ++# ifdef HAVE_LIBXSLT_TRANSFORM_H ++# include ++# endif ++# include ++# include ++# endif ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h +index e0279f1..e1fbb59 100644 +--- a/dlls/msxml3/msxml_private.h ++++ b/dlls/msxml3/msxml_private.h +@@ -102,10 +102,6 @@ BOOL dispex_query_interface(DispatchEx*,REFIID,void**); + + #ifdef HAVE_LIBXML2 + +-#ifdef HAVE_LIBXML_PARSER_H +-#include +-#endif +- + /* constructors */ + extern IUnknown *create_domdoc( xmlNodePtr document ); + extern IUnknown *create_xmldoc( void ); +@@ -184,25 +180,6 @@ static inline BSTR bstr_from_xmlChar(const xmlChar *str) + + #endif + +-void* libxslt_handle; +-#ifdef SONAME_LIBXSLT +-# ifdef HAVE_LIBXSLT_PATTERN_H +-# include +-# endif +-# ifdef HAVE_LIBXSLT_TRANSFORM_H +-# include +-# endif +-# include +-# include +- +-# define MAKE_FUNCPTR(f) extern typeof(f) * p##f +-MAKE_FUNCPTR(xsltApplyStylesheet); +-MAKE_FUNCPTR(xsltCleanupGlobals); +-MAKE_FUNCPTR(xsltFreeStylesheet); +-MAKE_FUNCPTR(xsltParseStylesheetDoc); +-# undef MAKE_FUNCPTR +-#endif +- + extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText, + LONG line, LONG linepos, LONG filepos ); + extern HRESULT DOMDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj ); +diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c +index bbdcb5d..2980566 100644 +--- a/dlls/msxml3/node.c ++++ b/dlls/msxml3/node.c +@@ -24,6 +24,23 @@ + + #include + #include ++ ++#ifdef HAVE_LIBXML2 ++# include ++# include ++# include ++# ifdef SONAME_LIBXSLT ++# ifdef HAVE_LIBXSLT_PATTERN_H ++# include ++# endif ++# ifdef HAVE_LIBXSLT_TRANSFORM_H ++# include ++# endif ++# include ++# include ++# endif ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +@@ -33,16 +50,22 @@ + + #include "msxml_private.h" + +-#ifdef HAVE_LIBXML2 +-# include +-#endif +- + #include "wine/debug.h" + + WINE_DEFAULT_DEBUG_CHANNEL(msxml); + + #ifdef HAVE_LIBXML2 + ++#ifdef SONAME_LIBXSLT ++extern void* libxslt_handle; ++# define MAKE_FUNCPTR(f) extern typeof(f) * p##f ++MAKE_FUNCPTR(xsltApplyStylesheet); ++MAKE_FUNCPTR(xsltCleanupGlobals); ++MAKE_FUNCPTR(xsltFreeStylesheet); ++MAKE_FUNCPTR(xsltParseStylesheetDoc); ++# undef MAKE_FUNCPTR ++#endif ++ + static const WCHAR szBinBase64[] = {'b','i','n','.','b','a','s','e','6','4',0}; + static const WCHAR szString[] = {'s','t','r','i','n','g',0}; + static const WCHAR szNumber[] = {'n','u','m','b','e','r',0}; +diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c +index f643c5e..4b2bba9 100644 +--- a/dlls/msxml3/nodelist.c ++++ b/dlls/msxml3/nodelist.c +@@ -23,6 +23,11 @@ + #include "config.h" + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c +index 7d23ec8..d3d9c38 100644 +--- a/dlls/msxml3/nodemap.c ++++ b/dlls/msxml3/nodemap.c +@@ -23,6 +23,11 @@ + #define COBJMACROS + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c +index 4b0dc57..89f14ca 100644 +--- a/dlls/msxml3/parseerror.c ++++ b/dlls/msxml3/parseerror.c +@@ -25,6 +25,11 @@ + + #include + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winerror.h" +diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c +index 0baefe4..3ebc1bf 100644 +--- a/dlls/msxml3/pi.c ++++ b/dlls/msxml3/pi.c +@@ -23,6 +23,11 @@ + #include "config.h" + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c +index 2c6f23e..8613b20 100644 +--- a/dlls/msxml3/queryresult.c ++++ b/dlls/msxml3/queryresult.c +@@ -24,6 +24,13 @@ + #include "config.h" + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +@@ -48,8 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); + + #ifdef HAVE_LIBXML2 + +-#include +- + typedef struct _queryresult + { + DispatchEx dispex; +diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c +index 415e5af..864d61e 100644 +--- a/dlls/msxml3/regsvr.c ++++ b/dlls/msxml3/regsvr.c +@@ -24,6 +24,10 @@ + + #include + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++#endif + + #define COBJMACROS + +diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c +index eca9f1d..f2d340e 100644 +--- a/dlls/msxml3/saxreader.c ++++ b/dlls/msxml3/saxreader.c +@@ -24,6 +24,13 @@ + + #include + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +@@ -43,9 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); + + #ifdef HAVE_LIBXML2 + +-#include +-#include +- + typedef struct _saxreader + { + const struct IVBSAXXMLReaderVtbl *lpVBSAXXMLReaderVtbl; +diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c +index 72d7854..c1465c0 100644 +--- a/dlls/msxml3/schema.c ++++ b/dlls/msxml3/schema.c +@@ -23,6 +23,18 @@ + #include "config.h" + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c +index fdcb06b..72b2ffd 100644 +--- a/dlls/msxml3/text.c ++++ b/dlls/msxml3/text.c +@@ -24,6 +24,11 @@ + #include "config.h" + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c +index d1a010f..0d1006e 100644 +--- a/dlls/msxml3/xmldoc.c ++++ b/dlls/msxml3/xmldoc.c +@@ -23,6 +23,11 @@ + #include "config.h" + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c +index a71b18b..a818d14 100644 +--- a/dlls/msxml3/xmlelem.c ++++ b/dlls/msxml3/xmlelem.c +@@ -23,6 +23,11 @@ + #include "config.h" + + #include ++#ifdef HAVE_LIBXML2 ++# include ++# include ++#endif ++ + #include "windef.h" + #include "winbase.h" + #include "winuser.h" +-- +1.7.8.3 + diff --git a/app-emulation/wine/wine-1.2.3.ebuild b/app-emulation/wine/wine-1.2.3.ebuild index 79876c9434e0..939200d74eb1 100644 --- a/app-emulation/wine/wine-1.2.3.ebuild +++ b/app-emulation/wine/wine-1.2.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.10 2011/09/18 09:08:12 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.11 2012/01/13 00:08:55 tetromino Exp $ EAPI="2" @@ -117,6 +117,7 @@ src_prepare() { eautoreconf fi epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726 + epatch "${FILESDIR}"/${PN}-1.2.3-msxml3-libxml2-headers.patch #397993 epatch_user #282735 sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die sed -i '/^MimeType/d' tools/wine.desktop || die #117785 -- 2.26.2