[pkg-wine-party] [wine] 10/18: Use variable instead of '-development' in winemenubuilder.patch.

[Jens Reyer]

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

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

commit 11b5f3f833d85a5cd7cddaf2cd41dca963c184ef
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Thu Jul 28 19:35:14 2016 +0200

    Use variable instead of '-development' in winemenubuilder.patch.
    
    # Conflicts:
    #	debian/changelog
    #	debian/patches/development/winemenubuilder.patch
---
 debian/changelog                                 |  1 +
 debian/patches/development/winemenubuilder.patch | 35 ++++++++++++++++++++----
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c5a78b1..9ebb4e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ wine (1.8.3-3) UNRELEASED; urgency=medium
       hardcoded paths/names instead of runtime detection.
     - Export DEBSUFFIX from d/rules.
     - Drop now obsolete development/winegcc.patch.
+    - Use variable instead of '-development' in winemenubuilder.patch.
 
  -- Jens Reyer <jre.winesim at gmail.com>  Thu, 28 Jul 2016 17:33:38 +0200
 
diff --git a/debian/patches/development/winemenubuilder.patch b/debian/patches/development/winemenubuilder.patch
index c189542..a583fe6 100644
--- a/debian/patches/development/winemenubuilder.patch
+++ b/debian/patches/development/winemenubuilder.patch
@@ -1,23 +1,46 @@
-description: call wine-development instead of wine from desktop launchers
+description: call wineDEBSUFFIX instead of wine from desktop launchers
 author: Michael Gilbert <mgilbert at debian.org>
+author: Jens Reyer <jre.winesim at gmail.com>
 
+--- a/programs/winemenubuilder/Makefile.in
++++ b/programs/winemenubuilder/Makefile.in
+@@ -1,6 +1,7 @@
+ MODULE    = winemenubuilder.exe
+ APPMODE   = -mwindows -municode
+ IMPORTS   = uuid windowscodecs shell32 shlwapi ole32 user32 advapi32
++EXTRADEFS = -DDEBSUFFIX="\"${DEBSUFFIX}\""
+ 
+ C_SRCS = \
+ 	winemenubuilder.c
 --- a/programs/winemenubuilder/winemenubuilder.c
 +++ b/programs/winemenubuilder/winemenubuilder.c
-@@ -1488,7 +1488,7 @@ static BOOL write_desktop_entry(const ch
+@@ -104,6 +104,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(menubuilder);
+ #define in_startmenu(csidl)   ((csidl)==CSIDL_STARTMENU || \
+                                (csidl)==CSIDL_COMMON_STARTMENU)
+ 
++static const char wine_debsuffix[] = "wine" DEBSUFFIX;
++
+ /* link file formats */
+ 
+ #include "pshpack1.h"
+@@ -1488,8 +1490,8 @@ static BOOL write_desktop_entry(const ch
  
      fprintf(file, "[Desktop Entry]\n");
      fprintf(file, "Name=%s\n", linkname);
 -    fprintf(file, "Exec=env WINEPREFIX=\"%s\" wine %s %s\n",
-+    fprintf(file, "Exec=env WINEPREFIX=\"%s\" wine-development %s %s\n",
-             wine_get_config_dir(), path, args);
+-            wine_get_config_dir(), path, args);
++    fprintf(file, "Exec=env WINEPREFIX=\"%s\" %s %s %s\n",
++            wine_get_config_dir(), wine_debsuffix, path, args);
      fprintf(file, "Type=Application\n");
      fprintf(file, "StartupNotify=true\n");
-@@ -2540,7 +2540,7 @@ static BOOL write_freedesktop_associatio
+     if (descr && lstrlenA(descr))
+@@ -2540,7 +2542,8 @@ static BOOL write_freedesktop_associatio
          fprintf(desktop, "Type=Application\n");
          fprintf(desktop, "Name=%s\n", friendlyAppName);
          fprintf(desktop, "MimeType=%s;\n", mimeType);
 -        fprintf(desktop, "Exec=env WINEPREFIX=\"%s\" wine start /ProgIDOpen %s %%f\n", wine_get_config_dir(), progId);
-+        fprintf(desktop, "Exec=env WINEPREFIX=\"%s\" wine-development start /ProgIDOpen %s %%f\n", wine_get_config_dir(), progId);
++        fprintf(desktop, "Exec=env WINEPREFIX=\"%s\" %s start /ProgIDOpen %s %%f\n",
++                wine_get_config_dir(), wine_debsuffix, progId);
          fprintf(desktop, "NoDisplay=true\n");
          fprintf(desktop, "StartupNotify=true\n");
          if (openWithIcon)

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