Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

x11-misc/sddm: Outsource Gentoo defaults and resulting optional RDEPENDs to gui-apps/sddm-gentoo-config #267

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

x11-misc/sddm: Outsource Gentoo defaults and resulting optional RDEPENDs to gui-apps/sddm-gentoo-config #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f96bb91
gui-apps/sddm-gentoo-config: new package, add 0
a17r Mar 22, 2023
7180620
profiles: categories: Add gui-apps
a17r Mar 22, 2023
d70ddb3
x11-misc/sddm: Drop IUSE X, config moved to gui-apps/sddm-gentoo-config
a17r Mar 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions gui-apps/sddm-gentoo-config/metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>lxqt@gentoo.org</email>
<name>LXQt</name>
</maintainer>
<maintainer type="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
<upstream>
<remote-id type="gentoo">gentoo/qt</remote-id>
<bugs-to>http://bugs.gentoo.org</bugs-to>
</upstream>
</pkgmetadata>
35 changes: 35 additions & 0 deletions gui-apps/sddm-gentoo-config/sddm-gentoo-config-0.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Copyright 2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

DESCRIPTION="Gentoo defaults for SDDM (Simple Desktop Display Manager)"
HOMEPAGE="https://github.com/sddm/sddm"
SRC_URI=""
S=${WORKDIR}

LICENSE="public-domain"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="X"

RDEPEND="
X? ( x11-base/xorg-server )
!X? ( dev-libs/weston )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can this instead be turned into || (weston kwin) ? that way there is no unnecessary dependency on weston if kwin is installed

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is outdated. In ::gentoo these RDEPENDs are completely done away with and replaced by optfeature - since Wayland support is completely experimental anyway right now it will not gain automatic configuration via ebuild for the time being.

"

src_install() {
touch "${T}"/01gentoo.conf || die

cat <<-EOF >> "${T}"/01gentoo.conf
[General]
# Which display server should be used
DisplayServer=$(usex X "x11" "wayland")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added DisplayServer="wayland" to my config manually myself.
(WW) DAEMON: ""wayland"" is an invalid value for General.DisplayServer: fall back to "x11"
So the value may not have " " in config.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it won't - those are shell quotes that will be discarded while lexing the arguments to usex


# Remove qtvirtualkeyboard as InputMethod default
InputMethod=
EOF

insinto /etc/sddm.conf.d/
doins "${T}"/01gentoo.conf
}
1 change: 1 addition & 0 deletions profiles/categories
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ app-emulation
dev-libs
dev-qt
dev-util
gui-apps
lxqt-base
media-gfx
x11-libs
Expand Down
15 changes: 2 additions & 13 deletions x11-misc/sddm/sddm-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${PAM_TAR}.tar.xz"

LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
SLOT="0"
IUSE="+elogind +qt5 systemd test +X"
IUSE="+elogind +qt5 systemd test"

REQUIRED_USE="^^ ( elogind systemd )"
RESTRICT="!test? ( test )"
Expand Down Expand Up @@ -54,7 +54,7 @@ DEPEND="${COMMON_DEPEND}
)
"
RDEPEND="${COMMON_DEPEND}
X? ( x11-base/xorg-server )
gui-apps/sddm-gentoo-config
!systemd? ( gui-libs/display-manager-init )
"
BDEPEND="
Expand Down Expand Up @@ -83,14 +83,6 @@ src_unpack() {
}

src_prepare() {
touch 01gentoo.conf || die

cat <<-EOF >> 01gentoo.conf
[General]
# Remove qtvirtualkeyboard as InputMethod default
InputMethod=
EOF

cmake_src_prepare

if ! use test; then
Expand Down Expand Up @@ -120,9 +112,6 @@ src_configure() {
src_install() {
cmake_src_install

insinto /etc/sddm.conf.d/
doins "${S}"/01gentoo.conf

# with systemd logs are sent to journald, so no point to bother in that case
if ! use systemd; then
insinto /etc/logrotate.d
Expand Down