mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-18 12:07:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg baseline][libqcow] Update to new version (#13812)

Browse Source
This commit is contained in:
Lily 2020-10-07 15:56:42 +08:00 committed by GitHub
parent b7b552d31c
commit 80959b93b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/libqcow/CONTROL
View File

@ -1,5 +1,5 @@
Source: libqcow Source: libqcow
Version: 20191221-1 Version: 20200928
Homepage: https://github.com/libyal/libqcow Homepage: https://github.com/libyal/libqcow
Build-Depends: gettext,openssl,zlib Build-Depends: gettext,openssl,zlib
Description: Library and tools to access the QEMU Copy-On-Write (QCOW) image format. Description: Library and tools to access the QEMU Copy-On-Write (QCOW) image format.

16
ports/libqcow/macos_fixes.patch
View File

@ -1,34 +1,34 @@
diff --git a/libcfile/libcfile_file.c b/libcfile/libcfile_file.c diff --git a/libcfile/libcfile_file.c b/libcfile/libcfile_file.c
index 13eab02..690cc04 100644 index a618083..5299c77 100644
--- a/libcfile/libcfile_file.c --- a/libcfile/libcfile_file.c
+++ b/libcfile/libcfile_file.c +++ b/libcfile/libcfile_file.c
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
#elif defined( HAVE_CYGWIN_FS_H ) #elif defined( HAVE_CYGWIN_FS_H )
#include <cygwin/fs.h> #include <cygwin/fs.h>
-#elif defined( HAVE_LINUX_FS_H ) -#elif defined( HAVE_LINUX_FS_H )
+#elif defined( __linux__ ) && defined( HAVE_LINUX_FS_H ) +#elif defined( __linux__ ) && defined( HAVE_LINUX_FS_H )
/* Required for Linux platforms that use a sizeof( u64 ) /* Required for Linux platforms that use a sizeof( u64 )
* in linux/fs.h but have no typedef of it * in linux/fs.h but have no typedef of it
*/ */
@@ -4603,6 +4603,11 @@ ssize_t libcfile_file_io_control_read_with_error_code( @@ -4128,6 +4128,11 @@ ssize_t libcfile_internal_file_io_control_read_with_error_code(
#error Missing file IO control with data function #error Missing file IO control with data function
#endif #endif
+// Force disable on Darwin, it can be erroneously defined +// Force disable on Darwin, it can be erroneously defined
+#if defined ( __APPLE__ ) +#if defined ( __APPLE__ )
+#undef HAVE_POSIX_FADVISE +#undef HAVE_POSIX_FADVISE
+#endif +#endif
+ +
/* On some versions of Linux the FADVISE definions seem to be missing from fcntl.h /* Read data from a device file using IO control
* Returns the number of bytes read if successful or -1 on error
*/ */
#if defined( HAVE_POSIX_FADVISE ) && !defined( WINAPI )
diff --git a/libqcow/libqcow_i18n.c b/libqcow/libqcow_i18n.c diff --git a/libqcow/libqcow_i18n.c b/libqcow/libqcow_i18n.c
index f8a3164..d09ec79 100644 index 96d1a31..621e748 100644
--- a/libqcow/libqcow_i18n.c --- a/libqcow/libqcow_i18n.c
+++ b/libqcow/libqcow_i18n.c +++ b/libqcow/libqcow_i18n.c
@@ -40,7 +40,7 @@ int libqcow_i18n_initialize( @@ -40,7 +40,7 @@ int libqcow_i18n_initialize(
if( libqcow_i18n_initialized == 0 ) if( libqcow_i18n_initialized == 0 )
{ {
-#if defined( HAVE_BINDTEXTDOMAIN ) -#if defined( HAVE_BINDTEXTDOMAIN )

4
ports/libqcow/portfile.cmake
View File

@ -1,14 +1,14 @@
vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_fail_port_install(ON_TARGET "uwp")
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
set(LIB_VERSION 20191221) set(LIB_VERSION 20200928)
set(LIB_FILENAME libqcow-alpha-${LIB_VERSION}.tar.gz) set(LIB_FILENAME libqcow-alpha-${LIB_VERSION}.tar.gz)
# Release distribution file contains configured sources, while the source code in the repository does not. # Release distribution file contains configured sources, while the source code in the repository does not.
vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/libyal/libqcow/releases/download/${LIB_VERSION}/${LIB_FILENAME}" URLS "https://github.com/libyal/libqcow/releases/download/${LIB_VERSION}/${LIB_FILENAME}"
FILENAME "${LIB_FILENAME}" FILENAME "${LIB_FILENAME}"
SHA512 de0c5cfad84bbccc9a4144b108c7e022a98d130e829385e69ff00a8750709c9de814410eebfa1c0fc89051cf8f596d87b9bbc8228d99efd8be1c3efdc2b52730 SHA512 c0112bb26924b82ea84eb14a5d5b2ec53a421159de97a6136b3af0940453fba1ca46a7f8130429d5f812ccb3625e93aa3e4237278575fe439b918bc14b0565a5
) )
vcpkg_extract_source_archive_ex( vcpkg_extract_source_archive_ex(