mirror of
https://git.freebsd.org/ports.git
synced 2025-06-26 07:00:31 -04:00
dd54f12532
This commit picks up several ideas: - update to the 1.2.2 release from upstream (PR 252783) - make the X11 option useful again; it **was** useless, so PR 255847 proposed removing the option -- X11 is mandatory -- but there was patches also to remove X11 entirely, for a Wayland-only experience. I've massaged it all until the option is useful and meaningfully selects for X11 (or not). The original patch for optionalize-X11 came from amdmi3@, and the "competing" one was -- via DankBSD, from unrelentingtech, who also has other patches (obtained from GitHub) for CK2. PR: 252783 255847 Reported by: Olivier Duchateau
19 lines
448 B
Text
19 lines
448 B
Text
--- tools/Makefile.am.orig 2020-04-11 15:14:59 UTC
|
|
+++ tools/Makefile.am
|
|
@@ -148,10 +148,14 @@ ck_log_system_stop_LDADD = \
|
|
|
|
libexec_PROGRAMS = \
|
|
ck-collect-session-info \
|
|
- ck-get-x11-server-pid \
|
|
- ck-get-x11-display-device \
|
|
ck-remove-directory \
|
|
$(NULL)
|
|
+
|
|
+if USE_LIBX11
|
|
+libexec_PROGRAMS += \
|
|
+ ck-get-x11-server-pid \
|
|
+ ck-get-x11-display-device
|
|
+endif
|
|
|
|
ck_collect_session_info_SOURCES = \
|
|
ck-collect-session-info.c \
|