diff --git a/ports/xcb-cursor/build.patch b/ports/xcb-cursor/build.patch deleted file mode 100644 index b2875fe06463a3..00000000000000 --- a/ports/xcb-cursor/build.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff --git a/cursor/cursor.h b/cursor/cursor.h -index 455dc3485..f1bfd60db 100644 ---- a/cursor/cursor.h -+++ b/cursor/cursor.h -@@ -106,18 +106,32 @@ struct xcb_cursor_context_t { - /* little-endian */ - #define XCURSOR_MAGIC 0x72756358 - -+#ifdef _MSC_VER -+ #define PACKED -+#else -+ #define PACKED __attribute__((packed)) -+#endif -+ -+#ifdef _MSC_VER -+#pragma pack(push,1) -+#endif -+ - typedef struct xcint_file_header_t { - uint32_t magic; - uint32_t header; - uint32_t version; - uint32_t ntoc; --} __attribute__((packed)) xcint_file_header_t; -+} PACKED xcint_file_header_t; - - typedef struct xcint_file_toc_t { - uint32_t type; - uint32_t subtype; - uint32_t position; --} __attribute__((packed)) xcint_file_toc_t; -+} PACKED xcint_file_toc_t; -+ -+#ifdef _MSC_VER -+#pragma pack(pop) -+#endif - - typedef struct xcint_cursor_file_t { - xcint_file_header_t header; -@@ -140,12 +154,16 @@ typedef struct xcint_cursor_file_t { - * CARD32 version chunk type version - */ - -+#ifdef _MSC_VER -+#pragma pack(push,1) -+#endif -+ - typedef struct xcint_chunk_header_t { - uint32_t header; - uint32_t type; - uint32_t subtype; - uint32_t version; --} __attribute__((packed)) xcint_chunk_header_t; -+} PACKED xcint_chunk_header_t; - - #define XCURSOR_IMAGE_TYPE 0xfffd0002 - #define XCURSOR_IMAGE_VERSION 1 -@@ -158,7 +176,13 @@ typedef struct xcint_image_t { - uint32_t yhot; - uint32_t delay; - uint32_t *pixels; --} __attribute__((packed)) xcint_image_t; -+} PACKED xcint_image_t; -+ -+#ifdef _MSC_VER -+#pragma pack(pop) -+#endif -+ -+#undef PACKED - - /* shape_to_id.c */ - const int cursor_shape_to_id(const char *name); -diff --git a/cursor/load_cursor.c b/cursor/load_cursor.c -index e82fc63e9..1d574a7d2 100644 ---- a/cursor/load_cursor.c -+++ b/cursor/load_cursor.c -@@ -35,7 +35,12 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif -+#ifdef _MSC_VER -+#include -+#endif - - #include - #include -@@ -223,7 +228,11 @@ xcb_cursor_t xcb_cursor_load_cursor(xcb_cursor_context_t *c, const char *name) { - close(fd); - - /* create a cursor from it */ -+#ifdef _MSC_VER -+ xcb_render_animcursorelt_t * elements =(xcb_render_animcursorelt_t*)_alloca(nimg*sizeof(xcb_render_animcursorelt_t)); -+#else - xcb_render_animcursorelt_t elements[nimg]; -+#endif - xcb_render_picture_t pic = xcb_generate_id(c->conn); - - for (int n = 0; n < nimg; n++) { -diff --git a/cursor/parse_cursor_file.c b/cursor/parse_cursor_file.c -index 21f72bf5b..c43dd82b4 100644 ---- a/cursor/parse_cursor_file.c -+++ b/cursor/parse_cursor_file.c -@@ -34,9 +34,15 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif - #include - -+#ifdef _MSC_VER -+# include -+#endif -+ - #ifdef HAVE_ENDIAN_H - #include - #endif diff --git a/ports/xcb-cursor/portfile.cmake b/ports/xcb-cursor/portfile.cmake deleted file mode 100644 index 679c987c6b2fcd..00000000000000 --- a/ports/xcb-cursor/portfile.cmake +++ /dev/null @@ -1,36 +0,0 @@ -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 in your triplet!") - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -else() -vcpkg_from_gitlab( - GITLAB_URL https://gitlab.freedesktop.org/xorg - OUT_SOURCE_PATH SOURCE_PATH - REPO lib/libxcb-cursor - REF 95b9a8fd876fdbbc854cdf3d90317be3846c7417 #0.1.3 - SHA512 cca7bf1f2aeaab8d256052a676098d7c600b90dc47cf9bc84d11229e59fbf5c83f7f877b8538f7cc662983807566d28c87b3501abc7cab76cc553d9db29eceb9 - HEAD_REF master - PATCHES build.patch -) - -vcpkg_find_acquire_program(GPERF) -get_filename_component(GPERF_DIR "${GPERF}" DIRECTORY) -vcpkg_add_to_path("${GPERF_DIR}") - -set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") - -vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG - COPY_SOURCE -) - -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) -endif() - diff --git a/ports/xcb-cursor/vcpkg.json b/ports/xcb-cursor/vcpkg.json deleted file mode 100644 index 60b85ca80ee119..00000000000000 --- a/ports/xcb-cursor/vcpkg.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "xcb-cursor", - "version": "0.1.3", - "description": "XCB port of libXcursor", - "homepage": "https://xcb.freedesktop.org/", - "license": null, - "dependencies": [ - "xcb", - "xcb-image", - "xcb-render-util", - "xcb-util" - ] -} diff --git a/versions/baseline.json b/versions/baseline.json index 71c930d8bd132f..619a1cda3e89f3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7952,10 +7952,6 @@ "baseline": "1.14", "port-version": 0 }, - "xcb-cursor": { - "baseline": "0.1.3", - "port-version": 0 - }, "xcb-errors": { "baseline": "1.0", "port-version": 0 diff --git a/versions/x-/xcb-cursor.json b/versions/x-/xcb-cursor.json deleted file mode 100644 index 824a4fab4c9dc2..00000000000000 --- a/versions/x-/xcb-cursor.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "4c4580d327e0da114f7cd704e2423ae90dfc733c", - "version": "0.1.3", - "port-version": 0 - } - ] -}