Added color-sRGB-profile patchset

patches/color-sRGB-profile/0001-wine.inf-Add-sRGB-color-profile.patch

@@ -0,0 +1,221 @@
+From e9505756537aca02b463864d632249d8d3056a3c Mon Sep 17 00:00:00 2001
+From: Alex Henrie <alexhenrie24@gmail.com>
+Date: Mon, 31 Aug 2020 01:42:43 -0600
+Subject: [PATCH] wine.inf: Add sRGB color profile
+
+"This profile is made available by the International Color Consortium,
+and may be copied, distributed, embedded, made, used, and sold without
+restriction. Altered versions of this profile shall have the original
+identification and copyright information removed and shall not be
+misrepresented as the original profile."
+
+See http://www.color.org/srgbprofiles.xalter
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37396
+Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
+---
+ Makefile.in                        |   1 +
+ color/Makefile.in                  |   2 ++
+ color/sRGB_Color_Space_Profile.icm | Bin 0 -> 3024 bytes
+ configure.ac                       |   1 +
+ loader/wine.inf.in                 |  14 +++++++++-----
+ tools/makedep.c                    |  12 ++++++++++++
+ 6 files changed, 25 insertions(+), 5 deletions(-)
+ create mode 100644 color/Makefile.in
+ create mode 100644 color/sRGB_Color_Space_Profile.icm
+
+diff --git a/Makefile.in b/Makefile.in
+index 5c6a3e30c59..36b89e45768 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -27,6 +27,7 @@ datarootdir     = @datarootdir@
+ datadir         = @datadir@
+ mandir          = @mandir@
+ includedir      = @includedir@
++colordir        = ${datadir}/wine/color
+ fontdir         = ${datadir}/wine/fonts
+ nlsdir          = ${datadir}/wine/nls
+ dlldir          = ${libdir}/wine
+diff --git a/color/Makefile.in b/color/Makefile.in
+new file mode 100644
+index 00000000000..f9f6f62a3b1
+--- /dev/null
++++ b/color/Makefile.in
+@@ -0,0 +1,2 @@
++SOURCES = \
++	sRGB_Color_Space_Profile.icm
+diff --git a/color/sRGB_Color_Space_Profile.icm b/color/sRGB_Color_Space_Profile.icm
+new file mode 100644
+index 0000000000000000000000000000000000000000..49afbfef10f22a1832590b68369d2f248ea553b9
+GIT binary patch
+literal 3024
+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
+
+literal 0
+HcmV?d00001
+
+diff --git a/configure.ac b/configure.ac
+index 21b9bd113ed..ffe287aeb80 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2870,6 +2870,7 @@ depend: \$(MAKEDEP) dummy
+ WINE_CONFIG_SYMLINK(wine,tools/winewrapper)
+ WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,["x$enable_win64" != xno -o -n "$with_wine64"])
+ 
++WINE_CONFIG_MAKEFILE(color)
+ WINE_CONFIG_MAKEFILE(dlls/acledit)
+ WINE_CONFIG_MAKEFILE(dlls/aclui)
+ WINE_CONFIG_MAKEFILE(dlls/activeds.tlb)
+diff --git a/loader/wine.inf.in b/loader/wine.inf.in
+index 41471d3168e..879c1038a95 100644
+--- a/loader/wine.inf.in
++++ b/loader/wine.inf.in
+@@ -30,7 +30,7 @@ signature="$CHICAGO$"
+ RegisterDlls=RegisterDllsSection
+ WineFakeDlls=FakeDllsWin32,FakeDlls
+ UpdateInis=SystemIni
+-CopyFiles=InfFiles,NlsFiles,SortFiles
++CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles
+ AddReg=\
+     Classes,\
+     ContentIndex,\
+@@ -55,7 +55,7 @@ AddReg=\
+ RegisterDlls=RegisterDllsSection
+ WineFakeDlls=FakeDllsWin32,FakeDlls
+ UpdateInis=SystemIni
+-CopyFiles=InfFiles,NlsFiles,SortFiles
++CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles
+ AddReg=\
+     Classes,\
+     ContentIndex,\
+@@ -82,7 +82,7 @@ RegisterDlls=RegisterDllsSection
+ WineFakeDlls=FakeDllsWin64,FakeDlls
+ WinePreInstall=Wow64
+ UpdateInis=SystemIni
+-CopyFiles=InfFiles,NlsFiles,SortFiles
++CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles
+ AddReg=\
+     Classes,\
+     ContentIndex,\
+@@ -110,7 +110,7 @@ RegisterDlls=RegisterDllsSection
+ WineFakeDlls=FakeDllsWin64,FakeDlls
+ WinePreInstall=Wow64
+ UpdateInis=SystemIni
+-CopyFiles=InfFiles,NlsFiles,SortFiles
++CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles
+ AddReg=\
+     Classes,\
+     ContentIndex,\
+@@ -2949,7 +2949,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+ 11,catroot,
+ 11,mui,
+ 11,tasks,
+-11,spool\drivers\color,
+ 11,spool\printers,
+ 10,,explorer.exe
+ 10,,hh.exe
+@@ -4167,6 +4166,9 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x
+ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001
+ HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001
+ 
++[ColorFiles]
++"sRGB Color Space Profile.icm",sRGB_Color_Space_Profile.icm
++
+ [InfFiles]
+ winebus.inf
+ winehid.inf
+@@ -4249,10 +4251,12 @@ normnfkd.nls
+ sortdefault.nls
+ 
+ [WineSourceDirs]
++ColorFiles = color
+ NlsFiles  = nls
+ SortFiles = nls
+ 
+ [DestinationDirs]
++ColorFiles = 11,spool\drivers\color
+ InfFiles  = 17
+ NlsFiles  = 11
+ SortFiles = 10,globalization\sorting
+diff --git a/tools/makedep.c b/tools/makedep.c
+index 023ac6b8573..d35d08c0dca 100644
+--- a/tools/makedep.c
++++ b/tools/makedep.c
+@@ -2992,6 +2992,17 @@ static void output_source_svg( struct makefile *make, struct incl_file *source,
+ }
+ 
+ 
++/*******************************************************************
++ *         output_source_icm
++ */
++static void output_source_icm( struct makefile *make, struct incl_file *source, const char *obj )
++{
++    add_install_rule( make, source->name, source->name,
++                      strmake( "D$(colordir)/%s", source->name ));
++    output_srcdir_symlink( make, strmake( "%s.icm", obj ));
++}
++
++
+ /*******************************************************************
+  *         output_source_nls
+  */
+@@ -3209,6 +3220,7 @@ static const struct
+     { "tlb", output_source_tlb },
+     { "sfd", output_source_sfd },
+     { "svg", output_source_svg },
++    { "icm", output_source_icm },
+     { "nls", output_source_nls },
+     { "desktop", output_source_desktop },
+     { "po", output_source_po },
+-- 
+2.28.0
+

patches/color-sRGB-profile/definition

@@ -0,0 +1 @@
+Fixes: [37396] Add sRGB color profile.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "0ead40dc9b87ebbd74ad6ebda0182365ab2efde3"
+	echo "1a0470443d12f6fc4c241a93af5bc34aa03b34b3"
 }
 
 # Show version information
@@ -91,6 +91,7 @@ patch_enable_all ()
 	enable_atl_AtlAxDialogBox="$1"
 	enable_bcrypt_ECDHSecretAgreement="$1"
 	enable_cmd_launch_association="$1"
+	enable_color_sRGB_profile="$1"
 	enable_comctl32_Listview_DrawItem="$1"
 	enable_comctl32_rebar_capture="$1"
 	enable_comctl32_version_6="$1"
@@ -367,6 +368,9 @@ patch_enable ()
 		cmd-launch-association)
 			enable_cmd_launch_association="$2"
 			;;
+		color-sRGB-profile)
+			enable_color_sRGB_profile="$2"
+			;;
 		comctl32-Listview_DrawItem)
 			enable_comctl32_Listview_DrawItem="$2"
 			;;
@@ -1883,6 +1887,18 @@ if test "$enable_cmd_launch_association" -eq 1; then
 	patch_apply cmd-launch-association/0002-cmd-ftype-failed-to-clear-file-associations.patch
 fi
 
+# Patchset color-sRGB-profile
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#37396] Add sRGB color profile.
+# |
+# | Modified files:
+# |   *	Makefile.in, color/Makefile.in, color/sRGB_Color_Space_Profile.icm, configure.ac, loader/wine.inf.in, tools/makedep.c
+# |
+if test "$enable_color_sRGB_profile" -eq 1; then
+	patch_apply color-sRGB-profile/0001-wine.inf-Add-sRGB-color-profile.patch
+fi
+
 # Patchset comctl32-Listview_DrawItem
 # |
 # | This patchset fixes the following Wine bugs: