Skip to content

Commit 6f7ffeb

Browse files
Neumann-ANeumann-A
authored
[many ports] Add X windows part 11/N (#27441)
* [libice] replace macros with typedefs * [libx11] fix dl linkage on linux and cleanup the cmake wrapper. * [libxxf86vm] add port * [libxtst] add port * [libxt] add port * [libxmu] add port * [libxaw] add port * bump port version * v db * fix libxpm and maybe cross libxt * malloc returns null for cross builds * fix typo * fix stuff * v db * fix stuff ? * WIP commit * libxt cross fix * add todo * fix libxaw * xcb add some fixes. * fix todos * fix arm ? * fix path * bump some versions * shorten comment * format manifest * v db * fix stuff * ci baseline * v db * adjust libx11 wrapper again * v db * add license * remove doubled entry from v db * v db * libxmu remove global variable. * correctly split unistd.patch and apply it * disable thread safe init in libx11 on windows * v db * libx11 append options correctly. * v db * still not correct. * v db
1 parent 59b58fc commit 6f7ffeb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1073
-27
lines changed

‎ports/kf5kio/portfile.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: fa
2424
vcpkg_cmake_configure(
2525
SOURCE_PATH "${SOURCE_PATH}"
2626
OPTIONS
27+
-DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON
2728
-DBUILD_TESTING=OFF
2829
-DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON
2930
-DCMAKE_VERBOSE_MAKEFILE=ON

‎ports/kf5kio/vcpkg.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"name": "kf5kio",
33
"version": "5.89.0",
4-
"port-version": 1,
4+
"port-version": 2,
55
"description": "Network transparent access to files and data",
66
"homepage": "https://api.kde.org/frameworks/kio/html/index.html",
7+
"license": null,
78
"dependencies": [
89
"ecm",
910
{

‎ports/libice/portfile.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ vcpkg_from_gitlab(
1111
SHA512 ad79cfbc3b1d51fb1f019bc088999ac8a64062a71667dbb4ffb62fe6d1b7dba7665944f64be6dcd27de08cc77e91512de97231db1e4ac018088727e90113d040
1212
HEAD_REF master
1313
PATCHES fix_build.patch
14+
replace_macros.patch
1415
)
1516

1617
set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")

‎ports/libice/replace_macros.patch

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/include/X11/ICE/ICElib.h b/include/X11/ICE/ICElib.h
2+
index 402cbc8bd..506c18baf 100644
3+
--- a/include/X11/ICE/ICElib.h
4+
+++ b/include/X11/ICE/ICElib.h
5+
@@ -32,8 +32,8 @@ Author: Ralph Mor, X Consortium
6+
#include <X11/ICE/ICE.h>
7+
#include <X11/Xfuncproto.h>
8+
9+
-#define Bool int
10+
-#define Status int
11+
+typedef int Bool;
12+
+typedef int Status;
13+
#define True 1
14+
#define False 0
15+

‎ports/libice/vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "libice",
33
"version": "1.0.10",
4+
"port-version": 1,
45
"description": "Inter-Client Exchange Library",
56
"homepage": "https://gitlab.freedesktop.org/xorg/lib/libice",
67
"license": "MIT-open-group",

‎ports/libsm/missing-include.patch

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/src/sm_genid.c b/src/sm_genid.c
2+
index 3726eb1d2..082ce89fe 100644
3+
--- a/src/sm_genid.c
4+
+++ b/src/sm_genid.c
5+
@@ -90,6 +90,9 @@ in this Software without prior written authorization from The Open Group.
6+
# define X_INCLUDE_NETDB_H
7+
# define XOS_USE_MTSAFE_NETDBAPI
8+
# include <X11/Xos_r.h>
9+
+# ifdef _MSC_VER
10+
+# include <process.h>
11+
+# endif
12+
13+
#endif /* WIN32 */
14+

‎ports/libsm/portfile.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ vcpkg_from_gitlab(
1111
SHA512 379e450d90e61d80d4fea8449a582b3eee3968bef137022053cb3bd51fa2815d8fccc43ff11e3b593c4a67ad64e93209c25111a20ac88e38c1f663cd274f5d56
1212
HEAD_REF master
1313
PATCHES windows.patch
14+
missing-include.patch # avoids: warning C4013: '_getpid' undefined; assuming extern returning int
1415
)
1516

1617
set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")

‎ports/libsm/vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "libsm",
33
"version": "1.2.3",
4+
"port-version": 1,
45
"description": "X Session Management Library",
56
"homepage": "https://gitlab.freedesktop.org/xorg/lib/libsm",
67
"license": null,

‎ports/libx11/add_dl_pc.patch

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
diff --git a/configure.ac b/configure.ac
2+
index 92b740b88..083e37ee5 100644
3+
--- a/configure.ac
4+
+++ b/configure.ac
5+
@@ -106,8 +106,12 @@ if test "x$ac_cv_search_dlopen" = xno; then
6+
AC_DEFINE(HAVE_SHL_LOAD,1,
7+
[Use shl_load to load shared libraries])
8+
AC_CHECK_HEADERS([dl.h])
9+
+ XLDLIB="$ac_cv_search_shl_load"
10+
fi
11+
else
12+
+ if test "x$ac_cv_search_dlopen" != 'xnone required'; then
13+
+ XLDLIB="$ac_cv_search_dlopen"
14+
+ fi
15+
AC_DEFINE(HAVE_DLOPEN,1,[Use dlopen to load shared libraries])
16+
AC_CHECK_HEADERS([dlfcn.h])
17+
fi
18+
@@ -116,6 +120,7 @@ if test "x$ac_cv_header_dlfcn_h" = xyes -o "x$ac_cv_header_dl_h" = xyes; then
19+
else
20+
HAVE_LOADABLE_MODULES=no
21+
fi
22+
+AC_SUBST(XLDLIB)
23+
AC_MSG_RESULT($HAVE_LOADABLE_MODULES)
24+
25+
AC_MSG_CHECKING([if loadable i18n module support should be enabled])
26+
diff --git a/x11.pc.in b/x11.pc.in
27+
index 25c7e7cd0..4ecf23e8d 100644
28+
--- a/x11.pc.in
29+
+++ b/x11.pc.in
30+
@@ -11,5 +11,5 @@ Version: @PACKAGE_VERSION@
31+
Requires: xproto @XKBPROTO_REQUIRES@
32+
Requires.private: @X11_EXTRA_DEPS@
33+
Cflags: -I${includedir} @XTHREAD_CFLAGS@
34+
-Libs: -L${libdir} -lX11
35+
+Libs: -L${libdir} -lX11 @XLDLIB@
36+
Libs.private: @XTHREADLIB@

‎ports/libx11/portfile.cmake

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,37 @@ vcpkg_from_gitlab(
1111
GITLAB_URL https://gitlab.freedesktop.org/xorg
1212
OUT_SOURCE_PATH SOURCE_PATH
1313
REPO lib/libx11
14-
REF 4c96f3567a8d045ee57b886fddc9618b71282530 #x11 v 1.7.3.1
15-
SHA512 15c55b6283aec363f6af5b549584d487ec5a8c0f74b95dc44674ff50764abe5b9fa216e2af3c5408faf12d17b04e9433f0ad66da6e32a0dfef0427ca131ef23b
14+
REF 3a30ada60c5217ada37b143b541c8e6f6284c7fa
15+
SHA512 441f86ff8293d27459feaa93f85bcd4d02c6bd64fdb4d95199e5ee8a75340c2ce9b0fccd0b05840ce0de30ff3af3d21e6f37c81840e82b37dbddf082911b585d
1616
HEAD_REF master
1717
PATCHES cl.build.patch
1818
io_include.patch
1919
${PATCHES}
2020
vcxserver.patch
21+
add_dl_pc.patch
2122
)
2223

2324
set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
2425

25-
if(VCPKG_TARGET_IS_WINDOWS)
26+
set(OPTIONS "")
27+
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
2628
set(ENV{CPP} "cl_cpp_wrapper")
29+
list(APPEND OPTIONS
30+
--enable-loadable-i18n=no #Pointer conversion errors
31+
--enable-unix-transport=no
32+
--disable-thread-safety-constructor
33+
)
2734
endif()
28-
29-
set(OPTIONS "")
3035
if(VCPKG_TARGET_IS_WINDOWS)
31-
set(OPTIONS
36+
list(APPEND OPTIONS
3237
--enable-malloc0returnsnull=yes #Configure fails to run the test for some reason
33-
--enable-loadable-i18n=no #Pointer conversion errors
3438
--enable-ipv6
3539
--enable-hyperv
3640
--enable-tcp-transport
3741
--with-launchd=no
3842
--with-lint=no
3943
--disable-selective-werror
40-
--enable-unix-transport=no)
44+
)
4145
endif()
4246
if(NOT XLSTPROC)
4347
find_program(XLSTPROC NAMES "xsltproc${VCPKG_HOST_EXECUTABLE_SUFFIX}" PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/libxslt" PATH_SUFFIXES "bin")

0 commit comments

Comments
 (0)