From 8855b7d11e015b29216e1df1aa9f275305edc07f Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 5 Jul 2023 20:23:33 +0200 Subject: [PATCH] - added winsock patch (avoid including in _ptw32.h, is enough); release 2 --- crossmingw32-pthreads-w32.spec | 4 +++- pthreads4w-winsock.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pthreads4w-winsock.patch diff --git a/crossmingw32-pthreads-w32.spec b/crossmingw32-pthreads-w32.spec index 66714d5..58a09a5 100644 --- a/crossmingw32-pthreads-w32.spec +++ b/crossmingw32-pthreads-w32.spec @@ -2,11 +2,12 @@ Summary: POSIX Threads component implementation for Win32 - MinGW32 cross versio Summary(pl.UTF-8): Implementacja komponentu POSIX Threads dla Win32 - wersja skrośna dla MinGW32 Name: crossmingw32-pthreads-w32 Version: 2.11.0 -Release: 1 +Release: 2 License: LGPL v2.1 Group: Development/Libraries Source0: https://downloads.sourceforge.net/pthreads4w/pthreads4w-code-v%{version}.zip # Source0-md5: 75c3ade4fa6aeff1d1d25d33f6bbce12 +Patch0: pthreads4w-winsock.patch URL: https://sourceforge.net/p/pthreads4w/wiki/Home/ BuildRequires: crossmingw32-gcc BuildRequires: crossmingw32-runtime >= 1:5.4.2-2 @@ -83,6 +84,7 @@ POSIX Threads - biblioteka DLL dla Windows. %prep %setup -q -n pthreads4w-code-9808f0b151e6c6efe2d57f3b54a1fb9a19d1eb88 +%patch0 -p1 mkdir lib diff --git a/pthreads4w-winsock.patch b/pthreads4w-winsock.patch new file mode 100644 index 0000000..e68e798 --- /dev/null +++ b/pthreads4w-winsock.patch @@ -0,0 +1,13 @@ +Avoid as it conflicts with ; is enough here + +--- pthreads4w-code-9808f0b151e6c6efe2d57f3b54a1fb9a19d1eb88/_ptw32.h.orig 2018-08-08 12:49:00.000000000 +0200 ++++ pthreads4w-code-9808f0b151e6c6efe2d57f3b54a1fb9a19d1eb88/_ptw32.h 2023-07-05 20:16:58.381825453 +0200 +@@ -165,7 +165,7 @@ + * note: ETIMEDOUT is no longer defined in winsock.h + * WSAETIMEDOUT is so use its value. + */ +-# include ++# include + # if defined(WSAETIMEDOUT) + # define ETIMEDOUT WSAETIMEDOUT + # else -- 2.43.0