[libpng] remove broken patch (#6293)

4 files changed, 5 insertions, 33 deletions

diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL
index d5a6b559c..1baecccf3 100644
--- a/ports/libpng/CONTROL
+++ b/ports/libpng/CONTROL
@@ -1,4 +1,4 @@
 Source: libpng
-Version: 1.6.37
+Version: 1.6.37-1
 Build-Depends: zlib
 Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files.
diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake
index d6b35bf23..ab552b8e6 100644
--- a/ports/libpng/portfile.cmake
+++ b/ports/libpng/portfile.cmake
@@ -7,8 +7,7 @@ vcpkg_from_github(
     SHA512 ccb3705c23b2724e86d072e2ac8cfc380f41fadfd6977a248d588a8ad57b6abe0e4155e525243011f245e98d9b7afbe2e8cc7fd4ff7d82fcefb40c0f48f88918
     HEAD_REF master
     PATCHES
-        "use-abort-on-all-platforms.patch"
-        "skip-install-symlink.patch"
+        use-abort-on-all-platforms.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -45,15 +44,14 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     endif()
 endif()
 
-# Remove CMake config files as they are incorrectly generated and everyone uses built-in FindPNG anyway.
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/libpng ${CURRENT_PACKAGES_DIR}/debug/lib/libpng)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/libpng TARGET_PATH share/libpng)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/)
+
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libpng)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libpng/LICENSE ${CURRENT_PACKAGES_DIR}/share/libpng/copyright)
 
 vcpkg_copy_pdbs()
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-
 if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/png)
 endif()
diff --git a/ports/libpng/skip-install-symlink.patch b/ports/libpng/skip-install-symlink.patch
deleted file mode 100644
index c31177d7e..000000000
--- a/ports/libpng/skip-install-symlink.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt

-index 48c6fa2..589e5f9 100644

---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -868,7 +868,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )

-       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

-       FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR})

- 

--  if(PNG_SHARED)

-+  if(PNG_SHARED AND NOT SKIP_INSTALL_SYMLINK)

-     # Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin

-     if(CYGWIN OR MINGW)

-       CREATE_SYMLINK(libpng${CMAKE_IMPORT_LIBRARY_SUFFIX} TARGET png)

-@@ -881,7 +881,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )

-     endif(NOT WIN32)

-   endif(PNG_SHARED)

- 

--  if(PNG_STATIC)

-+  if(PNG_STATIC AND NOT SKIP_INSTALL_SYMLINK)

-     if(NOT WIN32 OR CYGWIN OR MINGW)

-       CREATE_SYMLINK( libpng${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static)

-       install(FILES $<TARGET_LINKER_FILE_DIR:png_static>/libpng${CMAKE_STATIC_LIBRARY_SUFFIX} DESTINATION ${CMAKE_INSTALL_LIBDIR})

diff --git a/ports/libpng/usage b/ports/libpng/usage
deleted file mode 100644
index 19203399c..000000000
--- a/ports/libpng/usage
+++ /dev/null
@@ -1,4 +0,0 @@
-The package libpng is compatible with built-in CMake targets:

-

-    find_package(PNG REQUIRED)

-    target_link_libraries(main PRIVATE PNG::PNG)