merge bitcoin#21991: libevent 2.1.12-stable

This commit is contained in:
Kittywhiskers Van Gogh 2023-06-20 13:28:05 +00:00 committed by PastaPastaPasta
parent b7d688ed21
commit 96e8ad8062
3 changed files with 5 additions and 26 deletions

View File

@ -1,14 +1,8 @@
package=libevent package=libevent
$(package)_version=2.1.11-stable $(package)_version=2.1.12-stable
$(package)_download_path=https://github.com/libevent/libevent/archive/ $(package)_download_path=https://github.com/libevent/libevent/releases/download/release-$($(package)_version)/
$(package)_file_name=release-$($(package)_version).tar.gz $(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=229393ab2bf0dc94694f21836846b424f3532585bac3468738b7bf752c03901e $(package)_sha256_hash=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
$(package)_patches=0001-fix-windows-getaddrinfo.patch
define $(package)_preprocess_cmds
patch -p1 < $($(package)_patch_dir)/0001-fix-windows-getaddrinfo.patch && \
./autogen.sh
endef
# When building for Windows, we set _WIN32_WINNT to target the same Windows # When building for Windows, we set _WIN32_WINNT to target the same Windows
# version as we do in configure. Due to quirks in libevents build system, this # version as we do in configure. Due to quirks in libevents build system, this

View File

@ -1,15 +0,0 @@
diff -ur libevent-2.1.8-stable.orig/configure.ac libevent-2.1.8-stable/configure.ac
--- libevent-2.1.8-stable.orig/configure.ac 2017-01-29 17:51:00.000000000 +0000
+++ libevent-2.1.8-stable/configure.ac 2020-03-07 01:11:16.311335005 +0000
@@ -389,6 +389,10 @@
#ifdef HAVE_NETDB_H
#include <netdb.h>
#endif
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#endif
]],
[[
getaddrinfo;
Only in libevent-2.1.8-stable: configure.ac~

View File

@ -14,7 +14,7 @@ These are the dependencies currently used by Dash Core. You can find instruction
| GCC | | [7+](https://gcc.gnu.org/) (C++17 support) | | | | | GCC | | [7+](https://gcc.gnu.org/) (C++17 support) | | | |
| glibc | | [2.18](https://www.gnu.org/software/libc/) | | | | | | glibc | | [2.18](https://www.gnu.org/software/libc/) | | | | |
| HarfBuzz-NG | | | | | [Yes](https://github.com/dashpay/dash/blob/develop/depends/packages/qt.mk) | | HarfBuzz-NG | | | | | [Yes](https://github.com/dashpay/dash/blob/develop/depends/packages/qt.mk) |
| libevent | [2.1.11-stable](https://github.com/libevent/libevent/releases) | [2.0.21](https://github.com/bitcoin/bitcoin/pull/18676) | No | | | | libevent | [2.1.12-stable](https://github.com/libevent/libevent/releases) | [2.0.21](https://github.com/bitcoin/bitcoin/pull/18676) | No | | |
| libnatpmp | git commit [4536032...](https://github.com/miniupnp/libnatpmp/tree/4536032ae32268a45c073a4d5e91bbab4534773a) | | No | | | | libnatpmp | git commit [4536032...](https://github.com/miniupnp/libnatpmp/tree/4536032ae32268a45c073a4d5e91bbab4534773a) | | No | | |
| libpng | | | | | [Yes](https://github.com/dashpay/dash/blob/develop/depends/packages/qt.mk) | | libpng | | | | | [Yes](https://github.com/dashpay/dash/blob/develop/depends/packages/qt.mk) |
| Linux Kernel | [N/A](https://www.kernel.org/) | 3.2.0 | | | | | Linux Kernel | [N/A](https://www.kernel.org/) | 3.2.0 | | | |