From 0611b4d10c58e4dd95a6e93ab8c9ae44100b8ab5 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 24 Feb 2023 10:23:41 +1100 Subject: [PATCH] Rebase against 4d0d7e49b9b33bba023ba67add84486ba4cc8efd. --- ...clude-Add-windows.networking.connectivity.idl.patch | 10 +++++----- .../0002-include-Add-windows.networking.idl.patch | 10 +++++----- staging/upstream-commit | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/patches/windows.networking.connectivity-new-dll/0001-include-Add-windows.networking.connectivity.idl.patch b/patches/windows.networking.connectivity-new-dll/0001-include-Add-windows.networking.connectivity.idl.patch index ad54fc2b..d0579a84 100644 --- a/patches/windows.networking.connectivity-new-dll/0001-include-Add-windows.networking.connectivity.idl.patch +++ b/patches/windows.networking.connectivity-new-dll/0001-include-Add-windows.networking.connectivity.idl.patch @@ -1,4 +1,4 @@ -From 880782b69eb8dd2cae56ec6198ab6c1a44a5f2df Mon Sep 17 00:00:00 2001 +From 3cf817bf6bc7a3c6c40b72eac0e7dbed0f2967b2 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 28 May 2021 12:34:37 +1000 Subject: [PATCH] include: Add windows.networking.connectivity.idl @@ -10,17 +10,17 @@ Subject: [PATCH] include: Add windows.networking.connectivity.idl create mode 100644 include/windows.networking.connectivity.idl diff --git a/include/Makefile.in b/include/Makefile.in -index 91c80b54e4e..98517af424d 100644 +index c581fbd80f1..2bba6acea34 100644 --- a/include/Makefile.in +++ b/include/Makefile.in -@@ -813,6 +813,7 @@ SOURCES = \ +@@ -823,6 +823,7 @@ SOURCES = \ windows.media.idl \ windows.media.speechrecognition.idl \ windows.media.speechsynthesis.idl \ + windows.networking.connectivity.idl \ + windows.security.credentials.idl \ windows.security.cryptography.idl \ windows.storage.streams.idl \ - windows.system.idl \ diff --git a/include/windows.networking.connectivity.idl b/include/windows.networking.connectivity.idl new file mode 100644 index 00000000000..3ccefca02fa @@ -396,5 +396,5 @@ index 00000000000..3ccefca02fa + } +} -- -2.35.1 +2.39.2 diff --git a/patches/windows.networking.connectivity-new-dll/0002-include-Add-windows.networking.idl.patch b/patches/windows.networking.connectivity-new-dll/0002-include-Add-windows.networking.idl.patch index 288ac121..4cadc08f 100644 --- a/patches/windows.networking.connectivity-new-dll/0002-include-Add-windows.networking.idl.patch +++ b/patches/windows.networking.connectivity-new-dll/0002-include-Add-windows.networking.idl.patch @@ -1,4 +1,4 @@ -From 712f6b80db26f6475fdf009148c62c2219f7ff88 Mon Sep 17 00:00:00 2001 +From 233f0289061fb756563c41de851064142839a455 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 1 Jun 2021 10:26:28 +1000 Subject: [PATCH] include: Add windows.networking.idl @@ -11,17 +11,17 @@ Signed-off-by: Alistair Leslie-Hughes create mode 100644 include/windows.networking.idl diff --git a/include/Makefile.in b/include/Makefile.in -index 98517af424d..dc1194c508d 100644 +index 2bba6acea34..9d2034063e5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in -@@ -813,6 +813,7 @@ SOURCES = \ +@@ -823,6 +823,7 @@ SOURCES = \ windows.media.idl \ windows.media.speechrecognition.idl \ windows.media.speechsynthesis.idl \ + windows.networking.idl \ windows.networking.connectivity.idl \ + windows.security.credentials.idl \ windows.security.cryptography.idl \ - windows.storage.streams.idl \ diff --git a/include/windows.networking.idl b/include/windows.networking.idl new file mode 100644 index 00000000000..67d8e6a8d0b @@ -116,5 +116,5 @@ index 00000000000..67d8e6a8d0b + } +} -- -2.35.1 +2.39.2 diff --git a/staging/upstream-commit b/staging/upstream-commit index 540348f1..28d2dd29 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -15b176b4f4945d7abfb4adbddc7f140ba1765855 +4d0d7e49b9b33bba023ba67add84486ba4cc8efd