From eb1e664c31bb9ab977bf44a1a0ed51e257ad62cb Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Fri, 25 Jul 2014 18:46:04 -0600 Subject: [PATCH] Move 14-UrlCombineW to shlwapi-UrlCombine. --- patches/Makefile | 32 +++++++++---------- ...additional-tests-for-UrlCombine-and-.patch | 0 ...mbineW-workaround-for-relative-paths.patch | 0 .../definition | 0 4 files changed, 16 insertions(+), 16 deletions(-) rename patches/{14-UrlCombineW => shlwapi-UrlCombine}/0001-shlwapi-tests-Add-additional-tests-for-UrlCombine-and-.patch (100%) rename patches/{14-UrlCombineW => shlwapi-UrlCombine}/0002-shlwapi-UrlCombineW-workaround-for-relative-paths.patch (100%) rename patches/{14-UrlCombineW => shlwapi-UrlCombine}/definition (100%) diff --git a/patches/Makefile b/patches/Makefile index 4b3ea328..b1fee8c0 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -6,7 +6,6 @@ CURDIR ?= ${.CURDIR} PATCH := $(CURDIR)/../debian/tools/gitapply.sh -d $(DESTDIR) PATCHLIST := 13-Misc_ACL.ok \ - 14-UrlCombineW.ok \ 15-wtsapi32.ok \ 16-server-CreateProcess_ACLs.ok \ 17-strmbase-Lock_Race_Conditions.ok \ @@ -25,6 +24,7 @@ PATCHLIST := 13-Misc_ACL.ok \ server-Inherited_ACLs.ok \ server-Stored_ACLs.ok \ shell32-Default_Folder_ACLs.ok \ + shlwapi-UrlCombine.ok \ winepulse-PulseAudio_Support.ok \ winex11-XEMBED.ok \ ws2_32-TransmitFile.ok @@ -66,21 +66,6 @@ clean: echo "+ { \"13-Misc_ACL\", \"Erich E. Hoover\", \"Add default security descriptor ownership and DACLs for processes.\" },"; \ ) > 13-Misc_ACL.ok -# Patchset 14-UrlCombineW -# | -# | Included patches: -# | * Workaround for broken implementation of shlwapi url functions. [by Sebastian Lackner] -# | -# | Modified files: -# | * dlls/shlwapi/tests/url.c, dlls/shlwapi/url.c -# | -14-UrlCombineW.ok: - $(PATCH) < 14-UrlCombineW/0001-shlwapi-tests-Add-additional-tests-for-UrlCombine-and-.patch - $(PATCH) < 14-UrlCombineW/0002-shlwapi-UrlCombineW-workaround-for-relative-paths.patch - ( \ - echo "+ { \"14-UrlCombineW\", \"Sebastian Lackner\", \"Workaround for broken implementation of shlwapi url functions.\" },"; \ - ) > 14-UrlCombineW.ok - # Patchset 15-wtsapi32 # | # | Included patches: @@ -422,6 +407,21 @@ shell32-Default_Folder_ACLs.ok: echo "+ { \"shell32-Default_Folder_ACLs\", \"Erich E. Hoover\", \"Generate default ACLs for user shell folders. [rev 6]\" },"; \ ) > shell32-Default_Folder_ACLs.ok +# Patchset shlwapi-UrlCombine +# | +# | Included patches: +# | * Workaround for broken implementation of shlwapi url functions. [by Sebastian Lackner] +# | +# | Modified files: +# | * dlls/shlwapi/tests/url.c, dlls/shlwapi/url.c +# | +shlwapi-UrlCombine.ok: + $(PATCH) < shlwapi-UrlCombine/0001-shlwapi-tests-Add-additional-tests-for-UrlCombine-and-.patch + $(PATCH) < shlwapi-UrlCombine/0002-shlwapi-UrlCombineW-workaround-for-relative-paths.patch + ( \ + echo "+ { \"shlwapi-UrlCombine\", \"Sebastian Lackner\", \"Workaround for broken implementation of shlwapi url functions.\" },"; \ + ) > shlwapi-UrlCombine.ok + # Patchset winepulse-PulseAudio_Support # | # | Included patches: diff --git a/patches/14-UrlCombineW/0001-shlwapi-tests-Add-additional-tests-for-UrlCombine-and-.patch b/patches/shlwapi-UrlCombine/0001-shlwapi-tests-Add-additional-tests-for-UrlCombine-and-.patch similarity index 100% rename from patches/14-UrlCombineW/0001-shlwapi-tests-Add-additional-tests-for-UrlCombine-and-.patch rename to patches/shlwapi-UrlCombine/0001-shlwapi-tests-Add-additional-tests-for-UrlCombine-and-.patch diff --git a/patches/14-UrlCombineW/0002-shlwapi-UrlCombineW-workaround-for-relative-paths.patch b/patches/shlwapi-UrlCombine/0002-shlwapi-UrlCombineW-workaround-for-relative-paths.patch similarity index 100% rename from patches/14-UrlCombineW/0002-shlwapi-UrlCombineW-workaround-for-relative-paths.patch rename to patches/shlwapi-UrlCombine/0002-shlwapi-UrlCombineW-workaround-for-relative-paths.patch diff --git a/patches/14-UrlCombineW/definition b/patches/shlwapi-UrlCombine/definition similarity index 100% rename from patches/14-UrlCombineW/definition rename to patches/shlwapi-UrlCombine/definition