From e7e2957c80f113c08656987b492f514db67419ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
Date: Fri, 30 May 2025 14:52:23 +0300
Subject: [PATCH] libevent: Fix mingw32 build flags. Fix dll version (#24410)

* libevent: Fix mingw32 build flags. Fix dll version

* libevent rebuilds

---------

Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
---
 mingw-w64-libevent/007-fix-dll-version.patch | 11 +++++++++++
 mingw-w64-libevent/PKGBUILD                  | 16 ++++++++++++----
 mingw-w64-tor/PKGBUILD                       |  2 +-
 mingw-w64-transmission/PKGBUILD              |  2 +-
 4 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 mingw-w64-libevent/007-fix-dll-version.patch

diff --git a/mingw-w64-libevent/007-fix-dll-version.patch b/mingw-w64-libevent/007-fix-dll-version.patch
new file mode 100644
index 0000000000..0c11b879e9
--- /dev/null
+++ b/mingw-w64-libevent/007-fix-dll-version.patch
@@ -0,0 +1,11 @@
+--- libevent-2.1.12-stable/cmake/AddEventLibrary.cmake.orig	2025-05-26 14:16:21.442791800 +0300
++++ libevent-2.1.12-stable/cmake/AddEventLibrary.cmake	2025-05-26 14:16:27.044588200 +0300
+@@ -133,7 +133,7 @@
+             set_target_properties(
+                 "${LIB_NAME}_shared" PROPERTIES
+                 OUTPUT_NAME "${LIB_NAME}"
+-                SOVERSION ${EVENT_ABI_LIBVERSION})
++                SOVERSION ${EVENT_ABI_LIBVERSION_CURRENT})
+         elseif (APPLE)
+             math(EXPR COMPATIBILITY_VERSION "${EVENT_ABI_LIBVERSION_CURRENT}+1")
+             math(EXPR CURRENT_MINUS_AGE "${EVENT_ABI_LIBVERSION_CURRENT}-${EVENT_ABI_LIBVERSION_AGE}")
diff --git a/mingw-w64-libevent/PKGBUILD b/mingw-w64-libevent/PKGBUILD
index 29e8fd73c9..ea2414f33e 100644
--- a/mingw-w64-libevent/PKGBUILD
+++ b/mingw-w64-libevent/PKGBUILD
@@ -5,7 +5,7 @@ _realname=libevent
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.1.12
-pkgrel=9
+pkgrel=11
 pkgdesc="An event notification library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -28,14 +28,16 @@ source=(https://github.com/${_realname}/${_realname}/releases/download/release-$
         '003-cmake-update.patch'
         '004-time_t-compute.patch'
         '005-limit-MSVC-to-clang-cl.patch::https://github.com/libevent/libevent/commit/236762a3.patch'
-        '006-fix-build-on-aarch64.patch')
+        '006-fix-build-on-aarch64.patch'
+        '007-fix-dll-version.patch')
 sha256sums=('92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb'
             'e572ed628daba12915aaa5867b35ef1b0ca3ed3eb6e9759f97136dd8eab32c08'
             'a587d4698b6fa2caba9e08388aba5f4ca6f4584a780c228df5b32e1260cf20c2'
             'be138bacbe5e8e95b5c6d593cfc69c6f663046561dd67e334b429ccf9dd29bf1'
             'e4c72c765ab33e3a606ba471496af41264909653863e0bef5017552db8c867fc'
             '30d91d6370789720ae9dc5be6e9164a7bae46313c10c66b8f37dbd1ec1a258f1'
-            '249d6255e3f9a89fae149ed67e33e23e3fa10a9e2604a606c3855f5ea0e2dc20')
+            '249d6255e3f9a89fae149ed67e33e23e3fa10a9e2604a606c3855f5ea0e2dc20'
+            '111dab201d50a6929af68222f8545e9b34973c3eb4cc36f7065fc7f5f7ccb3df')
 
 _apply_patch_with_msg() {
   for _patch in "$@"
@@ -60,7 +62,8 @@ prepare() {
     003-cmake-update.patch \
     004-time_t-compute.patch \
     005-limit-MSVC-to-clang-cl.patch \
-    006-fix-build-on-aarch64.patch
+    006-fix-build-on-aarch64.patch \
+    007-fix-dll-version.patch
 }
 
 build() {
@@ -73,6 +76,11 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
+  if [ "${CARCH}" = "i686" ]; then
+    # Need for 32-bit toolchain to have 64bit time
+    CFLAGS+=" -D__MINGW_USE_VC2005_COMPAT"
+  fi
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     "${MINGW_PREFIX}"/bin/cmake.exe \
       -GNinja \
diff --git a/mingw-w64-tor/PKGBUILD b/mingw-w64-tor/PKGBUILD
index 05eb96c76e..e3a319e1d7 100644
--- a/mingw-w64-tor/PKGBUILD
+++ b/mingw-w64-tor/PKGBUILD
@@ -4,7 +4,7 @@ _realname=tor
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.4.8.16
-pkgrel=2
+pkgrel=3
 pkgdesc="Anonymizing overlay network (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
diff --git a/mingw-w64-transmission/PKGBUILD b/mingw-w64-transmission/PKGBUILD
index 52d6a1a979..e8113769ab 100644
--- a/mingw-w64-transmission/PKGBUILD
+++ b/mingw-w64-transmission/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-cli"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-gtk"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-qt")
 pkgver=4.0.6
-pkgrel=4
+pkgrel=5
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 msys2_references=(