Bug 255847 - sysutils/consolekit2: remove no-op X11 option
Summary: sysutils/consolekit2: remove no-op X11 option
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: freebsd-desktop (Team)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-05-13 18:52 UTC by Dmitry Marakasov
Modified: 2021-05-16 21:55 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (desktop)


Attachments
Patch (1.07 KB, patch)
2021-05-13 18:52 UTC, Dmitry Marakasov
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Dmitry Marakasov freebsd_committer 2021-05-13 18:52:28 UTC
Created attachment 224908 [details]
Patch

X11 option of consolekit2 is a no-op, it links with libX11 regardless of its state and in fact cannot build without X11 (configure fails with --without-x). So remove it.
Comment 1 Evgeniy Khramtsov 2021-05-13 19:32:30 UTC
Also see: https://github.com/freebsd/freebsd-ports/compare/main...DankBSD:lite
(Ctrl+F "consolekit"). Note that I didn't try this patch on a pure Wayland system.
Comment 2 commit-hook freebsd_committer 2021-05-16 21:47:36 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dd54f12532c55dbb8e2cd6910a0b99436c657f7a

commit dd54f12532c55dbb8e2cd6910a0b99436c657f7a
Author:     Adriaan de Groot <adridg@FreeBSD.org>
AuthorDate: 2021-05-16 13:23:41 +0000
Commit:     Adriaan de Groot <adridg@FreeBSD.org>
CommitDate: 2021-05-16 21:46:47 +0000

    sysutils/consolekit2: update to 1.2.2, latest upstream

    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

 sysutils/consolekit2/Makefile                      | 13 ++++++------
 sysutils/consolekit2/distinfo                      |  6 +++---
 sysutils/consolekit2/files/patch-Makefile.am (new) | 17 ++++++++++++++++
 .../consolekit2/files/patch-configure.ac (new)     | 23 ++++++++++++++++++++++
 .../consolekit2/files/patch-doc_Makefile.am (new)  |  8 ++++++++
 .../files/patch-tools_Makefile.am (new)            | 19 ++++++++++++++++++
 sysutils/consolekit2/pkg-plist                     |  4 ++--
 7 files changed, 79 insertions(+), 11 deletions(-)