[pkg-wine-party] [wine] 01/03: Fix disable/native-file-type-association.patch.

Jens Reyer jreyer-guest at moszumanska.debian.org
Fri Jan 6 17:18:49 UTC 2017


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

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

commit 326da2f6bb11a71d89e2622a2ea3e30485ee3895
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Fri Jan 6 16:42:43 2017 +0100

    Fix disable/native-file-type-association.patch.
    
    Just drop running winemenubuilder in SHChangeNotify, instead of
    trying to run it without an option, which afaics is the same
    here anyway.
    
    The previous implementation gave a warning during build:
    changenotify.c: In function 'SHChangeNotify':
    changenotify.c:420:9: warning: statement with no effect [-Wunused-value]
             run_winemenubuilder;
             ^~~~~~~~~~~~~~~~~~~
---
 debian/patches/disable/native-file-type-association.patch | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/patches/disable/native-file-type-association.patch b/debian/patches/disable/native-file-type-association.patch
index a812b4a..92604ad 100644
--- a/debian/patches/disable/native-file-type-association.patch
+++ b/debian/patches/disable/native-file-type-association.patch
@@ -16,15 +16,14 @@ Bug-Debian: https://bugs.debian.org/845334
  HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16
 --- a/dlls/shell32/changenotify.c
 +++ b/dlls/shell32/changenotify.c
-@@ -415,9 +415,9 @@ void WINAPI SHChangeNotify(LONG wEventId
+@@ -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");
+-        TRACE("refreshing file type associations\n");
 -        run_winemenubuilder( args );
 +        TRACE("refreshing native associations is disabled deliberately in Debian\n");
-+        run_winemenubuilder;
      }
  }
  

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



More information about the pkg-wine-party mailing list