diff --git a/docker/x86_64/mingw64 b/docker/x86_64/mingw64 index 65f1bf6f..92e1183d 100644 --- a/docker/x86_64/mingw64 +++ b/docker/x86_64/mingw64 @@ -1009,6 +1009,7 @@ RUN if [ -f "/3rd_party/nana-v${MY_NANA_VERSION}.tar.gz" ]; then \ cd /3rd_party && sha256sum -c ./nana-v${MY_NANA_VERSION}.tar.gz.sha256 && cd - \ && tar xvzf /3rd_party/nana-v${MY_NANA_VERSION}.tar.gz \ && cd nana-${MY_NANA_VERSION} \ + && /3rd_party/nana_patch.sh /3rd_party . \ && mkdir _build \ && cd _build \ && cmake .. \ diff --git a/support/3rd_party/nana_dragdrop_cpp.patch b/support/3rd_party/nana_dragdrop_cpp.patch new file mode 100644 index 00000000..08dbcc4c --- /dev/null +++ b/support/3rd_party/nana_dragdrop_cpp.patch @@ -0,0 +1,19 @@ +*** source/gui/dragdrop.cpp 2020-05-16 17:08:50.000000000 -0500 +--- source/gui/dragdrop.cpp.new 2024-08-25 19:15:58.989072229 -0500 +*************** +*** 25,31 **** + # include + # include + # include +! # include + #elif defined(NANA_X11) + # include "../detail/posix/xdnd_protocol.hpp" + # include +--- 25,31 ---- + # include + # include + # include +! # include + #elif defined(NANA_X11) + # include "../detail/posix/xdnd_protocol.hpp" + # include diff --git a/support/3rd_party/nana_filebox_cpp.patch b/support/3rd_party/nana_filebox_cpp.patch new file mode 100644 index 00000000..7a8a4b30 --- /dev/null +++ b/support/3rd_party/nana_filebox_cpp.patch @@ -0,0 +1,23 @@ +*** source/gui/filebox.cpp 2020-05-16 17:08:50.000000000 -0500 +--- source/gui/filebox.cpp.new 2024-08-25 19:15:31.242397483 -0500 +*************** +*** 20,28 **** + # include + # include "../detail/mswin/platform_spec.hpp" + # ifndef NANA_MINGW // isn't supported well on MinGW +! # include + # else +! # include + # endif + #elif defined(NANA_POSIX) + # include +--- 20,28 ---- + # include + # include "../detail/mswin/platform_spec.hpp" + # ifndef NANA_MINGW // isn't supported well on MinGW +! # include + # else +! # include + # endif + #elif defined(NANA_POSIX) + # include diff --git a/support/3rd_party/nana_patch.sh b/support/3rd_party/nana_patch.sh new file mode 100755 index 00000000..759d5021 --- /dev/null +++ b/support/3rd_party/nana_patch.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +pushd "$2" +patch -Np0 <"$1/nana_dragdrop_cpp.patch" || exit $? +patch -Np0 <"$1/nana_filebox_cpp.patch" || exit $? +popd