From d2845dc758c3ba057efce12d8d4c1ebf9c9dd33d Mon Sep 17 00:00:00 2001
From: jim wang <122244446+jimwang118@users.noreply.github.com>
Date: Thu, 16 Nov 2023 07:04:47 +0800
Subject: [PATCH] [sfml] Update to 2.6.1 (#35118)

* update to 2.6.1

* update version
---
 ports/sfml/fix-osx.patch  | 13 -------------
 ports/sfml/portfile.cmake |  3 +--
 ports/sfml/vcpkg.json     |  3 +--
 versions/baseline.json    |  4 ++--
 versions/s-/sfml.json     |  5 +++++
 5 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 ports/sfml/fix-osx.patch

diff --git a/ports/sfml/fix-osx.patch b/ports/sfml/fix-osx.patch
deleted file mode 100644
index afbaa282b4..0000000000
--- a/ports/sfml/fix-osx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake
-index e0118eb..76a4dcc 100644
---- a/cmake/Macros.cmake
-+++ b/cmake/Macros.cmake
-@@ -24,8 +24,6 @@ function(sfml_set_stdlib target)
-         if (${CMAKE_GENERATOR} MATCHES "Xcode")
-             sfml_set_xcode_property(${target} CLANG_CXX_LIBRARY "libc++")
-         else()
--            target_compile_options(${target} PRIVATE "-stdlib=libc++")
--            target_link_libraries(${target} PRIVATE "-stdlib=libc++")
-         endif()
-     endif()
- endfunction()
diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake
index 38d1612dc1..4a8c497fec 100644
--- a/ports/sfml/portfile.cmake
+++ b/ports/sfml/portfile.cmake
@@ -2,10 +2,9 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO SFML/SFML
     REF "${VERSION}"
     HEAD_REF master
-    SHA512 aac734e8b0e16936c0238ec792c922923545ec6cf06576bc70004fa1920cd05b4c5e56fbc8a77b650bbe6e202adc39df1d30509dbce95778d04338917a38a87a
+    SHA512 b376d3b00277ed60d107fe1268c210749b3aafcee618a8f924b181a9b476e92b9cb9baddecf70a8913b5910c471d53ea0260a876ad7b2db2b98b944d9f508714
     PATCHES
         fix-dependencies.patch
-        fix-osx.patch
 )
 
 # The embedded FindFreetype doesn't properly handle debug libraries
diff --git a/ports/sfml/vcpkg.json b/ports/sfml/vcpkg.json
index 575742ee9a..3f17c0aac6 100644
--- a/ports/sfml/vcpkg.json
+++ b/ports/sfml/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "sfml",
-  "version": "2.6.0",
-  "port-version": 19,
+  "version": "2.6.1",
   "description": "Simple and fast multimedia library",
   "homepage": "https://github.com/SFML/SFML",
   "license": "Zlib",
diff --git a/versions/baseline.json b/versions/baseline.json
index 396787b66f..e70b0a8ec9 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7769,8 +7769,8 @@
       "port-version": 6
     },
     "sfml": {
-      "baseline": "2.6.0",
-      "port-version": 19
+      "baseline": "2.6.1",
+      "port-version": 0
     },
     "sfsexp": {
       "baseline": "1.3.1",
diff --git a/versions/s-/sfml.json b/versions/s-/sfml.json
index 57dc77d8e9..8f37cff22b 100644
--- a/versions/s-/sfml.json
+++ b/versions/s-/sfml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3cf9cce0cc82c37f5a37c1c97d05c7fcb4609486",
+      "version": "2.6.1",
+      "port-version": 0
+    },
     {
       "git-tree": "29d5488afb2bc4a0ea9a986412d569ba9575809b",
       "version": "2.6.0",