diff options
| author | Matthew Oliver <protogonoi@gmail.com> | 2020-08-29 08:39:29 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 15:39:29 -0700 |
| commit | f3f329a048eaff759c1992c458f2e12351486bc7 (patch) | |
| tree | 0b90e2164b37395a58b998e91ca42187cb6bffce | |
| parent | 62a64f09a1260cb77c8d57f4f79120087ffc0f40 (diff) | |
| download | vcpkg-f3f329a048eaff759c1992c458f2e12351486bc7.tar.gz vcpkg-f3f329a048eaff759c1992c458f2e12351486bc7.zip | |
[bzip2] Update to 1.0.8. (#13178)
Fixes #12960
| -rw-r--r-- | ports/bzip2/CONTROL | 3 | ||||
| -rw-r--r-- | ports/bzip2/fix-windows-include.patch | 12 | ||||
| -rw-r--r-- | ports/bzip2/portfile.cmake | 13 |
3 files changed, 4 insertions, 24 deletions
diff --git a/ports/bzip2/CONTROL b/ports/bzip2/CONTROL index bdc70fcf4..b79a4950b 100644 --- a/ports/bzip2/CONTROL +++ b/ports/bzip2/CONTROL @@ -1,5 +1,4 @@ Source: bzip2 -Version: 1.0.6 -Port-Version: 7 +Version: 1.0.8 Homepage: http://www.bzip.org/ Description: High-quality data compressor. diff --git a/ports/bzip2/fix-windows-include.patch b/ports/bzip2/fix-windows-include.patch deleted file mode 100644 index 11797ad2f..000000000 --- a/ports/bzip2/fix-windows-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN bzip2-1.0.6-orig/bzip2.c bzip2-1.0.6/bzip2.c ---- bzip2-1.0.6-orig/bzip2.c 2010-09-11 02:04:53.000000000 +0300 -+++ bzip2-1.0.6/bzip2.c 2019-11-04 11:40:52.230652175 +0200 -@@ -128,7 +128,7 @@ - #if BZ_LCCWIN32 - # include <io.h> - # include <fcntl.h> --# include <sys\stat.h> -+# include <sys/stat.h> - - # define NORETURN /**/ - # define PATH_SEP '\\' diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake index d6b70bacb..97b5c3258 100644 --- a/ports/bzip2/portfile.cmake +++ b/ports/bzip2/portfile.cmake @@ -1,16 +1,9 @@ -set(BZIP2_VERSION 1.0.6) # TODO: Update to 1.0.8 -vcpkg_download_distfile(ARCHIVE # TODO: switch to vcpkg_from_git with https://sourceware.org/git/?p=bzip2.git;a=summary - URLS "https://github.com/past-due/bzip2-mirror/releases/download/v${BZIP2_VERSION}/bzip2-${BZIP2_VERSION}.tar.gz" - FILENAME "bzip2-${BZIP2_VERSION}.tar.gz" - SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12) - -vcpkg_extract_source_archive_ex( +vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${BZIP2_VERSION} + URL https://sourceware.org/git/bzip2.git + REF 75a94bea3918e612b879d6a11ca64b8689526147 PATCHES fix-import-export-macros.patch - fix-windows-include.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") |