pkgs/tools/archivers/7zz/fix-cross-mingw-build.patch

   1 --- a/C/7zip_gcc_c.mak
   2 +++ b/C/7zip_gcc_c.mak
   3 @@ -106,7 +106,7 @@
   4  endif
   5
   6
   7 -LIB2 = -lOle32 -loleaut32 -luuid -ladvapi32 -lUser32 -lShell32
   8 +LIB2 = -lole32 -loleaut32 -luuid -ladvapi32 -luser32 -lshell32
   9
  10  CFLAGS_EXTRA = -DUNICODE -D_UNICODE
  11  # -Wno-delete-non-virtual-dtor
  12 --- a/C/7zVersion.rc
  13 +++ b/C/7zVersion.rc
  14 @@ -5,7 +5,7 @@
  15  #define MY_VFT_APP  0x00000001L
  16  #define MY_VFT_DLL  0x00000002L
  17
  18 -// #include <WinVer.h>
  19 +// #include <winver.h>
  20
  21  #ifndef MY_VERSION
  22  #include "7zVersion.h"
  23 --- a/C/Util/7zipInstall/resource.rc
  24 +++ b/C/Util/7zipInstall/resource.rc
  25 @@ -1,7 +1,7 @@
  26  #include <windows.h>
  27  // #include <winnt.h>
  28  // #include <WinUser.h>
  29 -#include <CommCtrl.h>
  30 +#include <commctrl.h>
  31
  32  #define USE_COPYRIGHT_CR
  33  #include "../../7zVersion.rc"
  34 --- a/C/Util/7zipInstall/resource.rc.rej
  35 +++ b/C/Util/7zipInstall/resource.rc.rej
  36 @@ -0,0 +1,10 @@
  37 +--- C/Util/7zipInstall/resource.rc
  38 ++++ C/Util/7zipInstall/resource.rc
  39 +@@ -1,6 +1,6 @@
  40 + #include <winnt.h>
  41 + #include <WinUser.h>
  42 +-#include <CommCtrl.h>
  43 ++#include <commctrl.h>
  44 +
  45 + #define USE_COPYRIGHT_CR
  46 + #include "../../7zVersion.rc"
  47 --- a/C/Util/7zipUninstall/resource.rc
  48 +++ b/C/Util/7zipUninstall/resource.rc
  49 @@ -1,7 +1,7 @@
  50  #include <windows.h>
  51  // #include <winnt.h>
  52  // #include <WinUser.h>
  53 -#include <CommCtrl.h>
  54 +#include <commctrl.h>
  55
  56  #define USE_COPYRIGHT_CR
  57  #include "../../7zVersion.rc"
  58 --- a/C/Util/7zipUninstall/resource.rc.rej
  59 +++ b/C/Util/7zipUninstall/resource.rc.rej
  60 @@ -0,0 +1,10 @@
  61 +--- C/Util/7zipUninstall/resource.rc
  62 ++++ C/Util/7zipUninstall/resource.rc
  63 +@@ -1,6 +1,6 @@
  64 + #include <winnt.h>
  65 + #include <WinUser.h>
  66 +-#include <CommCtrl.h>
  67 ++#include <commctrl.h>
  68 +
  69 + #define USE_COPYRIGHT_CR
  70 + #include "../../7zVersion.rc"
  71 --- a/CPP/7zip/7zip_gcc.mak
  72 +++ b/CPP/7zip/7zip_gcc.mak
  73 @@ -142,8 +142,8 @@
  74  DEL_OBJ_EXE = -$(RM) $(O)\*.o $(O)\$(PROG).exe $(O)\$(PROG).dll
  75  endif
  76
  77 -LIB2_GUI = -lOle32 -lGdi32 -lComctl32 -lComdlg32 -lShell32 $(LIB_HTMLHELP)
  78 -LIB2 = -loleaut32 -luuid -ladvapi32 -lUser32 $(LIB2_GUI)
  79 +LIB2_GUI = -lole32 -lgdi32 -lcomctl32 -lcomdlg32 -lshell32 $(LIB_HTMLHELP)
  80 +LIB2 = -loleaut32 -luuid -ladvapi32 -luser32 $(LIB2_GUI)
  81
  82  # v24.00: -DUNICODE and -D_UNICODE are defined in precompilation header files
  83  # CXXFLAGS_EXTRA = -DUNICODE -D_UNICODE
  84 --- a/CPP/7zip/Crypto/RandGen.cpp
  85 +++ b/CPP/7zip/Crypto/RandGen.cpp
  86 @@ -19,7 +19,7 @@
  87
  88  #ifdef USE_STATIC_RtlGenRandom
  89
  90 -// #include <NTSecAPI.h>
  91 +// #include <ntsecapi.h>
  92
  93  EXTERN_C_BEGIN
  94  #ifndef RtlGenRandom
  95 --- a/CPP/7zip/GuiCommon.rc
  96 +++ b/CPP/7zip/GuiCommon.rc
  97 @@ -4,7 +4,7 @@
  98  // #include <WinUser.h>
  99
 100  // for Windows CE:
 101 -#include <CommCtrl.h>
 102 +#include <commctrl.h>
 103
 104
 105  LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 106 --- a/CPP/7zip/UI/FileManager/PanelItemOpen.cpp
 107 +++ b/CPP/7zip/UI/FileManager/PanelItemOpen.cpp
 108 @@ -4,7 +4,7 @@
 109
 110  #include "../../../Common/MyWindows.h"
 111
 112 -#include <TlHelp32.h>
 113 +#include <tlhelp32.h>
 114
 115  #include "../../../Common/IntToString.h"
 116
 117 --- a/CPP/7zip/UI/FileManager/SysIconUtils.h
 118 +++ b/CPP/7zip/UI/FileManager/SysIconUtils.h
 119 @@ -5,7 +5,7 @@
 120
 121  #include "../../../Common/MyWindows.h"
 122
 123 -#include <CommCtrl.h>
 124 +#include <commctrl.h>
 125
 126  #include "../../../Common/MyString.h"
 127
 128 --- a/CPP/Windows/Control/ComboBox.h
 129 +++ b/CPP/Windows/Control/ComboBox.h
 130 @@ -5,7 +5,7 @@
 131
 132  #include "../../Common/MyWindows.h"
 133
 134 -#include <CommCtrl.h>
 135 +#include <commctrl.h>
 136
 137  #include "../Window.h"
 138
 139 --- a/CPP/Windows/Control/ImageList.h
 140 +++ b/CPP/Windows/Control/ImageList.h
 141 @@ -3,7 +3,7 @@
 142  #ifndef ZIP7_INC_WINDOWS_CONTROL_IMAGE_LIST_H
 143  #define ZIP7_INC_WINDOWS_CONTROL_IMAGE_LIST_H
 144
 145 -#include <CommCtrl.h>
 146 +#include <commctrl.h>
 147
 148  #include "../Defs.h"
 149
 150 --- a/CPP/Windows/Control/ListView.h
 151 +++ b/CPP/Windows/Control/ListView.h
 152 @@ -5,7 +5,7 @@
 153
 154  #include "../../Common/MyWindows.h"
 155
 156 -#include <CommCtrl.h>
 157 +#include <commctrl.h>
 158
 159  #include "../Window.h"
 160
 161 --- a/CPP/Windows/Control/ProgressBar.h
 162 +++ b/CPP/Windows/Control/ProgressBar.h
 163 @@ -5,7 +5,7 @@
 164
 165  #include "../../Common/MyWindows.h"
 166
 167 -#include <CommCtrl.h>
 168 +#include <commctrl.h>
 169
 170  #include "../Window.h"
 171
 172 --- a/CPP/Windows/SecurityUtils.h
 173 +++ b/CPP/Windows/SecurityUtils.h
 174 @@ -3,7 +3,7 @@
 175  #ifndef ZIP7_INC_WINDOWS_SECURITY_UTILS_H
 176  #define ZIP7_INC_WINDOWS_SECURITY_UTILS_H
 177
 178 -#include <NTSecAPI.h>
 179 +#include <ntsecapi.h>
 180
 181  #include "Defs.h"
 182