diff options
| author | past-due <30942300+past-due@users.noreply.github.com> | 2019-03-26 13:51:35 -0400 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-03-26 10:51:35 -0700 |
| commit | 207855d843b68001ccee5da2df9de53216b98b6e (patch) | |
| tree | 9586384e4de93430829410dc596ae4701ea75529 | |
| parent | 98ae960b4b3d41ed8a82efb76b05ba183e2228bf (diff) | |
| download | vcpkg-207855d843b68001ccee5da2df9de53216b98b6e.tar.gz vcpkg-207855d843b68001ccee5da2df9de53216b98b6e.zip | |
[physfs] Update to version 3.0.2 (#5821)
| -rw-r--r-- | ports/physfs/CONTROL | 2 | ||||
| -rw-r--r-- | ports/physfs/physfs.3.0.1.GetUserProfileDirectory.patch | 25 | ||||
| -rw-r--r-- | ports/physfs/portfile.cmake | 6 |
3 files changed, 3 insertions, 30 deletions
diff --git a/ports/physfs/CONTROL b/ports/physfs/CONTROL index 5d5d69755..3900d77a8 100644 --- a/ports/physfs/CONTROL +++ b/ports/physfs/CONTROL @@ -1,4 +1,4 @@ Source: physfs -Version: 3.0.1-1 +Version: 3.0.2 Description: a library to provide abstract access to various archives Build-Depends: zlib diff --git a/ports/physfs/physfs.3.0.1.GetUserProfileDirectory.patch b/ports/physfs/physfs.3.0.1.GetUserProfileDirectory.patch deleted file mode 100644 index 4338e52e5..000000000 --- a/ports/physfs/physfs.3.0.1.GetUserProfileDirectory.patch +++ /dev/null @@ -1,25 +0,0 @@ - -diff -r a29fef4a20fd -r ece6769c0676 src/physfs_platform_windows.c ---- a/src/physfs_platform_windows.c Wed May 16 19:54:51 2018 -0400 -+++ b/src/physfs_platform_windows.c Wed Oct 03 22:40:57 2018 -0400 -@@ -566,7 +566,6 @@ - else - { - DWORD psize = 0; -- WCHAR dummy = 0; - LPWSTR wstr = NULL; - BOOL rc = 0; - -@@ -575,7 +574,7 @@ - * psize. Also note that the second parameter can't be - * NULL or the function fails. - */ -- rc = pGetDir(accessToken, &dummy, &psize); -+ rc = pGetDir(accessToken, NULL, &psize); - GOTO_IF(rc, PHYSFS_ERR_OS_ERROR, done); /* should have failed! */ - - /* Allocate memory for the profile directory */ - - - - diff --git a/ports/physfs/portfile.cmake b/ports/physfs/portfile.cmake index feee3b456..92f1cd4ee 100644 --- a/ports/physfs/portfile.cmake +++ b/ports/physfs/portfile.cmake @@ -1,17 +1,15 @@ include(vcpkg_common_functions) -set(PHYSFS_VERSION 3.0.1) +set(PHYSFS_VERSION 3.0.2) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/physfs-${PHYSFS_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://icculus.org/physfs/downloads/physfs-${PHYSFS_VERSION}.tar.bz2" FILENAME "physfs-${PHYSFS_VERSION}.tar.bz2" - SHA512 ddf3b075ccb506da5e9a1ce96001be402752b9b777c2e816a85d48aff3626ff0886ea43eb07bd300fe3a9f59b9a002f54d822c51d483a4ee94b38378534c1879 + SHA512 4024b6c3348e0b6fc1036aac330192112dfe17de3e3d14773be9f06e9a062df5a1006869f21162b4e0b584989f463788a35e64186b1913225c073fea62754472 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${PHYSFS_VERSION} - PATCHES - physfs.3.0.1.GetUserProfileDirectory.patch # Fixes GetUserProfileDirectory issue on Win10 build 1809(+?); See: https://hg.icculus.org/icculus/physfs/rev/ece6769c0676 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PHYSFS_STATIC) |