mirror of https://github.com/microsoft/vcpkg.git
[libxkbfile] Update to 1.2.0
This commit is contained in:
parent
908da3a305
commit
7364d5a9f4
|
|
@ -1,15 +0,0 @@
|
|||
diff --git a/src/xkbmisc.c b/src/xkbmisc.c
|
||||
index 2f9b532e6..8be8dd508 100644
|
||||
--- a/src/xkbmisc.c
|
||||
+++ b/src/xkbmisc.c
|
||||
@@ -688,7 +688,9 @@ XkbNameMatchesPattern(char *name, char *ptrn)
|
||||
_X_HIDDEN int
|
||||
_XkbStrCaseCmp(char *str1, char *str2)
|
||||
{
|
||||
- const u_char *us1 = (const u_char *) str1, *us2 = (const u_char *) str2;
|
||||
+ typedef unsigned char u_char;
|
||||
+ const u_char *us1 = (const u_char *) str1;
|
||||
+ const u_char *us2 = (const u_char *) str2;
|
||||
|
||||
while (tolower(*us1) == tolower(*us2)) {
|
||||
if (*us1++ == '\0')
|
||||
|
|
@ -1,26 +1,19 @@
|
|||
if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
if(NOT "force-build" IN_LIST FEATURES AND NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES)
|
||||
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)
|
||||
return()
|
||||
endif()
|
||||
|
||||
set(PATCHES "")
|
||||
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
set(PATCHES symbol_visibility.patch)
|
||||
list(APPEND VCPKG_C_FLAGS "/DXKBFILE_BUILD")
|
||||
list(APPEND VCPKG_CXX_FLAGS "/DXKBFILE_BUILD")
|
||||
endif()
|
||||
vcpkg_download_distfile(
|
||||
LIBXKBFILE_ARCHIVE
|
||||
URLS "https://www.x.org/releases/individual/lib/libxkbfile-${VERSION}.tar.xz"
|
||||
FILENAME "libxkbfile-${VERSION}.tar.xz"
|
||||
SHA512 772035b6bc1d692e8141e095fc2a8cf2ba7daed1d7148def862103160e0d7706f46865367befbbe4c777e7311b224d2cd4474f399d747b122dd395deac3e7cb7
|
||||
)
|
||||
|
||||
vcpkg_from_gitlab(
|
||||
GITLAB_URL https://gitlab.freedesktop.org/xorg
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO lib/libxkbfile
|
||||
REF "libxkbfile-${VERSION}"
|
||||
SHA512 e4b0fc6d9525669fe85cd8ebb096ce4a9355de00e7356dbe6c3cb194f6aa2449ef345811ce4934bb8c09edb94eee08227f7f20ee1df4a8a49697a3dc85cd704e
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix_u_char.patch
|
||||
${PATCHES}
|
||||
vcpkg_extract_source_archive(
|
||||
SOURCE_PATH
|
||||
ARCHIVE "${LIBXKBFILE_ARCHIVE}"
|
||||
)
|
||||
|
||||
vcpkg_configure_meson(
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
diff --git a/include/X11/extensions/XKBfile.h b/include/X11/extensions/XKBfile.h
|
||||
index 1455463..d883bda 100644
|
||||
--- a/include/X11/extensions/XKBfile.h
|
||||
+++ b/include/X11/extensions/XKBfile.h
|
||||
@@ -83,10 +83,19 @@ typedef void (*XkbFileAddOnFunc)(
|
||||
#define _XkbErrXReqFailure 25
|
||||
#define _XkbErrBadImplementation 26
|
||||
|
||||
-extern const char * _XkbErrMessages[];
|
||||
-extern unsigned _XkbErrCode;
|
||||
-extern const char * _XkbErrLocation;
|
||||
-extern unsigned _XkbErrData;
|
||||
+#ifdef _MSC_VER
|
||||
+# ifdef XKBFILE_BUILD
|
||||
+# define XKBFILE_EXTERN __declspec(dllexport)
|
||||
+# else
|
||||
+# define XKBFILE_EXTERN __declspec(dllimport)
|
||||
+# endif
|
||||
+#else
|
||||
+# define XKBFILE_EXTERN extern
|
||||
+#endif
|
||||
+XKBFILE_EXTERN const char * _XkbErrMessages[];
|
||||
+XKBFILE_EXTERN unsigned _XkbErrCode;
|
||||
+XKBFILE_EXTERN const char * _XkbErrLocation;
|
||||
+XKBFILE_EXTERN unsigned _XkbErrData;
|
||||
|
||||
/***====================================================================***/
|
||||
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
{
|
||||
"name": "libxkbfile",
|
||||
"version": "1.1.3",
|
||||
"version": "1.2.0",
|
||||
"description": "XKB file handling routines",
|
||||
"homepage": "https://gitlab.freedesktop.org/xorg/lib/libxkbfile",
|
||||
"license": null,
|
||||
"supports": "!windows | mingw",
|
||||
"dependencies": [
|
||||
"libx11",
|
||||
{
|
||||
|
|
@ -11,5 +12,11 @@
|
|||
"host": true
|
||||
},
|
||||
"xproto"
|
||||
]
|
||||
],
|
||||
"features": {
|
||||
"force-build": {
|
||||
"description": "Forces the library to be built always, regardless of X_VCPKG_FORCE_VCPKG_X_LIBRARIES.",
|
||||
"supports": "linux"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6021,7 +6021,7 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"libxkbfile": {
|
||||
"baseline": "1.1.3",
|
||||
"baseline": "1.2.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"libxlsxwriter": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "aae104e594c5f276a8fb06a934730f3bd26d8575",
|
||||
"version": "1.2.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "e3ad6a7944b9fa13961174ac72b4a9045cc71f82",
|
||||
"version": "1.1.3",
|
||||
|
|
|
|||
Loading…
Reference in New Issue