[rpms/cosmic-greeter] f43: Merge branch 'rawhide' into f43

[rpms/cosmic-greeter] f43: Merge branch 'rawhide' into f43

[Ryan Brue]

A new commit has been pushed.

Repo   : rpms/cosmic-greeter
Branch : f43
Commit : d100898bed23925c19791f7715d225af8a056823
Author : Ryan Brue <ryanbrue.dev@gmail.com>
Date   : 2026-09-18T14:48:28-05:00
Stats  : +36/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/cosmic-greeter/c/d100898bed23925c19791f7715d225af8a056823?branch=f43

Log:
Merge branch 'rawhide' into f43

---
diff --git a/0001-feat-systemd-service-conflicts-with-kmscon.patch b/0001-feat-systemd-service-conflicts-with-kmscon.patch
new file mode 100644
index 0000000..552f5d6
--- /dev/null
+++ b/0001-feat-systemd-service-conflicts-with-kmscon.patch
@@ -0,0 +1,33 @@
+From 3073850f0354665ddf359394c53a8d6fe7f6a473 Mon Sep 17 00:00:00 2001
+From: Jocelyn Falempe <jfalempe@redhat.com>
+Date: Thu, 17 Sep 2026 22:40:35 +0200
+Subject: [PATCH] feat: systemd service, conflicts with kmscon
+
+kmscon is replacing agetty/fbcon on Fedora, and thus the systemd service
+should conflict with kmsconvt@tty1 instead of agetty@tty1
+
+Otherwise both kmscon and cosmic greeter compete for the graphic cards.
+
+Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
+---
+ debian/cosmic-greeter.service | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/debian/cosmic-greeter.service b/debian/cosmic-greeter.service
+index 278e591..3abbb33 100644
+--- a/debian/cosmic-greeter.service
++++ b/debian/cosmic-greeter.service
+@@ -1,8 +1,8 @@
+ [Unit]
+ Description=COSMIC Greeter
+ After=systemd-user-sessions.service plymouth-quit-wait.service cosmic-greeter-daemon.service
+-After=getty@tty1.service
+-Conflicts=getty@tty1.service
++After=getty@tty1.service ksmcon@tty1.service
++Conflicts=getty@tty1.service kmscon@tty1.service
+ Wants=cosmic-greeter-daemon.service
+ 
+ [Service]
+-- 
+2.55.0
+

diff --git a/cosmic-greeter.spec b/cosmic-greeter.spec
index 84d4b4d..5e13369 100644
--- a/cosmic-greeter.spec
+++ b/cosmic-greeter.spec
@@ -33,6 +33,9 @@ Source2:        vendor-config-%{version_no_tilde}.toml
 Patch:          0001-Make-service-a-display-manager.patch
 Patch:          include-greetd.patch
 
+# Upstream fix for kmscon, from https://github.com/pop-os/cosmic-greeter/pull/546
+Patch: 0001-feat-systemd-service-conflicts-with-kmscon.patch
+
 BuildRequires:  cargo-rpm-macros >= 25
 BuildRequires:  rustc
 BuildRequires:  lld