From 0fda7dcfef3e76a0b3a9af1e3bed6f3a971f4e6c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 25 Nov 2023 15:16:55 +0100 Subject: [PATCH] fix stdcall macro naming --- mingw-w64-mecab/0002-fix-stdcall.patch | 11 +++++++++++ mingw-w64-mecab/PKGBUILD | 7 +++++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 mingw-w64-mecab/0002-fix-stdcall.patch diff --git a/mingw-w64-mecab/0002-fix-stdcall.patch b/mingw-w64-mecab/0002-fix-stdcall.patch new file mode 100644 index 0000000000..3f653f80ce --- /dev/null +++ b/mingw-w64-mecab/0002-fix-stdcall.patch @@ -0,0 +1,11 @@ +--- mecab-0.996/src/thread.h.orig 2012-10-28 05:07:26.000000000 +0100 ++++ mecab-0.996/src/thread.h 2023-11-25 15:14:54.702179400 +0100 +@@ -35,7 +35,7 @@ + #define MECAB_USE_THREAD 1 + #define BEGINTHREAD(src, stack, func, arg, flag, id) \ + (HANDLE)_beginthreadex((void *)(src), (unsigned)(stack), \ +- (unsigned(_stdcall *)(void *))(func), (void *)(arg), \ ++ (unsigned(__stdcall *)(void *))(func), (void *)(arg), \ + (unsigned)(flag), (unsigned *)(id)) + #endif + diff --git a/mingw-w64-mecab/PKGBUILD b/mingw-w64-mecab/PKGBUILD index 49fd7e3726..a6f0616cf7 100644 --- a/mingw-w64-mecab/PKGBUILD +++ b/mingw-w64-mecab/PKGBUILD @@ -15,7 +15,8 @@ source=("https://deb.debian.org/debian/pool/main/m/mecab/mecab_0.996.orig.tar.gz "mecab-0.996.diff" "mecab-0.996-iconv.patch" "mecab-0.996-naist-jdic.patch" - "0001-dont-ignore-flags.patch") + "0001-dont-ignore-flags.patch" + "0002-fix-stdcall.patch") install=${_realname}-${MSYSTEM}.install makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools") @@ -25,7 +26,8 @@ sha256sums=('e073325783135b72e666145c781bb48fada583d5224fb2490fb6c1403ba69c59' '88a56efae57e30ffcc1b117fe152f37dd7bc419368b1d0e422d5b62245dd2d5c' '2dff2b3ae7faec432885a804210d55e2ed68b1af03c138e8297e0c510ef48bdf' '222cc3938da2e9cd79908ceeda15889f4fe78664fb61ddb83a2a18f9809c4c6b' - 'c058e0bffe30ec2edc922a33535e113541f39ece04939ab0e1d08d67f4453b4a') + 'c058e0bffe30ec2edc922a33535e113541f39ece04939ab0e1d08d67f4453b4a' + 'da8c59805a66549759dde8fb6241ecee1b43a73b0b99269be68bb688203f63ea') prepare() { cd ${_realname}-${pkgver} @@ -34,6 +36,7 @@ prepare() { patch -p1 -i ${srcdir}/mecab-0.996-naist-jdic.patch patch -p1 -i ${srcdir}/0001-dont-ignore-flags.patch + patch -p1 -i ${srcdir}/0002-fix-stdcall.patch sed -i.orig -e '/^AC_CHECK_LIB(stdc++/d' configure.in mkdir -p m4