From 302ce1f50d733fd1672d971e7cc2cb965875cd88 Mon Sep 17 00:00:00 2001
From: Debian Wine Party <debian-wine@lists.debian.org>
Date: Tue, 13 Sep 2022 01:46:21 +0100
Subject: [PATCH] append debian package revision to the end of the version
 string

origin: https://github.com/wine-compholio/wine-staging/blob/master/patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch
forwarded: not-needed


Gbp-Pq: Topic debianization
Gbp-Pq: Name version-string.patch
---
 configure.ac                   | 7 +++++--
 dlls/ntdll/Makefile.in         | 2 --
 dlls/ntdll/unix/loader.c       | 1 +
 dlls/ntdll/unix/system.c       | 1 +
 dlls/ntdll/unix/unix_private.h | 2 --
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index ef82429..184e701 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3812,8 +3812,11 @@ WINE_APPEND_RULE(
 dnl Rules for generated source files
 
 WINE_APPEND_RULE(
-[dlls/ntdll/unix/version.c: dummy
-	@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\";/p'\` && (echo \$\$version | cmp -s - \$[@]) || echo \$\$version >\$[@] || (rm -f \$[@] && exit 1)
+[
+dlls/ntdll/unix/loader.o: dlls/ntdll/unix/version.h
+dlls/ntdll/unix/system.o: dlls/ntdll/unix/version.h
+dlls/ntdll/unix/version.h: dummy
+	@echo \"#ifndef wine_build\\n#define wine_build \\\"wine-\$(PACKAGE_VERSION) (\$(VENDOR))\\\"\n#endif\" > \$@ || (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:
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index a66cabd..2361f62 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -69,8 +69,6 @@ C_SRCS = \
 
 RC_SRCS = version.rc
 
-EXTRA_OBJS = unix/version.o
-
 unix_loader_EXTRADEFS = \
 	-DBINDIR=\"${bindir}\" \
 	-DSYSTEMDLLPATH=\"${system_dllpath}\" \
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index 96301b1..d6149c9 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -23,6 +23,7 @@
 #endif
 
 #include "config.h"
+#include "version.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c
index 9f49b9e..facb4d1 100644
--- a/dlls/ntdll/unix/system.c
+++ b/dlls/ntdll/unix/system.c
@@ -23,6 +23,7 @@
 #endif
 
 #include "config.h"
+#include "version.h"
 
 #include <fcntl.h>
 #include <string.h>
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index a79edab..93a5bd7 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -108,8 +108,6 @@ extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT
 
 struct _FILE_FS_DEVICE_INFORMATION;
 
-extern const char wine_build[] DECLSPEC_HIDDEN;
-
 extern const char *home_dir DECLSPEC_HIDDEN;
 extern const char *data_dir DECLSPEC_HIDDEN;
 extern const char *build_dir DECLSPEC_HIDDEN;
-- 
2.30.2