wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against cf49617c1a378dd4a37ab7226187708c501b046f.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-11-14 17:15:39 +11:00
parent cd3ee9b25d
commit 3b6b470bca
4 changed files with 120 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/winemenubuilder-integration/0001-winemenubuilder-Blacklist-desktop-integration-for-ce.patch
View File

@@ -1,4 +1,4 @@
From 823ca34bded08b0a861641ba317400b5d8a47a50 Mon Sep 17 00:00:00 2001
From be95736e06aba40bd61378be249c238ff3dcadb9 Mon Sep 17 00:00:00 2001
From: Alex Henrie <alexhenrie24@gmail.com>
Date: Sun, 1 Mar 2020 17:58:12 -0700
Subject: [PATCH] winemenubuilder: Blacklist desktop integration for certain
@@ -65,10 +65,10 @@ index 4a650b444fc..548739f4326 100644
;; PS
HKCR,"MIME\Database\Content Type\application/postscript","Extension",,".ps"
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index badbd9b4b5a..4784533301b 100644
index 2759854396d..e867df57a22 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -506,6 +506,16 @@ HKCR,MIME\Database\Charset\us-ascii,"AliasForCharset",,iso-8859-1
@@ -514,6 +514,16 @@ HKCR,MIME\Database\Charset\us-ascii,"AliasForCharset",,iso-8859-1
HKCR,MIME\Database\Charset\visual,"AliasForCharset",,iso-8859-8
HKCR,MIME\Database\Charset\Windows-1254,"AliasForCharset",,iso-8859-9
@@ -86,7 +86,7 @@ index badbd9b4b5a..4784533301b 100644
HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"WBreakerClass",,"{369647e0-17b0-11ce-9950-00aa004bbb1f}"
HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"StemmerClass",,""
diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index 65fbecca526..28e86565c06 100644
index 6545dabd668..405ce7942dc 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -2479,7 +2479,7 @@ static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const ch
@@ -168,7 +168,7 @@ index 65fbecca526..28e86565c06 100644
-
executableW = assoc_query(ASSOCSTR_EXECUTABLE, extensionW, openW);
if (executableW)
openWithIconA = extract_icon(executableW, 0, NULL, FALSE);
openWithIconA = compute_native_identifier(0, executableW);
--
2.27.0
2.28.0