microsoft · Neumann-A · Nov 22, 2021 · Nov 22, 2021 · Nov 22, 2021 · Nov 22, 2021
diff --git a/ports/dbus/cmake.dep.patch b/ports/dbus/cmake.dep.patch
@@ -0,0 +1,15 @@
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+index 8cde1ffe0..d4d09f223 100644
+--- a/tools/CMakeLists.txt	
++++ b/tools/CMakeLists.txt
+@@ -91,7 +91,9 @@ endif()
+ add_executable(dbus-launch ${dbus_launch_SOURCES})
+ target_link_libraries(dbus-launch ${DBUS_LIBRARIES})
+ if(DBUS_BUILD_X11)
+-    target_link_libraries(dbus-launch ${X11_LIBRARIES} )
++    find_package(Threads REQUIRED)
++    target_link_libraries(dbus-launch ${X11_LIBRARIES} xcb ${X11_Xau_LIB} ${X11_Xdmcp_LIB} Threads::Threads)
++    target_include_directories(dbus-launch PRIVATE ${X11_INCLUDE_DIR})
+ endif()
+ install(TARGETS dbus-launch ${INSTALL_TARGETS_DEFAULT_ARGS})
+
diff --git a/ports/dbus/portfile.cmake b/ports/dbus/portfile.cmake
@@ -0,0 +1,51 @@
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org/
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO dbus/dbus
+    REF c91ca6edad658274607323a438eea7c7c6c5e392 #1.13.18
+    SHA512  4dd4d369152591040ebe9f474a0ba8911d8a91546d64b1d6f7335b7fd8026bd99a8a4fe1c78b80eb2e31e9e58324d432857e2a7af1d1cb950d22b4430cc0f7ac
+    HEAD_REF master # branch name
+    PATCHES cmake.dep.patch #patch name
+) 
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    PREFER_NINJA
+    OPTIONS
+        -DDBUS_BUILD_TESTS=OFF
+        -DDBUS_ENABLE_XML_DOCS=OFF
+        -DDBUS_INSTALL_SYSTEM_LIBS=ON
+        -DDBUS_WITH_GLIB=ON
+        -DXSLTPROC_EXECUTABLE=FALSE
+)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/DBus1")
+vcpkg_fixup_pkgconfig() 
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+# # Handle copyright
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+file(REMOVE_RECURSE     "${CURRENT_PACKAGES_DIR}/debug/var/"
+                        "${CURRENT_PACKAGES_DIR}/var"
+                        "${CURRENT_PACKAGES_DIR}/share/dbus-1/services"
+                        "${CURRENT_PACKAGES_DIR}/share/dbus-1/session.d"
+                        "${CURRENT_PACKAGES_DIR}/share/dbus-1/system-services"
+                        "${CURRENT_PACKAGES_DIR}/share/dbus-1/system.d")
+
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+set(TOOLS daemon launch monitor run-session send test-tool update-activation-environment)
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    list(APPEND TOOLS cleanup-sockets uuidgen)
+else()
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/dbus-env.bat" "${CURRENT_PACKAGES_DIR}" "%~dp0/..")
+endif()
+list(TRANSFORM TOOLS PREPEND "dbus-" )
+vcpkg_copy_tools(TOOL_NAMES ${TOOLS} AUTO_CLEAN)
+
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
diff --git a/ports/dbus/vcpkg.json b/ports/dbus/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "dbus",
+  "version-semver": "1.13.18",
+  "description": "D-Bus specification and reference implementation, including libdbus and dbus-daemon",
+  "homepage": "https://gitlab.freedesktop.org/dbus/dbus",
+  "dependencies": [
+    "expat",
+    "glib",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "x11"
+  ]
+}
diff --git a/ports/font-util/build.patch b/ports/font-util/build.patch
@@ -0,0 +1,33 @@
+diff --git a/bdftruncate.c b/bdftruncate.c
+index 2b317c0b0..3ab84978f 100644
+--- a/bdftruncate.c	
++++ b/bdftruncate.c
+@@ -40,7 +40,13 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-
++#if defined(_MSC_VER)
++# if defined(_M_X64)
++#  define SSIZE_MAX 9223372036854775807
++# else
++#  define SSIZE_MAX 2147483647
++# endif
++#endif
+ #if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205))	\
+         || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+ # define ATTR_NORETURN __attribute((noreturn))
+diff --git a/ucs2any.c b/ucs2any.c
+index 1f575d14f..75b662b3d 100644
+--- a/ucs2any.c	
++++ b/ucs2any.c
+@@ -49,7 +49,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
+
+ /* global variable for argv[0] */
+ static const char *my_name = NULL;
diff --git a/ports/font-util/portfile.cmake b/ports/font-util/portfile.cmake
@@ -0,0 +1,55 @@
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+
+if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
+    message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES")
+    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+endif()
+
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org/xorg
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO font/util
+    REF  d45011b8324fecebb4fc79e57491d341dd96e325 #1.3.2
+    SHA512 d783cbb5b8b0975891a247f98b78c2afadfd33e1d26ee8bcf7ab7ccc11615b0150d07345c719182b0929afc3c54dc3288a01a789b5374e18aff883ac23d15b04
+    HEAD_REF master # branch name
+    PATCHES build.patch #patch name
+) 
+
+set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
+
+if(VCPKG_TARGET_IS_WINDOWS)
+    list(APPEND VCPKG_C_FLAGS " /DNEED_BASENAME")
+    list(APPEND VCPKG_CXX_FLAGS " /DNEED_BASENAME")
+endif()
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    AUTOCONFIG
+)
+
+vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/")
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal")
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/fonts/" "${CURRENT_PACKAGES_DIR}/share/xorg/fonts")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/debug")
+
+set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/fontutil.pc")
+file(READ "${_file}" _contents)
+string(REPLACE "datarootdir=\${prefix}/share/${PORT}" "datarootdir=\${prefix}/share/xorg" _contents "${_contents}")
+string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/tools/${PORT}" _contents "${_contents}")
+file(WRITE "${_file}" "${_contents}")
+
+set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontutil.pc")
+file(READ "${_file}" _contents)
+string(REPLACE "datarootdir=\${prefix}/share/${PORT}" "datarootdir=\${prefix}/../share/xorg" _contents "${_contents}")
+string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/../tools/${PORT}" _contents "${_contents}")
+file(WRITE "${_file}" "${_contents}")
+
+# # Handle copyright
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright")
diff --git a/ports/font-util/vcpkg.json b/ports/font-util/vcpkg.json
@@ -0,0 +1,9 @@
+{
+  "name": "font-util",
+  "version-string": "1.3.2",
+  "description": "X.Org font package creation/installation utilities",
+  "homepage": "https://gitlab.freedesktop.org/xorg/font/util",
+  "dependencies": [
+    "xorg-macros"
+  ]
+}
diff --git a/ports/fontenc/build.patch b/ports/fontenc/build.patch
@@ -0,0 +1,38 @@
+diff --git a/src/encparse.c b/src/encparse.c
+index 548110ede..61952b9ce 100644
+--- a/src/encparse.c	
++++ b/src/encparse.c
+@@ -28,12 +28,16 @@ THE SOFTWARE.
+    to be pure ASCII.  Bloody ``Code Set Independence''. */
+
+ #include <string.h>
++#ifndef _MSC_VER
+ #include <strings.h>
++#else
++#define strcasecmp _stricmp
++#endif
+ #include <stdio.h>
+
+ #include <stdlib.h>
+
+-#include "zlib.h"
++#include <zlib.h>
+ typedef gzFile FontFilePtr;
+
+ #define FontFileGetc(f) gzgetc(f)
+diff --git a/src/fontenc.c b/src/fontenc.c
+index c4ccd5eb0..e87d1089d 100644
+--- a/src/fontenc.c	
++++ b/src/fontenc.c
+@@ -23,7 +23,11 @@ THE SOFTWARE.
+ /* Backend-independent encoding code */
+
+ #include <string.h>
++#ifndef _MSC_VER
+ #include <strings.h>
++#else
++#define strcasecmp _stricmp
++#endif
+ #include <stdlib.h>
+
+ #define FALSE 0
diff --git a/ports/fontenc/configure.ac.patch b/ports/fontenc/configure.ac.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index cadc653a0..aa645af81 100644
+--- a/configure.ac	
++++ b/configure.ac
+@@ -47,7 +47,7 @@ XORG_FONTSUBDIR([ENCODINGSDIR], [encodingsdir], [encodings])
+ # zlib
+ AC_CHECK_HEADER([zlib.h], [],
+                 AC_MSG_FAILURE([zlib.h is required to compile libfontenc]))
+-AC_CHECK_LIB(z, gzclose, [],
++AC_SEARCH_LIBS(gzclose, [z zlib zlibd], [],
+              AC_MSG_FAILURE([zlib is required to compile libfontenc]))
+
+ # Obtain compiler/linker options for depedencies
diff --git a/ports/fontenc/portfile.cmake b/ports/fontenc/portfile.cmake
@@ -0,0 +1,32 @@
+if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
+    message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES")
+    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+endif()
+
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org/xorg
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lib/libfontenc
+    REF  2baea13978759d1a011fc6d739465893b554d30a #1.1.4
+    SHA512 5ebef8b516a2377b004894b53d56ad960bc5179d9f9a36e18bc2228ea04e8f87e9baffd4883c21783dd1f4c57d7f521cdfa42c1e9facae60c6fc2c9f5472230e
+    HEAD_REF master # branch name
+    PATCHES configure.ac.patch
+            build.patch #patch name
+) 
+set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    AUTOCONFIG
+)
+
+vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+# # Handle copyright
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/")
+file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto
+
diff --git a/ports/fontenc/vcpkg.json b/ports/fontenc/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "fontenc",
+  "version-string": "1.1.4",
+  "description": "X font encoding library",
+  "homepage": "https://gitlab.freedesktop.org/xorg/lib/libfontenc",
+  "dependencies": [
+    "font-util",
+    "xorg-macros",
+    "xproto",
+    "zlib"
+  ]
+}
diff --git a/ports/ice/portfile.cmake b/ports/ice/portfile.cmake
@@ -0,0 +1,30 @@
+if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
+    message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES")
+    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+endif()
+
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org/xorg
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lib/libice
+    REF 8e6a14c63d6b73cde87cb331439f2a4d19cba5b9 # 1.0.10
+    SHA512  ad79cfbc3b1d51fb1f019bc088999ac8a64062a71667dbb4ffb62fe6d1b7dba7665944f64be6dcd27de08cc77e91512de97231db1e4ac018088727e90113d040
+    HEAD_REF master # branch name
+    PATCHES fix_build.patch
+) 
+
+set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    AUTOCONFIG
+)
+
+vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+# Handle copyright
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/ice/vcpkg.json b/ports/ice/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "ice",
+  "version-string": "1.0.10",
+  "description": "Inter-Client Exchange Library",
+  "homepage": "https://gitlab.freedesktop.org/xorg/lib/libice",
+  "dependencies": [
+    "bzip2",
+    "xlib",
+    "xorg-macros",
+    "xproto",
+    "xtrans"
+  ]
+}
diff --git a/ports/pciaccess/portfile.cmake b/ports/pciaccess/portfile.cmake
@@ -0,0 +1,30 @@
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org/xorg
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lib/libpciaccess
+    REF  fbd1f0fe79ba25b72635f8e36a6c33d7e0ca19f6 #0.16
+    SHA512 e148e513453e4d6c131287d69910fa14b66557039acdfe3c59ec8de280841a62b9c727203331ebc2e9f0f1797dccbe22ca99aeecae78314448ef3cca017bc883
+    HEAD_REF master # branch name
+) 
+#file(TOUCH ${SOURCE_PATH}/m4/dummy)
+set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
+
+vcpkg_configure_make(
+    SOURCE_PATH ${SOURCE_PATH}
+    AUTOCONFIG
+    OPTIONS_DEBUG
+        --with-zlib=${CURRENT_INSTALLED_DIR}
+    OPTIONS_RELEASE
+        --with-zlib=${CURRENT_INSTALLED_DIR}/debug
+)
+
+vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+# # Handle copyright
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/")
+file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto
+
diff --git a/ports/pciaccess/vcpkg.json b/ports/pciaccess/vcpkg.json
@@ -0,0 +1,11 @@
+{
+  "name": "pciaccess",
+  "version-string": "0.16",
+  "description": "Generic PCI access library",
+  "homepage": "https://gitlab.freedesktop.org/xorg/lib/libpciaccess",
+  "supports": "!windows",
+  "dependencies": [
+    "xorg-macros",
+    "zlib"
+  ]
+}