From 83c7e2a9930c4b94b0df5de03bdb642e78387a6e Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 16 Sep 2020 14:53:49 +1000 Subject: [PATCH] Updated color-sRGB-profile --- ...0001-wine.inf-Add-sRGB-color-profile.patch | 44 +++++++++++-------- patches/color-sRGB-profile/definition | 1 - patches/patchinstall.sh | 18 +++++++- 3 files changed, 43 insertions(+), 20 deletions(-) diff --git a/patches/color-sRGB-profile/0001-wine.inf-Add-sRGB-color-profile.patch b/patches/color-sRGB-profile/0001-wine.inf-Add-sRGB-color-profile.patch index 6ce3d714..c92fa5ef 100644 --- a/patches/color-sRGB-profile/0001-wine.inf-Add-sRGB-color-profile.patch +++ b/patches/color-sRGB-profile/0001-wine.inf-Add-sRGB-color-profile.patch @@ -1,6 +1,6 @@ -From e9505756537aca02b463864d632249d8d3056a3c Mon Sep 17 00:00:00 2001 +From 01cf21eb49307de6b0eb5445b9befdf8f585e3f7 Mon Sep 17 00:00:00 2001 From: Alex Henrie -Date: Mon, 31 Aug 2020 01:42:43 -0600 +Date: Sat, 12 Sep 2020 01:45:02 -0600 Subject: [PATCH] wine.inf: Add sRGB color profile "This profile is made available by the International Color Consortium, @@ -17,15 +17,15 @@ Signed-off-by: Alex Henrie Makefile.in | 1 + color/Makefile.in | 2 ++ color/sRGB_Color_Space_Profile.icm | Bin 0 -> 3024 bytes - configure.ac | 1 + + configure.ac | 2 ++ loader/wine.inf.in | 14 +++++++++----- tools/makedep.c | 12 ++++++++++++ - 6 files changed, 25 insertions(+), 5 deletions(-) + 6 files changed, 26 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 +index 307a95b3b1..367bc3fe77 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,6 +27,7 @@ datarootdir = @datarootdir@ @@ -38,7 +38,7 @@ index 5c6a3e30c59..36b89e45768 100644 dlldir = ${libdir}/wine diff --git a/color/Makefile.in b/color/Makefile.in new file mode 100644 -index 00000000000..f9f6f62a3b1 +index 0000000000..f9f6f62a3b --- /dev/null +++ b/color/Makefile.in @@ -0,0 +1,2 @@ @@ -104,10 +104,10 @@ literal 0 HcmV?d00001 diff --git a/configure.ac b/configure.ac -index 21b9bd113ed..ffe287aeb80 100644 +index 20ae7577fa..c615f1bfe0 100644 --- a/configure.ac +++ b/configure.ac -@@ -2870,6 +2870,7 @@ depend: \$(MAKEDEP) dummy +@@ -2810,6 +2810,7 @@ dummy: WINE_CONFIG_SYMLINK(wine,tools/winewrapper) WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,["x$enable_win64" != xno -o -n "$with_wine64"]) @@ -115,8 +115,16 @@ index 21b9bd113ed..ffe287aeb80 100644 WINE_CONFIG_MAKEFILE(dlls/acledit) WINE_CONFIG_MAKEFILE(dlls/aclui) WINE_CONFIG_MAKEFILE(dlls/activeds.tlb) +@@ -4146,6 +4147,7 @@ clean:: + else + TOP_INSTALL_DEV="$TOP_INSTALL_DEV include" + TOP_INSTALL_LIB="$TOP_INSTALL_LIB \ ++color \ + fonts \ + loader/wine.inf \ + loader/winebus.inf \ diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index 41471d3168e..879c1038a95 100644 +index cd0e7bd16f..f84567c13e 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -30,7 +30,7 @@ signature="$CHICAGO$" @@ -128,7 +136,7 @@ index 41471d3168e..879c1038a95 100644 AddReg=\ Classes,\ ContentIndex,\ -@@ -55,7 +55,7 @@ AddReg=\ +@@ -54,7 +54,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni @@ -137,7 +145,7 @@ index 41471d3168e..879c1038a95 100644 AddReg=\ Classes,\ ContentIndex,\ -@@ -82,7 +82,7 @@ RegisterDlls=RegisterDllsSection +@@ -80,7 +80,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni @@ -146,7 +154,7 @@ index 41471d3168e..879c1038a95 100644 AddReg=\ Classes,\ ContentIndex,\ -@@ -110,7 +110,7 @@ RegisterDlls=RegisterDllsSection +@@ -107,7 +107,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni @@ -155,7 +163,7 @@ index 41471d3168e..879c1038a95 100644 AddReg=\ Classes,\ ContentIndex,\ -@@ -2949,7 +2949,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" +@@ -2670,7 +2670,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,catroot, 11,mui, 11,tasks, @@ -163,7 +171,7 @@ index 41471d3168e..879c1038a95 100644 11,spool\printers, 10,,explorer.exe 10,,hh.exe -@@ -4167,6 +4166,9 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x +@@ -3886,6 +3885,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 @@ -173,7 +181,7 @@ index 41471d3168e..879c1038a95 100644 [InfFiles] winebus.inf winehid.inf -@@ -4249,10 +4251,12 @@ normnfkd.nls +@@ -3968,10 +3970,12 @@ normnfkd.nls sortdefault.nls [WineSourceDirs] @@ -187,10 +195,10 @@ index 41471d3168e..879c1038a95 100644 NlsFiles = 11 SortFiles = 10,globalization\sorting diff --git a/tools/makedep.c b/tools/makedep.c -index 023ac6b8573..d35d08c0dca 100644 +index 7fe2c4daf5..aa188d6fe5 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, +@@ -2955,6 +2955,17 @@ static void output_source_svg( struct makefile *make, struct incl_file *source, } @@ -208,7 +216,7 @@ index 023ac6b8573..d35d08c0dca 100644 /******************************************************************* * output_source_nls */ -@@ -3209,6 +3220,7 @@ static const struct +@@ -3171,6 +3182,7 @@ static const struct { "tlb", output_source_tlb }, { "sfd", output_source_sfd }, { "svg", output_source_svg }, diff --git a/patches/color-sRGB-profile/definition b/patches/color-sRGB-profile/definition index 1556c091..08eaef19 100644 --- a/patches/color-sRGB-profile/definition +++ b/patches/color-sRGB-profile/definition @@ -1,2 +1 @@ Fixes: [37396] Add sRGB color profile. -Disabled: True diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 458c2920..1aa7e052 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "666c5b6e20e3b9e1e34d10b88372406f494699f2" + echo "26eedec78e50a5f264ea045a37558c41eceba653" } # 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" @@ -364,6 +365,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" ;; @@ -1857,6 +1861,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: