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

diff --git a/configure.ac b/configure.ac
index ef824291fc621ec4f1b05994e6550edc0646f454..184e7015d572a0e9570460bcd2b0d50eb4adbb55 100644 (file)
--- 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 a66cabd9fea92d11aaf64d3fc99738dfe690faf5..2361f621cd7443696a2d3a64254b4f370d2f069a 100644 (file)
--- 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 96301b1654eb77b12300cb3e1343ff6ca1221241..d6149c9d41cef25d6b1a5b80d9eb7f2e78dd72c7 100644 (file)
--- 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 9f49b9e6f5826fd9cbddbe51cd5d6fc1915c064e..facb4d158be60682f52fb449006e27b534b6b424 100644 (file)
--- 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 a79edabc37cfa9e690186764fab222876f31d33a..93a5bd72e1db7eea0ca0217b979ac9c5af6028dc 100644 (file)
--- 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;