From caa47e6c731a1cd29eb5568c16d012242d6b5375 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 11 Jul 2025 08:16:46 +1000
Subject: [PATCH] Rebase against d1f6b3771376cc8909be712b127125e1b9e4f5d1.

---
 ...ib-Append-Staging-at-the-end-of-the-version-s.patch | 10 +++++-----
 staging/upstream-commit                                |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch b/patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch
index 9ea17246..618ebd58 100644
--- a/patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch
+++ b/patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch
@@ -1,4 +1,4 @@
-From 8aa6fb73e3142d86ba354c204313b8a74a5fa43d Mon Sep 17 00:00:00 2001
+From fb422ad56e3549e81d3b60afc77b0a0c6a56f672 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:53:46 +0200
 Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string.
@@ -8,10 +8,10 @@ Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index f86a5decb07..3d7f9cc96e6 100644
+index b4ede761391..ea6bd2fae3c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3910,7 +3910,7 @@ dnl Rules for generated source files
+@@ -3728,7 +3728,7 @@ dnl Rules for generated source files
  
  WINE_APPEND_RULE(
  [dlls/ntdll/unix/version.c: dummy
@@ -19,7 +19,7 @@ index f86a5decb07..3d7f9cc96e6 100644
 +	@version=\`(GIT_DIR=${wine_srcdir}.git git describe HEAD 2>/dev/null || echo \"wine-\$(PACKAGE_VERSION)\") | sed -n -e '\$\$s/\(.*\)/const char wine_build[[]] = \"\\1 (Staging)\";/p'\` && (echo \$\$version | cmp -s - \$[@]) || echo \$\$version >\$[@] || (rm -f \$[@] && exit 1)
  programs/winetest/build.rc: dummy
  	@build=\"STRINGTABLE { 1 \\\"\`GIT_DIR=${wine_srcdir}.git git rev-parse HEAD 2>/dev/null\`\\\" }\" && (echo \$\$build | cmp -s - \$[@]) || echo \$\$build >\$[@] || (rm -f \$[@] && exit 1)
- programs/winetest/build.nfo:
+ dlls/wineandroid.drv/wine-debug.apk: dlls/wineandroid.drv/build.gradle ${wine_srcdir}dlls/wineandroid.drv/AndroidManifest.xml ${wine_srcdir}dlls/wineandroid.drv/WineActivity.java ${wine_srcdir}dlls/wineandroid.drv/wine.svg
 -- 
-2.33.0
+2.47.2
 
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 69953227..112bfccb 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-177848adf54f6871e558be6b42ee2478a522c3d2
+d1f6b3771376cc8909be712b127125e1b9e4f5d1