[pkg-wine-party] [wine] 43/50: Drop disable/native-file-type-association.patch.

[Jens Reyer]

This is an automated email from the git hooks/post-receive script.

jreyer-guest pushed a commit to branch master
in repository wine.

commit d9cb5b17be75c3c69bedce04046ae4580d99ee7a
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Sun Jan 8 13:32:25 2017 +0100

    Drop disable/native-file-type-association.patch.
    
    If ~/.wine/system.reg (based on wine.inf) doesn't set the "-a"
    switch for winemenubuilder, then even the manual command
    
      wine winemenubuilder -a -r
    
    doesn't create the freedesktop file type associations.
    This is the case independently of the change to
    dlls/shell32/changenotify.c.
---
 .../disable/native-file-type-association.patch     | 29 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 30 deletions(-)

diff --git a/debian/patches/disable/native-file-type-association.patch b/debian/patches/disable/native-file-type-association.patch
deleted file mode 100644
index 92604ad..0000000
--- a/debian/patches/disable/native-file-type-association.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Don't create native file type associations automatically.
-Author: Jens Reyer <jre.winesim at gmail.com>
-Bug: https://bugs.winehq.org/show_bug.cgi?id=28159
-Bug-Debian: https://bugs.debian.org/845334
-
---- a/loader/wine.inf.in
-+++ b/loader/wine.inf.in
-@@ -3309,7 +3309,7 @@ HKR,Parameters,"ServiceDll",,"%11%\sched
- HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule"
- 
- [Services]
--HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r"
-+HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -r"
- HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16
- HKLM,"System\CurrentControlSet\Services\Eventlog\System",,16
- HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16
---- a/dlls/shell32/changenotify.c
-+++ b/dlls/shell32/changenotify.c
-@@ -415,9 +415,7 @@ void WINAPI SHChangeNotify(LONG wEventId
- 
-     if (wEventId & SHCNE_ASSOCCHANGED)
-     {
--        static const WCHAR args[] = {' ','-','a',0 };
--        TRACE("refreshing file type associations\n");
--        run_winemenubuilder( args );
-+        TRACE("refreshing native associations is disabled deliberately in Debian\n");
-     }
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 606d1bd..65c24be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@ manpages-wineserver-persistence.patch
 disable/tests.patch
 disable/addons-download.patch
 disable/rerun-configure.patch
-disable/native-file-type-association.patch
 
 generate/fonts.patch
 generate/opengl.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git