From c4de5ab77433afa6fdd1b81baefb9fe001dbf6bf Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 21 Jan 2017 21:17:51 +0100
Subject: [PATCH] winecfg-Staging: Add ' (Staging)' suffix in about dialog.

---
 patches/patchinstall.sh                       |  4 +--
 ...001-winecfg-Add-staging-tab-for-CSMT.patch | 32 +++++++++++++------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index bd44f203..1a251733 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -4129,8 +4129,8 @@ fi
 # Patchset winecfg-Staging
 # |
 # | Modified files:
-# |   *	programs/winecfg/Makefile.in, programs/winecfg/main.c, programs/winecfg/resource.h, programs/winecfg/staging.c,
-# | 	programs/winecfg/winecfg.h, programs/winecfg/winecfg.rc
+# |   *	programs/winecfg/Makefile.in, programs/winecfg/about.c, programs/winecfg/main.c, programs/winecfg/resource.h,
+# | 	programs/winecfg/staging.c, programs/winecfg/winecfg.h, programs/winecfg/winecfg.rc
 # |
 if test "$enable_winecfg_Staging" -eq 1; then
 	patch_apply winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch
diff --git a/patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch b/patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch
index 868d208c..8e3209b7 100644
--- a/patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch
+++ b/patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch
@@ -1,20 +1,21 @@
-From d19a6f79481387bd7d65895c31fd861f1658aca9 Mon Sep 17 00:00:00 2001
+From 904bdc3642145764bc8f549ca901c891bda1df14 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 14 Dec 2014 20:42:45 +0100
 Subject: winecfg: Add staging tab for CSMT.
 
 ---
  programs/winecfg/Makefile.in |  1 +
+ programs/winecfg/about.c     |  2 +-
  programs/winecfg/main.c      | 12 ++++++-
  programs/winecfg/resource.h  |  5 +++
  programs/winecfg/staging.c   | 86 ++++++++++++++++++++++++++++++++++++++++++++
  programs/winecfg/winecfg.h   |  1 +
  programs/winecfg/winecfg.rc  | 10 ++++++
- 6 files changed, 114 insertions(+), 1 deletion(-)
+ 7 files changed, 115 insertions(+), 2 deletions(-)
  create mode 100644 programs/winecfg/staging.c
 
 diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
-index 7b52a69..c86fdd0 100644
+index 7b52a6943e4..c86fdd07d0e 100644
 --- a/programs/winecfg/Makefile.in
 +++ b/programs/winecfg/Makefile.in
 @@ -11,6 +11,7 @@ C_SRCS = \
@@ -25,8 +26,21 @@ index 7b52a69..c86fdd0 100644
  	theme.c \
  	winecfg.c \
  	x11drvdlg.c
+diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c
+index 09cc0151574..a5251915533 100644
+--- a/programs/winecfg/about.c
++++ b/programs/winecfg/about.c
+@@ -118,7 +118,7 @@ AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+             SendMessageW(hWnd, WM_SETFONT, (WPARAM)titleFont, TRUE);
+             SetWindowTextA(hWnd, PACKAGE_NAME);
+         }
+-        SetDlgItemTextA(hDlg, IDC_ABT_PANEL_TEXT, PACKAGE_VERSION);
++        SetDlgItemTextA(hDlg, IDC_ABT_PANEL_TEXT, PACKAGE_VERSION " (Staging)");
+ 
+         /* prepare the web link */
+         SetDlgItemTextA(hDlg, IDC_ABT_WEB_LINK, "<a href=\"" PACKAGE_URL "\">" PACKAGE_URL "</a>");
 diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c
-index b8a85fe..de209a9 100644
+index b8a85fe7175..de209a925cc 100644
 --- a/programs/winecfg/main.c
 +++ b/programs/winecfg/main.c
 @@ -58,7 +58,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
@@ -56,7 +70,7 @@ index b8a85fe..de209a9 100644
       * Fill out the (General) PROPSHEETPAGE data structure 
       * for the property sheet
 diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
-index 0c0b038..54c67c2 100644
+index 0c0b038ff9d..54c67c27276 100644
 --- a/programs/winecfg/resource.h
 +++ b/programs/winecfg/resource.h
 @@ -45,6 +45,7 @@
@@ -87,7 +101,7 @@ index 0c0b038..54c67c2 100644
  #define IDC_ABT_ORG                  8433
 diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c
 new file mode 100644
-index 0000000..0aed083
+index 00000000000..0aed083938e
 --- /dev/null
 +++ b/programs/winecfg/staging.c
 @@ -0,0 +1,86 @@
@@ -178,7 +192,7 @@ index 0000000..0aed083
 +    return FALSE;
 +}
 diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h
-index 110856a..a949474 100644
+index 110856a5365..a94947439c3 100644
 --- a/programs/winecfg/winecfg.h
 +++ b/programs/winecfg/winecfg.h
 @@ -87,6 +87,7 @@ INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -190,7 +204,7 @@ index 110856a..a949474 100644
  
  /* Drive management  */
 diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
-index 72c3e1b..dedc039 100644
+index 72c3e1ba01b..dedc039023b 100644
 --- a/programs/winecfg/winecfg.rc
 +++ b/programs/winecfg/winecfg.rc
 @@ -39,6 +39,7 @@ BEGIN
@@ -218,5 +232,5 @@ index 72c3e1b..dedc039 100644
  
  /* @makedep: winecfg.ico */
 -- 
-2.9.0
+2.11.0