From a468e448cfecf0a669b30030e57672ff360be4e6 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Fri, 6 Oct 2017 22:46:13 +0200
Subject: [PATCH] Update versioninfo.rc.in

- let versioninfo be visible in explorer by adding a "Translation" value
- use constants
- fix strings

BUG: https://bugs.freedesktop.org/show_bug.cgi?id=103015
---
 configure.ac           |  2 +-
 dbus/versioninfo.rc.in | 28 +++++++++++++++++-----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index fed2ba09..e1ba012c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,7 +146,7 @@ if test "$dbus_win" = yes; then
     # Yes, on Windows it really does work like this.
     # http://support.microsoft.com/kb/111855
     AC_DEFINE(FD_SETSIZE,8192,[The maximum number of connections that can be handled at once])
-    BUILD_TIMESTAMP=`date --iso-8601=minutes`
+    BUILD_TIMESTAMP=`date --iso-8601=minutes | sed ':a;N;$!ba;s/\n//g'`
     AC_SUBST(BUILD_TIMESTAMP)
     # Assume DBUS_VERSION is always three numbers
     BUILD_FILEVERSION=`echo "$DBUS_VERSION" | sed -e 's/\./,/g'`,0
diff --git a/dbus/versioninfo.rc.in b/dbus/versioninfo.rc.in
index 354c3432..6c40095e 100644
--- a/dbus/versioninfo.rc.in
+++ b/dbus/versioninfo.rc.in
@@ -15,37 +15,43 @@
 #line __LINE__ "versioninfo.rc.in"
 
 
+#include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @BUILD_FILEVERSION@
  PRODUCTVERSION @BUILD_FILEVERSION@
  FILEFLAGSMASK 0x3fL
+ FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
- FILEFLAGS 0x21L
+ FILEFLAGS VS_FF_DEBUG
 #else
- FILEFLAGS 0x20L
+ FILEFLAGS 0x0L
 #endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE VFT2_UNKNOWN
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "Comments", "Provided under the terms of the GNU Lesser General Public License.\0"
-            VALUE "CompanyName", "FreeDesktop.org\0"
+            VALUE "Comments", "Provided under the terms of the GNU Lesser General Public License >= 2.0 or Academic Free License version 2.1\0"
+            VALUE "CompanyName", "freedesktop.org\0"
             VALUE "FileDescription", "dbus - FreeDesktop message bus system\0"
             VALUE "FileVersion", "@DBUS_VERSION@\0"
-            VALUE "InternalName", "dbus\0"
-            VALUE "LegalCopyright", "Copyright © 2009 FreeDesktop.org\0"
+            VALUE "InternalName", "libdbus-1-3\0"
+            VALUE "LegalCopyright", "Copyright © 2002-2017 freedesktop.org\0"
             VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "dbus-1.dll\0"
-            VALUE "PrivateBuild", "\0"
+            VALUE "OriginalFilename", "libdbus-1-3.dll\0"
             VALUE "ProductName", "dbus\0"
             VALUE "ProductVersion", "@DBUS_VERSION@\0"
             VALUE "SpecialBuild", "@BUILD_TIMESTAMP@\0"
         END
     END
+    BLOCK "VarFileInfo"
+    BEGIN
+        /* supports English language (0x409) in the Windows ANSI codepage (1252). */
+        VALUE "Translation", 0x409, 1252
+    END
 END
 
-- 
2.12.3