Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 3 commits into from
Oct 7, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
217f9b8
[libqcow] Update to new version
LilyWangL Sep 29, 2020
c8771e7
[libqcow] Update patch
LilyWangL Sep 29, 2020
1ddd180
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Oct 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/libqcow/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: libqcow
Version: 20191221-1
Version: 20200928
Homepage: https://github.com/libyal/libqcow
Build-Depends: gettext,openssl,zlib
Description: Library and tools to access the QEMU Copy-On-Write (QCOW) image format.
Expand Down
16 changes: 8 additions & 8 deletions ports/libqcow/macos_fixes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
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
+++ b/libcfile/libcfile_file.c
@@ -56,7 +56,7 @@
#elif defined( HAVE_CYGWIN_FS_H )
#include <cygwin/fs.h>

-#elif defined( HAVE_LINUX_FS_H )
+#elif defined( __linux__ ) && defined( HAVE_LINUX_FS_H )
/* Required for Linux platforms that use a sizeof( u64 )
* 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
#endif

+// Force disable on Darwin, it can be erroneously defined
+#if defined ( __APPLE__ )
+#undef HAVE_POSIX_FADVISE
+#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
index f8a3164..d09ec79 100644
index 96d1a31..621e748 100644
--- a/libqcow/libqcow_i18n.c
+++ b/libqcow/libqcow_i18n.c
@@ -40,7 +40,7 @@ int libqcow_i18n_initialize(

if( libqcow_i18n_initialized == 0 )
{
-#if defined( HAVE_BINDTEXTDOMAIN )
Expand Down
4 changes: 2 additions & 2 deletions ports/libqcow/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
vcpkg_fail_port_install(ON_TARGET "uwp")
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)

set(LIB_VERSION 20191221)
set(LIB_VERSION 20200928)
set(LIB_FILENAME libqcow-alpha-${LIB_VERSION}.tar.gz)

# Release distribution file contains configured sources, while the source code in the repository does not.
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/libyal/libqcow/releases/download/${LIB_VERSION}/${LIB_FILENAME}"
FILENAME "${LIB_FILENAME}"
SHA512 de0c5cfad84bbccc9a4144b108c7e022a98d130e829385e69ff00a8750709c9de814410eebfa1c0fc89051cf8f596d87b9bbc8228d99efd8be1c3efdc2b52730
SHA512 c0112bb26924b82ea84eb14a5d5b2ec53a421159de97a6136b3af0940453fba1ca46a7f8130429d5f812ccb3625e93aa3e4237278575fe439b918bc14b0565a5
)

vcpkg_extract_source_archive_ex(
Expand Down