From df04d7c1c85dbad18bcf63c555cae10a46113e71 Mon Sep 17 00:00:00 2001 From: Michael Gilbert Date: Tue, 13 Sep 2022 01:46:21 +0100 Subject: [PATCH] call wineDEBSUFFIX instead of wine from desktop launchers forwarded: not-needed Gbp-Pq: Topic debianization Gbp-Pq: Name desktop-launchers.patch --- programs/winemenubuilder/Makefile.in | 1 + programs/winemenubuilder/winemenubuilder.c | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in index 12326d1..4109fab 100644 --- a/programs/winemenubuilder/Makefile.in +++ b/programs/winemenubuilder/Makefile.in @@ -1,5 +1,6 @@ MODULE = winemenubuilder.exe IMPORTS = uuid windowscodecs shell32 shlwapi ole32 user32 advapi32 +EXTRADEFS = -DDEBSUFFIX="\"${DEBSUFFIX}\"" EXTRADLLFLAGS = -mwindows -municode diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 16dc32a..07e43e8 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -97,6 +97,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(menubuilder); #define IS_OPTION_TRUE(ch) \ ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') +static const char wine_debsuffix[] = "wine" DEBSUFFIX; + /* link file formats */ #include "pshpack1.h" @@ -1275,7 +1277,7 @@ static BOOL write_desktop_entry(const WCHAR *link, const WCHAR *location, const fprintf(file, "env WINEPREFIX=\"%s\" ", path); heap_free( path ); } - fprintf(file, "wine %s", escape(path)); + fprintf(file, "%s %s", wine_debsuffix, escape(path)); if (args) fprintf(file, " %s", escape(args) ); fputc( '\n', file ); fprintf(file, "Type=Application\n"); @@ -1985,11 +1987,11 @@ static BOOL write_freedesktop_association_entry(const WCHAR *desktopPath, const if (prefix) { char *path = wine_get_unix_file_name( prefix ); - fprintf(desktop, "Exec=env WINEPREFIX=\"%s\" wine start /ProgIDOpen %s %%f\n", path, escape(progId)); + fprintf(desktop, "Exec=env WINEPREFIX=\"%s\" %s start /ProgIDOpen %s %%f\n", path, wine_debsuffix, escape(progId)); heap_free( path ); } else - fprintf(desktop, "Exec=wine start /ProgIDOpen %s %%f\n", escape(progId)); + fprintf(desktop, "Exec=%s start /ProgIDOpen %s %%f\n", wine_debsuffix, escape(progId)); fprintf(desktop, "NoDisplay=true\n"); fprintf(desktop, "StartupNotify=true\n"); if (openWithIcon) -- 2.30.2