wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong escaping of quote/slash characters in patchupdater script (thanks felixonmars).

Browse Source
This commit is contained in:
Sebastian Lackner 2014-10-30 14:44:17 +01:00
parent ade7c1e886
commit 9c9639f3ae
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -1,4 +1,5 @@
wine-compholio (1.7.30) UNRELEASED; urgency=low
* Fix wrong escaping of quote/slash characters in patchupdater script.
* Added additional conversion functions to DXTn patch.
* Added patch to filter specific warning messages for D3DCompileShader.
* Added patch to implement iphlpapi stub functions.

2
debian/tools/patchupdate.py vendored
View File

@ -528,7 +528,7 @@ def generate_makefile(all_patches):
fp.write("\t@( \\\n")
for info in patch.authors:
if not info.subject: continue
s = info.subject.replace("\\", "\\\\\\\\").replace("\"", "\\\\\"").replace("'", "'\\''")
s = info.subject.replace("\\", "\\\\").replace("\"", "\\\"").replace("'", "'\\''")
if info.revision and info.revision != "1": s += " [rev %s]" % info.revision
fp.write("\t\techo '+ { \"%s\", \"%s\", \"%s\" },'; \\\n" % (patch.name, info.author, s))
fp.write("\t) > %s.ok\n" % patch.name)

6
patches/Makefile
View File

@ -1424,7 +1424,7 @@ user32-WndProc.ok:
wine.inf-ProductId.ok:
$(call APPLY_FILE,wine.inf-ProductId/0001-wine.inf-Add-fake-ProductId-to-HKLM-CurrentVersionNT.patch)
@( \
echo '+ { "wine.inf-ProductId", "Yanis Lukes", "wine.inf: Add fake ProductId to HKLM\\\\CurrentVersionNT." },'; \
echo '+ { "wine.inf-ProductId", "Yanis Lukes", "wine.inf: Add fake ProductId to HKLM\\CurrentVersionNT." },'; \
) > wine.inf-ProductId.ok
# Patchset wineboot-HKEY_DYN_DATA
@ -1442,7 +1442,7 @@ wine.inf-ProductId.ok:
wineboot-HKEY_DYN_DATA.ok:
$(call APPLY_FILE,wineboot-HKEY_DYN_DATA/0001-wineboot-Add-some-generic-hardware-in-HKEY_DYN_DATA-.patch)
@( \
echo '+ { "wineboot-HKEY_DYN_DATA", "Michael Müller", "Add some generic hardware in HKEY_DYN_DATA\\\\Config Manager\\\\Enum." },'; \
echo '+ { "wineboot-HKEY_DYN_DATA", "Michael Müller", "Add some generic hardware in HKEY_DYN_DATA\\Config Manager\\Enum." },'; \
) > wineboot-HKEY_DYN_DATA.ok
# Patchset winebuild-LinkerVersion
@ -1608,7 +1608,7 @@ winex11-CandidateWindowPos.ok:
winex11-Clipboard_HTML.ok:
$(call APPLY_FILE,winex11-Clipboard_HTML/0001-winex11.drv-Import-X11-s-text-html-as-HTML-Format.patch)
@( \
echo '+ { "winex11-Clipboard_HTML", "Damjan Jovanovic", "Import X11'\''s \\"text/html\\" as \\"HTML Format\\". [rev 3]" },'; \
echo '+ { "winex11-Clipboard_HTML", "Damjan Jovanovic", "Import X11'\''s \"text/html\" as \"HTML Format\". [rev 3]" },'; \
) > winex11-Clipboard_HTML.ok
# Patchset winex11-Limited_Resolutions