From a01941da192694c79693d0e78ebc92973cbf8e7b Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 3 Oct 2023 09:48:06 +1100 Subject: [PATCH] Rebase against 209b2c23c5e302ed9211d67ab044386d3fe0bef4. --- ...-windows.networking.connectivity-Add-stub-dll.patch | 10 +++++----- staging/upstream-commit | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch b/patches/windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch index 9746c0eb..2ae379a1 100644 --- a/patches/windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch +++ b/patches/windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From cdd3a16e15d5f3add4f26cef603e785d8be6a8a5 Mon Sep 17 00:00:00 2001 +From 36aab37cc208afc5684443e5771bd6aae99cc59f Mon Sep 17 00:00:00 2001 From: Esdras Tarsis Date: Wed, 2 Sep 2020 23:41:19 -0300 Subject: [PATCH] windows.networking.connectivity: Add stub dll. @@ -16,17 +16,17 @@ Signed-off-by: Esdras Tarsis create mode 100644 dlls/windows.networking.connectivity/windows.networking.connectivity_main.c diff --git a/configure.ac b/configure.ac -index b162fac4bea..d438bed30f3 100644 +index d1b63e32cc8..590859a0149 100644 --- a/configure.ac +++ b/configure.ac -@@ -3169,6 +3169,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media/tests) +@@ -3183,6 +3183,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media/tests) WINE_CONFIG_MAKEFILE(dlls/windows.networking.hostname) WINE_CONFIG_MAKEFILE(dlls/windows.networking.hostname/tests) WINE_CONFIG_MAKEFILE(dlls/windows.networking) +WINE_CONFIG_MAKEFILE(dlls/windows.networking.connectivity) WINE_CONFIG_MAKEFILE(dlls/windows.perception.stub) WINE_CONFIG_MAKEFILE(dlls/windows.perception.stub/tests) - WINE_CONFIG_MAKEFILE(dlls/windows.system.profile.systemmanufacturers) + WINE_CONFIG_MAKEFILE(dlls/windows.storage.applicationdata) diff --git a/dlls/windows.networking.connectivity/Makefile.in b/dlls/windows.networking.connectivity/Makefile.in new file mode 100644 index 00000000000..6fc24a72feb @@ -84,5 +84,5 @@ index 00000000000..b6d4561c493 +} \ No newline at end of file -- -2.40.1 +2.42.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index 825bdca6..b52ee6a7 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -3db7506221e44e8091887d7eb42fe1666d422166 +209b2c23c5e302ed9211d67ab044386d3fe0bef4