From ddcee8f0b8e10f5f5edfec54236eebece5448286 Mon Sep 17 00:00:00 2001
From: Frank <65999885+FrankXie05@users.noreply.github.com>
Date: Mon, 30 Dec 2024 15:26:59 +0000
Subject: [PATCH] [libmagic] Update version to 5.46 (#42939)

---
 .../0003-Fix-WIN32-macro-checks.patch         | 30 ++++++-------------
 ports/libmagic/portfile.cmake                 |  4 +--
 ports/libmagic/vcpkg.json                     |  3 +-
 versions/baseline.json                        |  4 +--
 versions/l-/libmagic.json                     |  5 ++++
 5 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/ports/libmagic/0003-Fix-WIN32-macro-checks.patch b/ports/libmagic/0003-Fix-WIN32-macro-checks.patch
index e90beb4d40..7b88b1f98f 100644
--- a/ports/libmagic/0003-Fix-WIN32-macro-checks.patch
+++ b/ports/libmagic/0003-Fix-WIN32-macro-checks.patch
@@ -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
diff --git a/ports/libmagic/portfile.cmake b/ports/libmagic/portfile.cmake
index c6d775fda7..910051a736 100644
--- a/ports/libmagic/portfile.cmake
+++ b/ports/libmagic/portfile.cmake
@@ -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}
 )
diff --git a/ports/libmagic/vcpkg.json b/ports/libmagic/vcpkg.json
index 3e6c159840..0beae3b462 100644
--- a/ports/libmagic/vcpkg.json
+++ b/ports/libmagic/vcpkg.json
@@ -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",
diff --git a/versions/baseline.json b/versions/baseline.json
index ca136278c4..acca7aec0b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -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",
diff --git a/versions/l-/libmagic.json b/versions/l-/libmagic.json
index 83db3e469a..981027da16 100644
--- a/versions/l-/libmagic.json
+++ b/versions/l-/libmagic.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "380e305405e20a74576fcee51673a98a5a49fe18",
+      "version": "5.46",
+      "port-version": 0
+    },
     {
       "git-tree": "167ff0a6360284c7c139765c23367ace49ce68b6",
       "version": "5.45",