diff options
Diffstat (limited to 'x11-misc/sddm')
-rw-r--r-- | x11-misc/sddm/Manifest | 5 | ||||
-rw-r--r-- | x11-misc/sddm/files/sddm-0.20.0-dbus-policy-in-usr.patch | 29 | ||||
-rw-r--r-- | x11-misc/sddm/files/sddm-0.20.0-greeter-platform-detection.patch | 24 | ||||
-rw-r--r-- | x11-misc/sddm/files/sddm-0.20.0-no-qtvirtualkeyboard-on-wayland.patch | 32 | ||||
-rw-r--r-- | x11-misc/sddm/sddm-0.20.0-r1.ebuild (renamed from x11-misc/sddm/sddm-0.20.0.ebuild) | 6 |
5 files changed, 94 insertions, 2 deletions
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest index 7fe80ab04655..1c1bddf3c049 100644 --- a/x11-misc/sddm/Manifest +++ b/x11-misc/sddm/Manifest @@ -10,14 +10,17 @@ AUX sddm-0.18.1-only-reuse-online-sessions.patch 1201 BLAKE2B cf1947f88fa1223c78 AUX sddm-0.18.1-qt-5.15.2.patch 865 BLAKE2B 1198a2a7b9cd0b46648eddd3eddca444d502c01baf7fd686bd52489acefa8bb3cc53e20b1d8f154aec56f88f53b653c605f8b4905cd7bb445c37ad7bdd091369 SHA512 aae777ca15df43d7c5bfb7f15e2ede4632d598e05d565338880f644e0e8ed9f00e83c33128a85db8db01d4a22cf85ee4dd6fd2c66196c7093afcc9d5c18bade2 AUX sddm-0.18.1-respect-user-flags.patch 774 BLAKE2B 050d261762b872a475ce9f250b464e539e278c4c87ad90767b7a9e8dc8f4785671ff3c5989b3785979b3a59ce805bb5b2ee90b01da0dca831a48aecaddc94280 SHA512 8df7f3b804594d46439e4c93a01a035e71d8e8a53c95193eaff03403970d0010878e70f0f7c8c965545360a948c2cab994e5ce29e011f8f41bc232107402fe78 AUX sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch 3616 BLAKE2B 71a4c6f592214160ff993e86582bf5f550be204193668f5bab7786db88ae9a1a09ee268beb3e3157c1b033e765053ba415f3d291f299b09606aa566c9c197370 SHA512 b33b26517173262194bdc98e63b84fbb1f03005abc3c079332dd9b275167d8ddc680ba5c2a9968be5c54963b64f291aab65ad9f04b9f3f69299d030753cd90f5 +AUX sddm-0.20.0-dbus-policy-in-usr.patch 1681 BLAKE2B 4a184784d74696adc7317aca60e4410b2b732b45c2926ee269f8915ed15dd64b192e7a514947b82437a3e63058b8102055fa674c265f67abe6172bf2dfb4fd2e SHA512 c470a99ad3e9c4f18f646e9ea30929e11b8392e960a5a1da981c3aeb38218533fdad1ef0deb6c0e332aeff3bfc41e89906eefe46d4ecf42cf91cddc699672d38 AUX sddm-0.20.0-disable-etc-debian-check.patch 1037 BLAKE2B da37f7e7025e0c02f892a08bfca27a1e970e517a2b0fdd5bf45dae903215f6523747f076164868d60faf693ca0676b15e4e052496d3ae57c73ba01152ff7d3ba SHA512 d4fe05d49d067a708231494d8b48ee316b007c6c903be0c125d528492789b07d892b149c87f370263eec4372d11e1ff8ca3cafe855b83f65dec4709998b40514 AUX sddm-0.20.0-fix-use-development-sessions.patch 3399 BLAKE2B c5a1297a673fab4e198f0c5045cb1e362451b3c12f92e2d11168eb68d60cb33367d24c664d4d49503fa6bde7a4a8be9a23fc227f15835d34963dd05ddf27f737 SHA512 1f9402be49ab5b8937e7b15162dd077c2a09be112b4bd80ad302a865e981138a071b45d36d8080f333075f03ad74451024b8a08bde1902029a5b62ac44172504 +AUX sddm-0.20.0-greeter-platform-detection.patch 934 BLAKE2B 07e2c811a2dee9ebc94fd59ef1acde7860d9fb70ab0399d566d804341cc8c45b2542c2d957bc8b8c9ab11e4ee0849e9b4d1056eb114ed61fe57b246a09296363 SHA512 028146ad14d028fe9031388cf41c693f65cfc9d640aabb410835b0ef441094c5bb85914668e8514270b8267767a2de4b5e964e874a6b7e49264dd57d2adbf8f4 AUX sddm-0.20.0-no-default-pam_systemd-module.patch 1487 BLAKE2B e4a270d2c0cb140e6195bb93aa9e15538737585ded1a30db2986d00e21a8a74d0bf6732c2bb3d47ddb7636ca75f44f5be64ff1f5b435a28ab585bd614223a307 SHA512 c598d4ff4ce5b7b88b5e5224d09a8aa336c929e2889eacb6eb76caac719adb112ecc11202f40cba9246a1ad2b0e039f8de6ab378d755126e8598598286171b1f +AUX sddm-0.20.0-no-qtvirtualkeyboard-on-wayland.patch 1382 BLAKE2B 86515c2c24b720d957c6849901bb707d26f5ce3155577d58723d8ef32aa4af24b8c7c46e77b1d7169fb0b3f2260f33dad09ccceb2a50c042d872241bbcca2050 SHA512 a17fb242973dde688978c5ceb927f9a67bb99a516dea21268a04a7287dc066f323acde1b0411b21bb68b04d63cfbd85b23ec7a0790fb5190698dfe483741bafa AUX sddm-0.20.0-respect-user-flags.patch 348 BLAKE2B 228f9011992b113afc8a32ef2fdb17d2ca3e3d158718b0bdf8d0638de5b432e830fb9baf83d1b9deea5ee3b2a01e61fecf1ebb81621e7b58df3d7905697a8099 SHA512 e347b6ef36a37751a18affc2f098b55772c8782f5c4826094d1841425f85e29c18e988b47e2252317907804f9b135642367c7e992934aff93edaa58ca67f7dd5 AUX sddm-0.20.0-sddm.pam-use-substack.patch 1173 BLAKE2B 2d4fee0a0f3bc61a0873d4927ff8c3189d77371929448dadccc35a43a114c2be64dd0822825a45708904ff5c70ab7896e9a7cf54931d14f4f48ab79d5dc36d75 SHA512 bfe00511a17e7bd0e0c9c51f65082f9feda38237cba64f36cdb31570adb56ded9d380f7e3b133ed1c3f7bde4d9341f2a5ac9627cd9c72300532b8d84b5cf0dc8 AUX sddm.tmpfiles 31 BLAKE2B 51d22f1d6e25aed3df726c0c315e83193bf28b5e9cafb681b648e6788ad8e9ddd8610ef5c305627373e32465ac104b33d71c333153217f8f8f560ace9ddca45a SHA512 bb5ecdcc6cfcc6b1056a7b10b8a6f323a3e12ea5496a26d80f199a275402fd99ed0fa810fad6687407605964f980784c24082686e177063113a358e1d4220136 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60 DIST sddm-0.20.0.tar.gz 3552722 BLAKE2B 8086c9555d5ce1598db3279353de077d51adbcc5222a929750e8558a1bcdad395a411f90608bffdc6e1ca7e7ac2b8325e25cf04cbf8476698d787ce7e60c2105 SHA512 0f64b405f1451873a01a2210530feb6f4cbbdea17be9d039c105088963a48322968db7b60c0d20ac5d97c8ec2a19e5130f0a74c0f9de58c61453d8ce8bb6272a EBUILD sddm-0.18.1-r8.ebuild 3785 BLAKE2B d187956247816e988d69e7ecbca870c4f9b95639f135b579a75c3784763dc652b873b219d0767fccd9cca5ad81ebcdd602d29852ad4130ae5c1bf9fefd692a76 SHA512 1582fa4b54e516024f98b811692952e97774b8f671f061e53bc52e51decb934379d2be64935d326d83e3b39d4eb0f036360201715d8ed15de5d727624f449408 -EBUILD sddm-0.20.0.ebuild 3506 BLAKE2B ebf037259576f6d090edbe051d9e2a6be8c5878cc0d8b2694ae166a1e90a84b4db160ef7fda8f0bdeb32a09f104dfe5a7b96b6458cf203b694b8a4b1421dcba4 SHA512 a7182de101e6ab281dcce2cc78cd0ca43867b15bda0ac7b4f70c4a8647f37feac68e8096d4a408c420c62f206a8612febbe1d531f4ae96ec78dbce2eb1c6ca22 +EBUILD sddm-0.20.0-r1.ebuild 3663 BLAKE2B 5b81f347c3105ff3227cf61fa296b09ad45b38007e93ed347a2a3baf566b96022432c8af64fb9bad36ebfd4e5c6ddcd29db08ad8b63fb8ca5ce0e8d3836217f1 SHA512 1da19f227a4c8193412c6510308c09ed3ea1590767c189c17dd6f34b0646b491b414a2a37f3150b5581b43c0d8682b2ee39c7164f3eeef29202885592148a619 MISC metadata.xml 722 BLAKE2B fc34c0b25b7f3e6ab876c99a30f475dc90cc4b319f497a2ba4bd2beac1dc1189d3d9611999c0c3b078254db23c4c9b2ef0416da41e706c1a1db96d5bbec28177 SHA512 c1fa48632080e295272df6e7ceb7c0a1ad64a41155c7d53d91728f072cb7abf618e7bf4d5cced2ca0b198bbbf5ed1e72c5bfc9ea9d590064e5f5494747d32b0d diff --git a/x11-misc/sddm/files/sddm-0.20.0-dbus-policy-in-usr.patch b/x11-misc/sddm/files/sddm-0.20.0-dbus-policy-in-usr.patch new file mode 100644 index 000000000000..8926b8400430 --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.20.0-dbus-policy-in-usr.patch @@ -0,0 +1,29 @@ +From 0823810ed1683e6dcb7d687795764e11ddb6ff8a Mon Sep 17 00:00:00 2001 +From: Gioele Barabucci <gioele@svario.it> +Date: Sun, 16 Jul 2023 11:51:08 +0200 +Subject: [PATCH] CMakeLists.txt: Install dbus policy in /usr/share, not /etc + +From https://bugs.debian.org/1006631: + +> dbus supports policy files in both `/usr/share/dbus-1/system.d` and +> `/etc/dbus-1/systemd`. [The] recently released dbus 1.14.0, officially +> deprecates installing packages' default policies into `/etc/dbus-1/systemd`, +> instead reserving it for the sysadmin. This is the same idea as the +> difference between `/usr/lib/udev/rules.d` and `/etc/udev/rules.d`. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 72c4086bb..44956e52d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -181,7 +181,7 @@ endif() + + # Set constants + set(DATA_INSTALL_DIR "${CMAKE_INSTALL_FULL_DATADIR}/sddm" CACHE PATH "System application data install directory") +-set(DBUS_CONFIG_DIR "${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d" CACHE PATH "DBus config files directory") ++set(DBUS_CONFIG_DIR "${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/system.d" CACHE PATH "DBus config files directory") + set(STATE_DIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/sddm" CACHE PATH "State directory") + set(RUNTIME_DIR "${RUNTIME_DIR_DEFAULT}" CACHE PATH "Runtime data storage directory") + set(QML_INSTALL_DIR "${QT_IMPORTS_DIR}" CACHE PATH "QML component installation directory") diff --git a/x11-misc/sddm/files/sddm-0.20.0-greeter-platform-detection.patch b/x11-misc/sddm/files/sddm-0.20.0-greeter-platform-detection.patch new file mode 100644 index 000000000000..57d138875bea --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.20.0-greeter-platform-detection.patch @@ -0,0 +1,24 @@ +From e27b70957505dc7b986ab2fa68219af546c63344 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt <fabian@ritter-vogt.de> +Date: Fri, 30 Jun 2023 09:42:58 +0200 +Subject: [PATCH] greeter: Look at WAYLAND_DISPLAY for platform detection + +When running sddm-greeter manually in a wayland session, it otherwise +misdetects that as xcb. +--- + src/greeter/GreeterApp.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp +index c2978d67e..4e4f65301 100644 +--- a/src/greeter/GreeterApp.cpp ++++ b/src/greeter/GreeterApp.cpp +@@ -319,7 +319,7 @@ int main(int argc, char **argv) + platform = QString::fromUtf8(qgetenv("QT_QPA_PLATFORM")); + } + if (platform.isEmpty()) { +- platform = QStringLiteral("xcb"); ++ platform = qEnvironmentVariableIsSet("WAYLAND_DISPLAY") ? QStringLiteral("wayland") : QStringLiteral("xcb"); + } + + // Install message handler diff --git a/x11-misc/sddm/files/sddm-0.20.0-no-qtvirtualkeyboard-on-wayland.patch b/x11-misc/sddm/files/sddm-0.20.0-no-qtvirtualkeyboard-on-wayland.patch new file mode 100644 index 000000000000..0081f3d4e8a3 --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.20.0-no-qtvirtualkeyboard-on-wayland.patch @@ -0,0 +1,32 @@ +From 07631f2ef00a52d883d0fd47ff7d1e1a6bc6358f Mon Sep 17 00:00:00 2001 +From: Fabian Vogt <fabian@ritter-vogt.de> +Date: Fri, 30 Jun 2023 09:44:37 +0200 +Subject: [PATCH] Ignore InputMethod=qtvirtualkeyboard on wayland + +Using QT_IM_MODULE=qtvirtualkeyboard in wayland client applications is not +supported by Qt, but is sddm's builtin default. Avoid setting that. +--- + src/greeter/GreeterApp.cpp | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp +index 4e4f65301..01613cc66 100644 +--- a/src/greeter/GreeterApp.cpp ++++ b/src/greeter/GreeterApp.cpp +@@ -351,8 +351,14 @@ int main(int argc, char **argv) + qputenv("KDE_DEBUG", "1"); + + // Qt IM module +- if (!SDDM::mainConfig.InputMethod.get().isEmpty()) +- qputenv("QT_IM_MODULE", SDDM::mainConfig.InputMethod.get().toLocal8Bit().constData()); ++ QString inputMethod = SDDM::mainConfig.InputMethod.get(); ++ // Using qtvirtualkeyboard as IM on wayland doesn't really work, ++ // it has to be done by the compositor instead. ++ if (platform.startsWith(QStringLiteral("wayland")) && inputMethod == QStringLiteral("qtvirtualkeyboard")) ++ inputMethod = QString{}; ++ ++ if (!inputMethod.isEmpty()) ++ qputenv("QT_IM_MODULE", inputMethod.toLocal8Bit()); + + QGuiApplication app(argc, argv); + SDDM::SignalHandler s; diff --git a/x11-misc/sddm/sddm-0.20.0.ebuild b/x11-misc/sddm/sddm-0.20.0-r1.ebuild index 7d246cd0dea3..63babd63cc42 100644 --- a/x11-misc/sddm/sddm-0.20.0.ebuild +++ b/x11-misc/sddm/sddm-0.20.0-r1.ebuild @@ -60,7 +60,11 @@ PATCHES=( "${FILESDIR}/${P}-sddm.pam-use-substack.patch" # bug 728550 "${FILESDIR}/${P}-disable-etc-debian-check.patch" "${FILESDIR}/${P}-no-default-pam_systemd-module.patch" # bug 669980 - "${FILESDIR}/${P}-fix-use-development-sessions.patch" # git master + # git master + "${FILESDIR}/${P}-fix-use-development-sessions.patch" + "${FILESDIR}/${P}-greeter-platform-detection.patch" + "${FILESDIR}/${P}-no-qtvirtualkeyboard-on-wayland.patch" + "${FILESDIR}/${P}-dbus-policy-in-usr.patch" ) pkg_setup() { |