mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-14 00:37:57 +08:00
[libmagic] Update version to 5.46 (#42939)
This commit is contained in:
parent
19f945ab2c
commit
ddcee8f0b8
@ -1,14 +1,5 @@
|
||||
From 2fffeb273ea46c1e91536f3d660982de785c8d49 Mon Sep 17 00:00:00 2001
|
||||
From: Long Nguyen <nguyen.long.908132@gmail.com>
|
||||
Date: Sat, 8 May 2021 20:52:59 +0700
|
||||
Subject: [PATCH 03/14] Fix WIN32 macro checks
|
||||
|
||||
---
|
||||
src/file.h | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/file.h b/src/file.h
|
||||
index 299ac0c..2c365a6 100644
|
||||
index a67e8ff..9115c5b 100644
|
||||
--- a/src/file.h
|
||||
+++ b/src/file.h
|
||||
@@ -82,7 +82,7 @@
|
||||
@ -20,7 +11,7 @@ index 299ac0c..2c365a6 100644
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
/* Do this here and now, because struct stat gets re-defined on solaris */
|
||||
@@ -95,7 +95,7 @@
|
||||
@@ -99,7 +99,7 @@
|
||||
#define MAGIC "/etc/magic"
|
||||
#endif
|
||||
|
||||
@ -29,15 +20,12 @@ index 299ac0c..2c365a6 100644
|
||||
#define PATHSEP ';'
|
||||
#else
|
||||
#define PATHSEP ':'
|
||||
@@ -103,7 +103,7 @@
|
||||
|
||||
@@ -108,7 +108,7 @@
|
||||
#define file_private static
|
||||
|
||||
-#if HAVE_VISIBILITY && !defined(WIN32)
|
||||
+#if HAVE_VISIBILITY && !defined(_WIN32)
|
||||
#define file_public __attribute__ ((__visibility__("default")))
|
||||
#ifndef file_protected
|
||||
#define file_protected __attribute__ ((__visibility__("hidden")))
|
||||
--
|
||||
2.29.2.windows.2
|
||||
|
||||
#if HAVE_VISIBILITY
|
||||
-# if defined(WIN32)
|
||||
+# if defined(_WIN32)
|
||||
# define file_public __declspec(dllexport)
|
||||
# ifndef file_protected
|
||||
# define file_protected
|
||||
|
@ -21,8 +21,8 @@ endif()
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO file/file
|
||||
REF FILE5_45
|
||||
SHA512 fdd4c5d13d5ea1d25686c76d8ebc3252c54040c4871e3f0f623c4548b3841795d4e36050292a9453eedf0fbf932573890e9d6ac9fa63ccf577215598ae84b9ea
|
||||
REF FILE5_46
|
||||
SHA512 9165bb5bdbe7b8fccac0c8675d4eb251a286ab2ab7a79e6f8ed98d36fa0928b889cf109c1da3a5cfff64d1b1006b5d73934c2d420484adae6f4c8e26a9ede18f
|
||||
HEAD_REF master
|
||||
PATCHES ${PATCHES}
|
||||
)
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "libmagic",
|
||||
"version": "5.45",
|
||||
"port-version": 3,
|
||||
"version": "5.46",
|
||||
"description": "This library can be used to classify files according to magic number tests.",
|
||||
"homepage": "https://github.com/file/file",
|
||||
"license": "BSD-2-Clause",
|
||||
|
@ -4789,8 +4789,8 @@
|
||||
"port-version": 3
|
||||
},
|
||||
"libmagic": {
|
||||
"baseline": "5.45",
|
||||
"port-version": 3
|
||||
"baseline": "5.46",
|
||||
"port-version": 0
|
||||
},
|
||||
"libmariadb": {
|
||||
"baseline": "3.4.1",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "380e305405e20a74576fcee51673a98a5a49fe18",
|
||||
"version": "5.46",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "167ff0a6360284c7c139765c23367ace49ce68b6",
|
||||
"version": "5.45",
|
||||
|
Loading…
x
Reference in New Issue
Block a user