From 4fce3f1fd69c2722c9bf007ca8abc554aeceb85d Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Mon, 16 Jul 2018 01:17:09 -0700 Subject: [PATCH] Update iovec with patch making it use winapi-0.3 --- src/iovec/debian/changelog | 2 +- .../debian/patches/b90b433-backport.patch | 30 +++++++++++++++++++ src/iovec/debian/patches/series | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 src/iovec/debian/patches/b90b433-backport.patch create mode 100644 src/iovec/debian/patches/series diff --git a/src/iovec/debian/changelog b/src/iovec/debian/changelog index 841c97c33..09e258c35 100644 --- a/src/iovec/debian/changelog +++ b/src/iovec/debian/changelog @@ -2,4 +2,4 @@ rust-iovec (0.1.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium * Package iovec 0.1.2 from crates.io using debcargo 2.2.3 - -- Paride Legovini Sat, 14 Jul 2018 13:07:55 +0200 + -- Ximin Luo Mon, 16 Jul 2018 01:17:07 -0700 diff --git a/src/iovec/debian/patches/b90b433-backport.patch b/src/iovec/debian/patches/b90b433-backport.patch new file mode 100644 index 000000000..64a10b52c --- /dev/null +++ b/src/iovec/debian/patches/b90b433-backport.patch @@ -0,0 +1,30 @@ +From b90b433f58fb8d64ad6c67d8080cf3da1fce3543 Mon Sep 17 00:00:00 2001 +From: Steffen Butzer +Date: Thu, 21 Dec 2017 15:51:01 +0100 +Subject: [PATCH] migrate to winapi 0.3 + +--- + Cargo.toml | 2 +- + src/sys/windows.rs | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 25ff582..ee1c0d3 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -17,3 +17,3 @@ categories = ["network-programming", "api-bindings"] + version = "0.2" +-[target."cfg(windows)".dependencies.winapi] +-version = "0.2" ++[target."cfg(windows)".dependencies] ++winapi = { version = "0.3", features = ["minwindef", "ws2def"] } +diff --git a/src/sys/windows.rs b/src/sys/windows.rs +index 18681a4..8cc6351 100644 +--- a/src/sys/windows.rs ++++ b/src/sys/windows.rs +@@ -1,3 +1,4 @@ +-use winapi::{WSABUF, DWORD}; ++use winapi::shared::minwindef::DWORD; ++use winapi::shared::ws2def::WSABUF; + use std::{mem, slice, u32}; + diff --git a/src/iovec/debian/patches/series b/src/iovec/debian/patches/series new file mode 100644 index 000000000..69afcd7f1 --- /dev/null +++ b/src/iovec/debian/patches/series @@ -0,0 +1 @@ +b90b433-backport.patch -- 2.39.5