On 08/15/15 19:51, Jacek Caban wrote: > On 08/14/15 21:06, Erik van Pienbroek wrote: >> Jacek Caban schreef op di 11-08-2015 om 15:20 [+0200]: >>> I just pushed cherry-picks to the branch. > Hi Erik, > >> Hi Jacek, >> >> Apparently the just released wine-gecko 2.40 also requires several >> additional commits before it can be built against mingw-w64 4.0.4: >> >> 58b571e - Added new wrl.h file and a few its dependency headers. >> b3d0437 - sal.h: Added _Inout_ define. >> 21c9cbf - winstring.h: Added extern "C" for functions that need it... >> 6249fb9 - extern C fixes in winstring.h and roapi.h. >> e5ebc15 - roapi.h: Fixed a typo. >> eac9192 - roapi.h: Added GetActivationFactory helpers, fixed enum... >> >> Could these commits also be backported to the v4.x branch? >> In Fedora we've manually backported these for now. > I didn't notice those when I did merge from upstream before the final > release, I usually test with mingw-w64 tip. Thanks for investigating it. > > I'm not sure we want those backported. Also, features that are needed by > those are disabled in recent builds anyway and it's probably easy to > avoid build time dependency. I will provide a patch to wine-gecko-2.40 > branch next week.
I just pushed the fix. It was easier than I expected. It takes a lot of time for Sourceforge to update web git interface, but you will find it in wine-gecko-2.40 branch in commit 9ebdac2b8d99d3fe2bffffdf87c381f1a15bfa9e. I'm also attaching it here. Thanks, Jacek
commit 9ebdac2b8d99d3fe2bffffdf87c381f1a15bfa9e Author: Jacek Caban <[email protected]> Date: Mon Aug 17 13:10:33 2015 +0200 Avoid using wrl.h. diff --git a/widget/windows/mozwrlbase.h b/widget/windows/mozwrlbase.h index d82be8f..fb29207 100644 --- a/widget/windows/mozwrlbase.h +++ b/widget/windows/mozwrlbase.h @@ -13,6 +13,9 @@ * 0x502 for XP support. */ +/* Disable in Wine Gecko biulds. */ +#if 0 + #if _WIN32_WINNT < 0x600 #include <windows.h> @@ -75,3 +78,5 @@ AcquireSRWLockShared( #endif // _WIN32_WINNT < 0x600 #include <wrl.h> + +#endif
------------------------------------------------------------------------------
_______________________________________________ Mingw-w64-public mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
