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 new file mode 100644 index 00000000..9772c69e --- /dev/null +++ b/patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch @@ -0,0 +1,35 @@ +From ce5e1fc75139e4de9d92dfe27b4a513a96da013c Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Thu, 2 Oct 2014 19:53:46 +0200 +Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string. + +--- + Makefile.in | 2 +- + dlls/ntdll/Makefile.in | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 307a95b3b1a..61019fed949 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -116,7 +116,7 @@ install-manpages:: manpages + # Rules for generated source files + + dlls/ntdll/unix/version.c: dummy +- @version=`(GIT_DIR=$(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) $@ && exit 1) ++ @version=`(GIT_DIR=$(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=$(srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || (rm -f $@ && exit 1) +diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in +index f39ffb42c6f..67847bb9392 100644 +--- a/dlls/ntdll/Makefile.in ++++ b/dlls/ntdll/Makefile.in +@@ -79,3 +79,4 @@ unix_loader_EXTRADEFS = \ + -DBINDIR=\"${bindir}\" \ + -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \ + -DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\" ++ +-- +2.28.0 + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 258121cc..87df542d 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -1702,10 +1702,11 @@ fi # Patchset Staging # | # | Modified files: -# | * dlls/ntdll/loader.c +# | * Makefile.in, dlls/ntdll/Makefile.in, dlls/ntdll/loader.c # | if test "$enable_Staging" -eq 1; then patch_apply Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch + patch_apply Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch fi # Patchset advapi32-LsaLookupPrivilegeName