mirror of
https://git.freebsd.org/ports.git
synced 2025-07-09 05:19:16 -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
23 lines
678 B
Text
23 lines
678 B
Text
--- configure.ac.orig 2020-12-07 11:27:30 UTC
|
|
+++ configure.ac
|
|
@@ -96,7 +96,11 @@ AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_40,
|
|
|
|
|
|
# Check for X11 installed
|
|
-XDT_CHECK_LIBX11_REQUIRE()
|
|
+XDT_CHECK_LIBX11()
|
|
+if test "x$with_x" = "xyes" ; then
|
|
+ XDT_CHECK_LIBX11_REQUIRE()
|
|
+fi
|
|
+AM_CONDITIONAL([USE_LIBX11], [test "x$with_x" = xyes])
|
|
|
|
# Check for Polkit/PolicyKit
|
|
XDT_CHECK_OPTIONAL_PACKAGE([POLKIT], [polkit-gobject-1], [polkit_minimum_version],
|
|
@@ -553,7 +557,6 @@ doc/Makefile
|
|
doc/console-kit-daemon.1m
|
|
doc/dbus/ConsoleKit.xml
|
|
doc/dbus/Makefile
|
|
-doc/libconsolekit/Makefile
|
|
libconsolekit/Makefile
|
|
libconsolekit/libconsolekit.pc
|
|
libck-connector/Makefile
|