From d79cfe9e5fb57dc8a0890054641ea8315beccc16 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Sat, 25 Nov 2023 07:22:46 +0000
Subject: [PATCH] drmingw: update to 0.9.11

---
 mingw-w64-drmingw/0001-install-files.patch    |  8 ++++----
 .../0002-cmake-fixes-for-clang.patch          | 12 -----------
 .../0002-drmingw-allow-posix-threads.patch    | 13 ++++++++++++
 mingw-w64-drmingw/PKGBUILD                    | 20 +++++++------------
 4 files changed, 24 insertions(+), 29 deletions(-)
 delete mode 100644 mingw-w64-drmingw/0002-cmake-fixes-for-clang.patch
 create mode 100644 mingw-w64-drmingw/0002-drmingw-allow-posix-threads.patch

diff --git a/mingw-w64-drmingw/0001-install-files.patch b/mingw-w64-drmingw/0001-install-files.patch
index f5ac0e823f..dded37c219 100644
--- a/mingw-w64-drmingw/0001-install-files.patch
+++ b/mingw-w64-drmingw/0001-install-files.patch
@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 5787bd9..5bbe346 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -170,7 +170,7 @@ install (
+@@ -158,7 +158,7 @@ install (
      FILES
          LICENSE.txt
          README.md
@@ -17,7 +17,7 @@ index 50a5067..246e22a 100644
 +++ b/sample/CMakeLists.txt
 @@ -6,5 +6,5 @@ add_executable (sample
  add_dependencies (sample exchndl_implib)
- target_link_libraries (sample ${EXCHNDL_IMPLIB})
+ target_link_libraries (sample PRIVATE exchndl_implib)
  
 -install (FILES sample.cpp DESTINATION sample)
 -install (FILES sample.mak DESTINATION sample RENAME Makefile)
@@ -27,7 +27,7 @@ diff --git a/thirdparty/libdwarf.cmake b/thirdparty/libdwarf.cmake
 index 6b7513d..bc1de9c 100644
 --- a/thirdparty/libdwarf.cmake
 +++ b/thirdparty/libdwarf.cmake
-@@ -102,6 +102,6 @@ target_link_libraries (dwarf z)
+@@ -102,6 +102,6 @@ target_link_libraries (dwarf PRIVATE z)
  
  install (
      FILES libdwarf/src/lib/libdwarf/LIBDWARFCOPYRIGHT
@@ -39,7 +39,7 @@ diff --git a/thirdparty/zlib.cmake b/thirdparty/zlib.cmake
 index 44c4dd6..b1c58d1 100644
 --- a/thirdparty/zlib.cmake
 +++ b/thirdparty/zlib.cmake
-@@ -27,6 +27,6 @@ target_include_directories (z PUBLIC zlib)
+@@ -30,6 +30,6 @@ target_include_directories (z PUBLIC zlib)
  
  install (
      FILES zlib/README
diff --git a/mingw-w64-drmingw/0002-cmake-fixes-for-clang.patch b/mingw-w64-drmingw/0002-cmake-fixes-for-clang.patch
deleted file mode 100644
index 61ba5e7045..0000000000
--- a/mingw-w64-drmingw/0002-cmake-fixes-for-clang.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5bbe346..3d09bc1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -96,7 +96,6 @@ endif ()
- if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-     add_definitions (-DHAVE_WIN64=1)
- else ()
--    add_linker_flags (-Wl,--enable-stdcall-fixup)
-     add_definitions (-DHAVE_WIN64=0)
- endif ()
- 
diff --git a/mingw-w64-drmingw/0002-drmingw-allow-posix-threads.patch b/mingw-w64-drmingw/0002-drmingw-allow-posix-threads.patch
new file mode 100644
index 0000000000..c9bce6610a
--- /dev/null
+++ b/mingw-w64-drmingw/0002-drmingw-allow-posix-threads.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4c63490..65fde9e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -61,7 +61,7 @@ execute_process (
+     ERROR_QUIET
+ )
+ if (NOT STATUS_CXX11_THREADS EQUAL 0)
+-    message (SEND_ERROR "Win32 threads required.")
++    message (WARNING "Win32 threads required.")
+ endif ()
+ 
+ # Enable stack protection
diff --git a/mingw-w64-drmingw/PKGBUILD b/mingw-w64-drmingw/PKGBUILD
index b8d621f57e..50260e298d 100644
--- a/mingw-w64-drmingw/PKGBUILD
+++ b/mingw-w64-drmingw/PKGBUILD
@@ -4,12 +4,12 @@
 _realname=drmingw
 pkgbase="mingw-w64-${_realname}"
 pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname})
-pkgver=0.9.8
+pkgver=0.9.11
 pkgrel=1
 pkgdesc="Just-in-Time (JIT) debugger (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
-license=(LGPL2.1)
+license=('spdx:LGPL-2.1-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 makedepends=("${MINGW_PACKAGE_PREFIX}-discount"
              "${MINGW_PACKAGE_PREFIX}-cmake"
@@ -20,34 +20,28 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-discount"
 url='https://github.com/jrfonseca/drmingw'
 source=("${_realname}-${pkgver}::git+https://github.com/jrfonseca/drmingw.git#tag=${pkgver}"
         0001-install-files.patch
-        0002-cmake-fixes-for-clang.patch)
+        0002-drmingw-allow-posix-threads.patch)
 options=(!strip staticlibs)
 sha256sums=('SKIP'
-            '06c3c86d1c36e97fcfe1d1da737597ffe2e83d848c885714bd4d92de098ca74b'
-            'a5339eeb9388b68e2de6fcd894000d86b03f5fabe56e2320ca5343ad08d70376')
+            '14b86049462b5c2ac505f4fbde1a49386ad918fd596e1c6d62bde5831eff15e6'
+            '4faa655ed0edc371e64565fcd9e801fda59fd28150cf5b62a566927fa53e4144')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
   git submodule update --init --depth=1
-  patch -p1 -i "${srcdir}/0001-install-files.patch"
-  patch -p1 -i "${srcdir}/0002-cmake-fixes-for-clang.patch"
+  git apply "${srcdir}/0001-install-files.patch"
+  git apply "${srcdir}/0002-drmingw-allow-posix-threads.patch"
 }
 
 build() {
   [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
-  declare _pthreads_opt="-DPOSIX_THREADS=OFF"
-  if [[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]]; then
-    _pthreads_opt="-DPOSIX_THREADS=ON"
-  fi
-
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
     -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DPYTHON_EXECUTABLE=${MINGW_PREFIX}/bin/python.exe \
-    ${_pthreads_opt} \
     ../${_realname}-${pkgver}
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./