Apply CR

Co-authored-by: Billy O'Neal <bion@microsoft.com>
microsoft · Oct 20, 2022 · e7f7e9e · e7f7e9e
1 parent cdfa4d1
commit e7f7e9e
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 7 deletions.
diff --git a/ports/xcb-errors/portfile.cmake b/ports/xcb-errors/portfile.cmake
@@ -31,7 +31,6 @@ vcpkg_fixup_pkgconfig()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-# # Handle copyright
- configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/xcb-errors/copyright" COPYONLY)
+file(INSTALL "${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 endif()
 
diff --git a/ports/xcb-image/add_return_value.patch b/ports/xcb-image/add_return_value.patch
@@ -6,6 +6,7 @@ index a6872a1f3..bf6fdc179 100644
        return XCB_IMAGE_ORDER_LSB_FIRST;
    }
    assert(0);
++  exit(EXIT_FAILURE);
 +  return -1;
  }
 

diff --git a/ports/xcb-keysyms/portfile.cmake b/ports/xcb-keysyms/portfile.cmake
@@ -25,6 +25,5 @@ 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-util/portfile.cmake b/ports/xcb-util/portfile.cmake
@@ -27,6 +27,5 @@ 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-wm/build.patch b/ports/xcb-wm/build.patch
@@ -7,7 +7,7 @@ index b986105f6..a0ce37c2a 100644
  #include <sys/types.h>
 
 -#define ssizeof(foo)            (ssize_t)sizeof(foo)
-+#define ssizeof(foo)            (size_t)sizeof(foo)
++#define ssizeof(foo)            (ptrdiff_t)sizeof(foo)
  #define countof(foo)            (ssizeof(foo) / ssizeof(foo[0]))
 
  /**

diff --git a/ports/xcb-wm/portfile.cmake b/ports/xcb-wm/portfile.cmake
@@ -26,7 +26,5 @@ 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(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 endif()