[pkg-wine-party] [wine] 07/10: Use variable instead of '-development' in winegcc.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 5ea07340996836fad42d699890e650be8910196d
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Thu Jun 16 22:30:34 2016 +0200

    Use variable instead of '-development' in winegcc.patch.
---
 debian/patches/development/winegcc.patch | 45 +++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/debian/patches/development/winegcc.patch b/debian/patches/development/winegcc.patch
index 1c9c232..9f09244 100644
--- a/debian/patches/development/winegcc.patch
+++ b/debian/patches/development/winegcc.patch
@@ -1,14 +1,53 @@
-description: call wine-development instead of wine from the winegcc shell script
+description: call wineDEBSUFFIX instead of wine from the winegcc shell script
 author: Michael Gilbert <mgilbert at debian.org>
+author: Jens Reyer <jre.winesim at gmail.com>
 
+--- a/tools/winegcc/Makefile.in
++++ b/tools/winegcc/Makefile.in
+@@ -2,6 +2,8 @@ PROGRAMS = winegcc
+ 
+ MANPAGES = winegcc.man.in
+ 
++EXTRADEFS = -DDEBSUFFIX="\"${DEBSUFFIX}\""
++
+ winegcc_SYMLINKS = winecpp wineg++
+ 
+ C_SRCS = \
 --- a/tools/winegcc/winegcc.c
 +++ b/tools/winegcc/winegcc.c
-@@ -131,7 +131,7 @@ static const char* app_loader_template =
+@@ -98,6 +98,8 @@
+ 
+ #include "utils.h"
+ 
++static const char wine_debsuffix[] = "wine" DEBSUFFIX;
++
+ static const char* app_loader_template =
+     "#!/bin/sh\n"
+     "\n"
+@@ -131,7 +133,7 @@ static const char* app_loader_template =
      "fi\n"
      "\n"
      "# determine the WINELOADER\n"
 -    "if [ ! -x \"$WINELOADER\" ]; then WINELOADER=\"wine\"; fi\n"
-+    "if [ ! -x \"$WINELOADER\" ]; then WINELOADER=\"wine-development\"; fi\n"
++    "if [ ! -x \"$WINELOADER\" ]; then WINELOADER=\"%s\"; fi\n"
      "\n"
      "# and try to start the app\n"
      "exec \"$WINELOADER\" \"$apppath\" \"$@\"\n"
+@@ -791,7 +793,7 @@ static void build(struct options* opts)
+     /* 'winegcc -o app xxx.exe.so' only creates the load script */
+     if (opts->files->size == 1 && strendswith(opts->files->base[0], ".exe.so"))
+     {
+-	create_file(output_file, 0755, app_loader_template, opts->files->base[0]);
++	create_file(output_file, 0755, app_loader_template, opts->files->base[0], wine_debsuffix);
+ 	return;
+     }
+ 
+@@ -1192,7 +1194,7 @@ static void build(struct options* opts)
+ 
+     /* create the loader script */
+     if (generate_app_loader)
+-        create_file(output_file, 0755, app_loader_template, strmake("%s.so", output_name));
++        create_file(output_file, 0755, app_loader_template, strmake("%s.so", output_name), wine_debsuffix);
+ }
+ 
+ 

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