grim/containers/msys2-cross

Remove the xvfb-run from the exe_wrapper and point the exe_wrapper just to wine. This is done because we should only be running xvfb-run once, instead of a bunch of times

2019-08-29, Gary Kramlich
2e23f5775864
Parents 05b2b2eb1a96
Children d5bfd6e7ff08
Remove the xvfb-run from the exe_wrapper and point the exe_wrapper just to wine. This is done because we should only be running xvfb-run once, instead of a bunch of times
6 files changed, 4 insertions(+), 12 deletions(-)
  • +0 -4
    bin/mingw-w64-i686-exe_wrapper
  • +1 -1
    bin/mingw-w64-i686-wine
  • +0 -4
    bin/mingw-w64-x86_64-exe_wrapper
  • +1 -1
    bin/mingw-w64-x86_64-wine
  • +1 -1
    share/meson/cross/mingw-w64-i686
  • +1 -1
    share/meson/cross/mingw-w64-x86_64
    • --- a/bin/mingw-w64-i686-exe_wrapper Thu Aug 29 17:06:06 2019 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,4 +0,0 @@
    -#!/bin/sh -e
    -
    -xvfb-run -a /usr/local/bin/mingw-w64-i686-wine $@
    -
    --- a/bin/mingw-w64-i686-wine Thu Aug 29 17:06:06 2019 -0500
    +++ b/bin/mingw-w64-i686-wine Thu Aug 29 17:06:40 2019 -0500
    @@ -1,4 +1,4 @@
    #!/bin/sh -e
    -WINEPATH=/windows/mingw32/bin wine $@
    +WINEPATH="${WINEPATH}:/windows/mingw32/bin" wine $@
    --- a/bin/mingw-w64-x86_64-exe_wrapper Thu Aug 29 17:06:06 2019 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,4 +0,0 @@
    -#!/bin/sh -e
    -
    -xvfb-run -a /usr/local/bin/mingw-w64-x86_64-wine $@
    -
    --- a/bin/mingw-w64-x86_64-wine Thu Aug 29 17:06:06 2019 -0500
    +++ b/bin/mingw-w64-x86_64-wine Thu Aug 29 17:06:40 2019 -0500
    @@ -1,4 +1,4 @@
    #!/bin/sh -e
    -WINEPATH=/windows/mingw64/bin wine $@
    +WINEPATH="${WINEPATH}:/windows/mingw64/bin" wine $@
    --- a/share/meson/cross/mingw-w64-i686 Thu Aug 29 17:06:06 2019 -0500
    +++ b/share/meson/cross/mingw-w64-i686 Thu Aug 29 17:06:40 2019 -0500
    @@ -5,7 +5,7 @@
    strip = '/usr/bin/i686-w64-mingw32-strip'
    pkgconfig = '/usr/local/bin/mingw-w64-i686-pkg-config'
    windres = '/usr/bin/i686-w64-mingw32-windres'
    -exe_wrapper = '/usr/local/bin/mingw-w64-i686-exe_wrapper'
    +exe_wrapper = '/usr/local/bin/mingw-w64-i686-wine'
    [properties]
    needs_exe_wrapper = true
    --- a/share/meson/cross/mingw-w64-x86_64 Thu Aug 29 17:06:06 2019 -0500
    +++ b/share/meson/cross/mingw-w64-x86_64 Thu Aug 29 17:06:40 2019 -0500
    @@ -5,7 +5,7 @@
    strip = '/usr/bin/x86_64-w64-mingw32-strip'
    pkgconfig = '/usr/local/bin/mingw-w64-x86_64-pkg-config'
    windres = '/usr/bin/x86_64-w64-mingw32-windres'
    -exe_wrapper = '/usr/local/bin/mingw-w64-x86_64-exe_wrapper'
    +exe_wrapper = '/usr/local/bin/mingw-w64-x86_64-wine'
    [properties]
    needs_exe_wrapper = true