[giflib,libpq]: Fix wrappers and libpq[nls](windows) (#45573)

ports/giflib/vcpkg-cmake-wrapper.cmake

@@ -14,7 +14,7 @@ if(NOT TARGET GIF::GIF)
         IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
         IMPORTED_LOCATION_RELEASE "${GIF_LIBRARY_RELEASE}"
     )
-    if("${GIF_LIBRARY_DEBUG}")
+    if(GIF_LIBRARY_DEBUG)
         set_property(TARGET GIF::GIF APPEND PROPERTY
             IMPORTED_CONFIGURATIONS DEBUG)
         set_target_properties(GIF::GIF PROPERTIES

ports/giflib/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "giflib",
   "version": "5.2.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A library for reading and writing gif images.",
   "homepage": "https://sourceforge.net/projects/giflib/",
   "license": "MIT",

ports/libpq/portfile.cmake

@@ -47,10 +47,6 @@ foreach(program_name IN LISTS required_programs)
 endforeach()
 
 if(VCPKG_DETECTED_MSVC)
-    if("nls" IN_LIST FEATURES)
-        vcpkg_acquire_msys(MSYS_ROOT PACKAGES gettext)
-        vcpkg_add_to_path("${MSYS_ROOT}/usr/bin")
-    endif()
     if("xml" IN_LIST FEATURES)
         x_vcpkg_pkgconfig_get_modules(
             PREFIX PC_LIBXML2
@@ -98,16 +94,13 @@ else()
     endforeach()
     if("nls" IN_LIST FEATURES)
         set(ENV{MSGFMT} "${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin/msgfmt${VCPKG_HOST_EXECUTABLE_SUFFIX}")
-        if(VCPKG_TARGET_IS_ANDROID)
-            list(APPEND BUILD_OPTS [[LIBS=$LIBS -liconv]])
-        endif()
     endif()
     if("python" IN_LIST FEATURES)
         list(APPEND BUILD_OPTS --with-python=3.${PYTHON_VERSION_MINOR})
         vcpkg_find_acquire_program(PYTHON3)
         list(APPEND BUILD_OPTS "PYTHON=${PYTHON3}")
     endif()
-    if(VCPKG_TARGET_IS_ANDROID) # AND CMAKE_SYSTEM_VERSION LESS 26)
+    if(VCPKG_TARGET_IS_ANDROID AND (NOT VCPKG_CMAKE_SYSTEM_VERSION OR VCPKG_CMAKE_SYSTEM_VERSION LESS "26"))
         list(APPEND BUILD_OPTS ac_cv_header_langinfo_h=no)
     endif()
     if(VCPKG_DETECTED_CMAKE_OSX_SYSROOT)

ports/libpq/vcpkg-cmake-wrapper.cmake

@@ -1,10 +1,5 @@
-# Give the CMake module a little bit of help to find the debug libraries
-find_library(PostgreSQL_LIBRARY_DEBUG
-NAMES pq
-PATHS
-  "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib"
-NO_DEFAULT_PATH
-)
+find_library(PostgreSQL_LIBRARY_RELEASE NAMES pq libpq NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH REQUIRED)
+find_library(PostgreSQL_LIBRARY_DEBUG NAMES pq libpq NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
 _find_package(${ARGS})
 if(PostgreSQL_FOUND AND NOT "@VCPKG_TARGET_IS_WINDOWS@")
     find_library(PostgreSQL_DL_LIBRARY NAMES dl)
@@ -17,9 +12,10 @@ if(PostgreSQL_FOUND AND NOT "@VCPKG_TARGET_IS_WINDOWS@")
 endif()
 if(PostgreSQL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
     include(SelectLibraryConfigurations)
-    foreach(LIB_ITEM libpgport libpgcommon pgport pgcommon)
+    foreach(LIB_ITEM pgport pgcommon)
         find_library(PostgreSQL_${LIB_ITEM}_LIBRARY_RELEASE
-            NAMES ${LIB_ITEM}
+            NAMES ${LIB_ITEM} lib${LIB_ITEM}
+            NAMES_PER_DIR
             PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH
         )
         if(TARGET PostgreSQL::PostgreSQL AND PostgreSQL_${LIB_ITEM}_LIBRARY_RELEASE)
@@ -30,7 +26,8 @@ if(PostgreSQL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
         endif()
         
         find_library(PostgreSQL_${LIB_ITEM}_LIBRARY_DEBUG
-            NAMES ${LIB_ITEM}
+            NAMES ${LIB_ITEM} lib${LIB_ITEM}
+            NAMES_PER_DIR
             PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH
         )
         if(TARGET PostgreSQL::PostgreSQL AND PostgreSQL_${LIB_ITEM}_LIBRARY_DEBUG)

ports/libpq/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "libpq",
   "version": "16.4",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The official database access API of postgresql",
   "homepage": "https://www.postgresql.org/",
   "license": "PostgreSQL",
@@ -104,15 +104,14 @@
       "description": "Native Language Support",
       "supports": "!osx",
       "dependencies": [
-        "gettext",
         {
           "name": "gettext",
           "host": true,
           "features": [
             "tools"
-          ],
-          "platform": "!windows, mingw"
-        }
+          ]
+        },
+        "gettext-libintl"
       ]
     },
     "openssl": {

scripts/ci.feature.baseline.txt

@@ -1317,7 +1317,7 @@ libpmemobj-cpp[benchmark]:x64-linux = cascade
 libpmemobj-cpp[benchmark]:x64-uwp = cascade
 libpmemobj-cpp[benchmark]:x64-windows-static = cascade
 libpmemobj-cpp[benchmark]:x86-windows = cascade
-libpq[tcl]:arm64-windows = cascade
+libpq[python](android) = cascade
 libpqxx:arm64-uwp = cascade
 libpqxx:x64-uwp = cascade
 libqglviewer:arm64-uwp = cascade

versions/baseline.json

@@ -3194,7 +3194,7 @@
     },
     "giflib": {
       "baseline": "5.2.2",
-      "port-version": 1
+      "port-version": 2
     },
     "ginkgo": {
       "baseline": "1.9.0",
@@ -5158,7 +5158,7 @@
     },
     "libpq": {
       "baseline": "16.4",
-      "port-version": 1
+      "port-version": 2
     },
     "libpqxx": {
       "baseline": "7.10.1",

versions/g-/giflib.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "17240ea00489d3481a0854537cdd63ea702cb06a",
+      "version": "5.2.2",
+      "port-version": 2
+    },
     {
       "git-tree": "77107ea5a74e4fd5dacee22023f1312a2eef4592",
       "version": "5.2.2",

versions/l-/libpq.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4c891a9439b8d5d8506a1ec8585a6eb0678d7d89",
+      "version": "16.4",
+      "port-version": 2
+    },
     {
       "git-tree": "363c3446e2a55de9d9bbf1df48d520a6bc5be619",
       "version": "16.4",