Re: include: fix mingw64 build

[Nicolas Le Cam]

2012/6/29 Austin English :
> Fixes http://bugs.winehq.org/show_bug.cgi?id=30980
>
> --
> -Austin

Hi Austin,

I already tried to fix it on Wine side, see [1],
but Alexandre told me on IRC that the bug needs to be fixed in mingw-w64,
as it shouldn't include crtdefs.h by default.

BTW, won't that break mingw32 build ?

[1] http://source.winehq.org/patches/data/84070

include: fix mingw64 build

[Austin English]

On Thu, Jun 28, 2012 at 6:30 PM, Nicolas Le Cam  wrote:
> 2012/6/29 Austin English :
> > Fixes http://bugs.winehq.org/show_bug.cgi?id=30980
> >
> > --
> > -Austin
>
> Hi Austin,
>
> I already tried to fix it on Wine side, see [1],
> but Alexandre told me on IRC that the bug needs to be fixed in mingw-w64,
> as it shouldn't include crtdefs.h by default.
>
> BTW, won't that break mingw32 build ?
>
> [1] http://source.winehq.org/patches/data/84070
>
> --
> Nicolas Le Cam

Thanks for the info. Have you or anyone else discussed this with
mingw64? I did a quick search on their bugtracker, but don't see
anything..
http://sourceforge.net/search/?group_artifact_id=983354&type_of_search=a...

include: fix mingw64 build

[Nicolas Le Cam]

2012/6/29 Austin English :
> On Thu, Jun 28, 2012 at 6:30 PM, Nicolas Le Cam  wrote:
> > 2012/6/29 Austin English :
> > > Fixes http://bugs.winehq.org/show_bug.cgi?id=30980
> > >
> > > --
> > > -Austin
> >
> > Hi Austin,
> >
> > I already tried to fix it on Wine side, see [1],
> > but Alexandre told me on IRC that the bug needs to be fixed in mingw-w64,
> > as it shouldn't include crtdefs.h by default.
> >
> > BTW, won't that break mingw32 build ?
> >
> > [1] http://source.winehq.org/patches/data/84070
> >
> > --
> > Nicolas Le Cam
>
> Thanks for the info. Have you or anyone else discussed this with
> mingw64? I did a quick search on their bugtracker, but don't see
> anything..
> http://sourceforge.net/search/?group_artifact_id=983354&type_of_search=a...
>
> --
> -Austin

No I didn't take the time to report the issue. I cloned their repo and
wanted to send a patch, unfortunately I didn't have the time to work
on that actually.

include: fix mingw64 build

[Jacek Caban]

On 06/29/12 03:35, Austin English wrote:
> On Thu, Jun 28, 2012 at 6:30 PM, Nicolas Le Cam  wrote:
> > 2012/6/29 Austin English :
> > > Fixes http://bugs.winehq.org/show_bug.cgi?id=30980
> > >
> > > --
> > > -Austin
> >
> > Hi Austin,
> >
> > I already tried to fix it on Wine side, see [1],
> > but Alexandre told me on IRC that the bug needs to be fixed in mingw-w64,
> > as it shouldn't include crtdefs.h by default.
> >
> > BTW, won't that break mingw32 build ?
> >
> > [1] http://source.winehq.org/patches/data/84070
> >
> > --
> > Nicolas Le Cam
>
> Thanks for the info. Have you or anyone else discussed this with
> mingw64? I did a quick search on their bugtracker, but don't see
> anything..
> http://sourceforge.net/search/?group_artifact_id=983354&type_of_search=a...

FWIW, here is my proposed patch to mingw-w64:

http://repo.or.cz/w/mingw-w64/jacek.git/commitdiff/5db96424c7b9ac4aa5a66bd0e...

We will see if they like it.

Jacek

include: fix mingw64 build

[Nicolas Le Cam]

2012/7/3 Jacek Caban :
> On 06/29/12 03:35, Austin English wrote:
> > On Thu, Jun 28, 2012 at 6:30 PM, Nicolas Le Cam  wrote:
> > > 2012/6/29 Austin English :
> > > > Fixes http://bugs.winehq.org/show_bug.cgi?id=30980
> > > >
> > > > --
> > > > -Austin
> > >
> > > Hi Austin,
> > >
> > > I already tried to fix it on Wine side, see [1],
> > > but Alexandre told me on IRC that the bug needs to be fixed in mingw-w64,
> > > as it shouldn't include crtdefs.h by default.
> > >
> > > BTW, won't that break mingw32 build ?
> > >
> > > [1] http://source.winehq.org/patches/data/84070
> > >
> > > --
> > > Nicolas Le Cam
> >
> > Thanks for the info. Have you or anyone else discussed this with
> > mingw64? I did a quick search on their bugtracker, but don't see
> > anything..
> > http://sourceforge.net/search/?group_artifact_id=983354&type_of_search=a...
>
> FWIW, here is my proposed patch to mingw-w64:
>
> http://repo.or.cz/w/mingw-w64/jacek.git/commitdiff/5db96424c7b9ac4aa5a66bd0e...
>
> We will see if they like it.
>
> Jacek

Thanks a lot Jacek !

include: fix mingw64 build

[Jacek Caban]

On 07/03/12 20:10, Jacek Caban wrote:
> On 06/29/12 03:35, Austin English wrote:
> > On Thu, Jun 28, 2012 at 6:30 PM, Nicolas Le Cam  wrote:
> > > 2012/6/29 Austin English :
> > > > Fixes http://bugs.winehq.org/show_bug.cgi?id=30980
> > > >
> > > > --
> > > > -Austin
> > >
> > > Hi Austin,
> > >
> > > I already tried to fix it on Wine side, see [1],
> > > but Alexandre told me on IRC that the bug needs to be fixed in mingw-w64,
> > > as it shouldn't include crtdefs.h by default.
> > >
> > > BTW, won't that break mingw32 build ?
> > >
> > > [1] http://source.winehq.org/patches/data/84070
> > >
> > > --
> > > Nicolas Le Cam
> >
> > Thanks for the info. Have you or anyone else discussed this with
> > mingw64? I did a quick search on their bugtracker, but don't see
> > anything..
> > http://sourceforge.net/search/?group_artifact_id=983354&type_of_search=a...
>
> FWIW, here is my proposed patch to mingw-w64:
>
> http://repo.or.cz/w/mingw-w64/jacek.git/commitdiff/5db96424c7b9ac4aa5a66bd0e...
>
> We will see if they like it.

The (extended) fix is in mingw-w64 SVN now.

Jacek

include: fix mingw64 build

[Austin English]

On Wed, Jul 4, 2012 at 8:13 AM, Jacek Caban  wrote:
> On 07/03/12 20:10, Jacek Caban wrote:
> > On 06/29/12 03:35, Austin English wrote:
> > > On Thu, Jun 28, 2012 at 6:30 PM, Nicolas Le Cam  wrote:
> > > > 2012/6/29 Austin English :
> > > > > Fixes http://bugs.winehq.org/show_bug.cgi?id=30980
> > > > >
> > > > > --
> > > > > -Austin
> > > >
> > > > Hi Austin,
> > > >
> > > > I already tried to fix it on Wine side, see [1],
> > > > but Alexandre told me on IRC that the bug needs to be fixed in mingw-w64,
> > > > as it shouldn't include crtdefs.h by default.
> > > >
> > > > BTW, won't that break mingw32 build ?
> > > >
> > > > [1] http://source.winehq.org/patches/data/84070
> > > >
> > > > --
> > > > Nicolas Le Cam
> > >
> > > Thanks for the info. Have you or anyone else discussed this with
> > > mingw64? I did a quick search on their bugtracker, but don't see
> > > anything..
> > > http://sourceforge.net/search/?group_artifact_id=983354&type_of_search=a...
> >
> > FWIW, here is my proposed patch to mingw-w64:
> >
> > http://repo.or.cz/w/mingw-w64/jacek.git/commitdiff/5db96424c7b9ac4aa5a66bd0e...
> >
> > We will see if they like it.
>
> The (extended) fix is in mingw-w64 SVN now.
>
> Jacek

Nice! Thanks.

include: fix mingw64 build

[Nicolas Le Cam]

2012/7/4 Jacek Caban :
> On 07/03/12 20:10, Jacek Caban wrote:
> > On 06/29/12 03:35, Austin English wrote:
> > > On Thu, Jun 28, 2012 at 6:30 PM, Nicolas Le Cam  wrote:
> > > > 2012/6/29 Austin English :
> > > > > Fixes http://bugs.winehq.org/show_bug.cgi?id=30980
> > > > >
> > > > > --
> > > > > -Austin
> > > >
> > > > Hi Austin,
> > > >
> > > > I already tried to fix it on Wine side, see [1],
> > > > but Alexandre told me on IRC that the bug needs to be fixed in mingw-w64,
> > > > as it shouldn't include crtdefs.h by default.
> > > >
> > > > BTW, won't that break mingw32 build ?
> > > >
> > > > [1] http://source.winehq.org/patches/data/84070
> > > >
> > > > --
> > > > Nicolas Le Cam
> > >
> > > Thanks for the info. Have you or anyone else discussed this with
> > > mingw64? I did a quick search on their bugtracker, but don't see
> > > anything..
> > > http://sourceforge.net/search/?group_artifact_id=983354&type_of_search=a...
> >
> > FWIW, here is my proposed patch to mingw-w64:
> >
> > http://repo.or.cz/w/mingw-w64/jacek.git/commitdiff/5db96424c7b9ac4aa5a66bd0e...
> >
> > We will see if they like it.
>
> The (extended) fix is in mingw-w64 SVN now.
>
> Jacek

Hi Jacek,

Could it be backported into stable 2.x ? This will allow distros to
package it with the next stable release of mingw-w64.

include: fix mingw64 build

[Jacek Caban]

On 07/15/12 14:21, Nicolas Le Cam wrote:
> 2012/7/4 Jacek Caban :
> > On 07/03/12 20:10, Jacek Caban wrote:
> > > On 06/29/12 03:35, Austin English wrote:
> > > > On Thu, Jun 28, 2012 at 6:30 PM, Nicolas Le Cam  wrote:
> > > > > 2012/6/29 Austin English :
> > > > > > Fixes http://bugs.winehq.org/show_bug.cgi?id=30980
> > > > > >
> > > > > > --
> > > > > > -Austin
> > > > >
> > > > > Hi Austin,
> > > > >
> > > > > I already tried to fix it on Wine side, see [1],
> > > > > but Alexandre told me on IRC that the bug needs to be fixed in mingw-w64,
> > > > > as it shouldn't include crtdefs.h by default.
> > > > >
> > > > > BTW, won't that break mingw32 build ?
> > > > >
> > > > > [1] http://source.winehq.org/patches/data/84070
> > > > >
> > > > > --
> > > > > Nicolas Le Cam
> > > >
> > > > Thanks for the info. Have you or anyone else discussed this with
> > > > mingw64? I did a quick search on their bugtracker, but don't see
> > > > anything..
> > > > http://sourceforge.net/search/?group_artifact_id=983354&type_of_search=a...
> > >
> > > FWIW, here is my proposed patch to mingw-w64:
> > >
> > > http://repo.or.cz/w/mingw-w64/jacek.git/commitdiff/5db96424c7b9ac4aa5a66bd0e...
> > >
> > > We will see if they like it.
> >
> > The (extended) fix is in mingw-w64 SVN now.
> >
> > Jacek
>
> Hi Jacek,
>
> Could it be backported into stable 2.x ? This will allow distros to
> package it with the next stable release of mingw-w64.

I'm not sure bout that, it's quite an invasive change, so it may be too
risky for stable branch. I'm CCing mingw-w64 ML to see what maintainers
think.

BTW, our Wine Gecko package requires trunk version, so distros compiling
it themselves have provide its packages anyway (I don't really follow it
close enough to have more details). It may be a good idea to use this
version for Wine development.

Jacek

include: fix mingw64 build

[Jacek Caban]

On 07/15/12 14:21, Nicolas Le Cam wrote:
> Hi Jacek,
>
> Could it be backported into stable 2.x ? This will allow distros to
> package it with the next stable release of mingw-w64.

I've just committed it to 2.x branch. It's up to distros now to update
packages.

Jacek

include: fix mingw64 build

[Nicolas Le Cam]

2012/7/17 Jacek Caban :
> On 07/15/12 14:21, Nicolas Le Cam wrote:
> > Hi Jacek,
> >
> > Could it be backported into stable 2.x ? This will allow distros to
> > package it with the next stable release of mingw-w64.
>
> I've just committed it to 2.x branch. It's up to distros now to update
> packages.
>
> Jacek

Thanks a lot Jacek !

include: fix mingw64 build

[Francois Gouget]

On Tue, 17 Jul 2012, Jacek Caban wrote:
> On 07/15/12 14:21, Nicolas Le Cam wrote:
> > Hi Jacek,
> >
> > Could it be backported into stable 2.x ? This will allow distros to
> > package it with the next stable release of mingw-w64.
>
> I've just committed it to 2.x branch. It's up to distros now to update
> packages.

Just in case anyone is interested...

I have built updated mingw-w64-i686-dev and mingw-w64-x86-64-dev
packages for Debian Testing with the fix for bug 30980.

These are the packages one would use to cross-compile Wine to Windows PE
executables, typically to produce 32 and 64 bit Windows Winetest
binaries.

Note that I had to add a couple of patches to get Wine to compile:
* crtdefs.h uses wchar_t but does not define it which was causing
  trouble depending on the order of the includes in the source.
* One of the _mingw.h includes was causing trouble. Replacing it with a
  crtdefs.h include like the others fixed the issue. There is still a
  ton of these so I'm not sure these packages are a full fix. But Wine
  compiles at least.

You'll find the modified packages there:
* http://fgouget.free.fr/tmp/mingw-w64/mingw-w64-i686-dev_2.0.3-2_all.deb
  http://fgouget.free.fr/tmp/mingw-w64/mingw-w64-x86-64-dev_2.0.3-2_all.deb

Packages to generate 32 and 64 bit PE binaries respectively. The other
  packages in the suite are unmodified so grab them from your usual
  Debian repository.

* http://fgouget.free.fr/tmp/mingw-w64/mingw-w64_2.0.3-2.debian.tar.gz
  http://fgouget.free.fr/tmp/mingw-w64/mingw-w64_2.0.3.orig.tar.gz

The package source in case you need to rebuild them.

* http://fgouget.free.fr/tmp/mingw-w64/wine1.patch
  http://fgouget.free.fr/tmp/mingw-w64/wine2.patch

The two extra patches I applied, the first one based on Jacek's r5227
  SVN MinGW commit.

include: fix mingw64 build

[Jacek Caban]

Hi Francois,

On 7/28/12 9:22 AM, Francois Gouget wrote:
> Note that I had to add a couple of patches to get Wine to compile:
> - crtdefs.h uses wchar_t but does not define it which was causing
>  trouble depending on the order of the includes in the source.
> - One of the _mingw.h includes was causing trouble. Replacing it with a
>  crtdefs.h include like the others fixed the issue. There is still a
>  ton of these so I'm not sure these packages are a full fix. But Wine
>  compiles at least.

What's the error you get? I could successfully build Wine with current 
mingw-w64 2.0 branch without errors. I think we should make sure to 
upstream such fixes either to Wine or mingw-w64, depending where 
appropriate.

Jacek

include: fix mingw64 build

[Francois Gouget]

On Sat, 28 Jul 2012, Jacek Caban wrote:
> Hi Francois,
>
> On 7/28/12 9:22 AM, Francois Gouget wrote:
> > Note that I had to add a couple of patches to get Wine to compile:
> > - crtdefs.h uses wchar_t but does not define it which was causing
> >  trouble depending on the order of the includes in the source.
> > - One of the _mingw.h includes was causing trouble. Replacing it with a
> >  crtdefs.h include like the others fixed the issue. There is still a
> >  ton of these so I'm not sure these packages are a full fix. But Wine
> >  compiles at least.
>
> What's the error you get? I could successfully build Wine with current
> mingw-w64 2.0 branch without errors. I think we should make sure to upstream
> such fixes either to Wine or mingw-w64, depending where appropriate.

I cannot reproduce the problem anymore (even when reverting my extra 
patch). It may be that something went wrong the first time I rebuilt the 
MinGW64 package so that it was missing some of your patch.