Skip to content
Snippets Groups Projects
Commit 503c15c3 authored by Gleb Popov's avatar Gleb Popov
Browse files

sysutils/consolekit2: Switch to my fork.

My fork incorporates optional X11 support from files/, Val Packett's patches
for Wayland and my own fixes for systemd login1 compatibility required for
the newest sysutils/accountsservice.

Sponsored by:	Serenity Cybersecurity, LLC
parent 6a9de254
No related branches found
No related tags found
No related merge requests found
PORTNAME= consolekit
PORTVERSION= 1.2.6
PORTREVISION= 1
CATEGORIES= sysutils gnome
PKGNAMESUFFIX= 2
# https://github.com/ConsoleKit2/ConsoleKit2/pull/116
PATCH_SITES= https://github.com/ConsoleKit2/ConsoleKit2/commit/
PATCHFILES= 03eaa9779f2c9c7b0acf0521a5547036bdec2245.patch:-p1 \
05f26e99539e7a442e57035ed6d64fdd9a50feb9.patch:-p1 \
ea4a569100dfa44a0c9d42b1cf7381fd8f88c837.patch:-p1 \
42b8c93b2b7c2a57a74580531c73ab736e95336a.patch:-p1
MAINTAINER= desktop@FreeBSD.org
COMMENT= Framework for defining and tracking users
WWW= https://github.com/ConsoleKit2/ConsoleKit2
......@@ -36,8 +30,9 @@ X11_USE= XORG=x11
X11_CONFIGURE_WITH= x
USE_GITHUB= yes
GH_ACCOUNT= ConsoleKit2
GH_ACCOUNT= arrowd
GH_PROJECT= ConsoleKit2
GH_TAGNAME= 3ead222361800ca2b893354741ad43e6526c9b8b
USES= autoreconf gettext gmake gnome libtool localbase pathfix pkgconfig \
tar:bzip2
......
TIMESTAMP = 1691584826
SHA256 (ConsoleKit2-ConsoleKit2-1.2.6_GH0.tar.gz) = d41224129c5a689469ebd8fe87e34c4a76afdb7b2f6201eb246320262ea5a942
SIZE (ConsoleKit2-ConsoleKit2-1.2.6_GH0.tar.gz) = 258252
SHA256 (03eaa9779f2c9c7b0acf0521a5547036bdec2245.patch) = c8d58acf770a782bb02006f401bdd2ffa8777d9c07f0b0c87e9b76465758ede0
SIZE (03eaa9779f2c9c7b0acf0521a5547036bdec2245.patch) = 1459
SHA256 (05f26e99539e7a442e57035ed6d64fdd9a50feb9.patch) = beb21938d8b337faeaf39d799e58b639157b364efcec58998f6a475324139fbb
SIZE (05f26e99539e7a442e57035ed6d64fdd9a50feb9.patch) = 1411
SHA256 (ea4a569100dfa44a0c9d42b1cf7381fd8f88c837.patch) = ae28133cebd7aa85841bb0afe104c9cfac5b33efa5be81b1e791f67f3d88df05
SIZE (ea4a569100dfa44a0c9d42b1cf7381fd8f88c837.patch) = 2338
SHA256 (42b8c93b2b7c2a57a74580531c73ab736e95336a.patch) = b7d0939060f1a70c1448ffbe55f7ad38e63f328caf1b8ed35d7496f7be4dd1a2
SIZE (42b8c93b2b7c2a57a74580531c73ab736e95336a.patch) = 918
TIMESTAMP = 1691771274
SHA256 (arrowd-ConsoleKit2-1.2.6-3ead222361800ca2b893354741ad43e6526c9b8b_GH0.tar.gz) = dc6bcb44e182725489136ab46fb76b81b81da9ff0e6be432e3d24a5e42664aca
SIZE (arrowd-ConsoleKit2-1.2.6-3ead222361800ca2b893354741ad43e6526c9b8b_GH0.tar.gz) = 260631
--- configure.ac.orig 2021-06-03 10:22:08 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],
@@ -439,11 +443,7 @@ AC_PATH_PROG([XSLTPROC], [xsltproc])
# check for gtk-doc
-m4_ifdef([GTK_DOC_CHECK], [
-GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
-],[
AM_CONDITIONAL([ENABLE_GTK_DOC], false)
-])
dnl ---------------------------------------------------------------------------
dnl check for inotify
@@ -553,7 +553,6 @@ doc/dbus/Makefile
doc/console-kit-daemon.1m
doc/dbus/ConsoleKit.xml
doc/dbus/Makefile
-doc/libconsolekit/Makefile
libconsolekit/Makefile
libconsolekit/libconsolekit.pc
libck-connector/Makefile
--- 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 \
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment