Date: Monday, October 24, 2022 @ 13:31:28
  Author: arojas
Revision: 458840

upgpkg: sddm 0.19.0-9: Fix xdg-desktop-portal-kde crash (FS#75851)

Added:
  sddm/trunk/sddm-no-portal.patch
Modified:
  sddm/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   17 ++++++++++-------
 sddm-no-portal.patch |   14 ++++++++++++++
 2 files changed, 24 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-10-24 09:10:10 UTC (rev 458839)
+++ PKGBUILD    2022-10-24 13:31:28 UTC (rev 458840)
@@ -4,7 +4,7 @@
 
 pkgname=sddm
 pkgver=0.19.0
-pkgrel=8
+pkgrel=9
 pkgdesc='QML based X11 and Wayland display manager'
 arch=(x86_64)
 url='https://github.com/sddm/sddm'
@@ -20,17 +20,19 @@
 
source=($pkgname-$pkgver.tar.gz::"https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz";
         sddm.sysusers sddm.tmpfiles
         pam-faillock.patch
-        
sddm-fix-race-pre.patch::"https://github.com/sddm/sddm/commit/68cc9e31.patch";
-        
sddm-fix-race.patch::"https://patch-diff.githubusercontent.com/raw/sddm/sddm/pull/1324.patch";
-        
sddm-desktop-session.patch::"https://github.com/sddm/sddm/commit/5fd5ed27.patch";
+        
sddm-fix-race-pre.patch::https://github.com/sddm/sddm/commit/68cc9e31.patch
+        
sddm-fix-race.patch::https://patch-diff.githubusercontent.com/raw/sddm/sddm/pull/1324.patch
+        
sddm-desktop-session.patch::https://github.com/sddm/sddm/commit/5fd5ed27.patch
+        sddm-no-portal.patch
         sddm-fix-build.patch)
 sha256sums=('e76da1f13d5ad5e0179e3fec57543126044339405ef19c397e105e0807bd4e41'
             '9fce66f325d170c61caed57816f4bc72e9591df083e89da114a3bb16b0a0e60f'
             'db625f2a3649d6d203e1e1b187a054d5c6263cadf7edd824774d8ace52219677'
             '441f441fc63c16c5dbd83411a305d88b17e50836c958677db881b9b6c13c668a'
-            '33770560315b5369fd15baf5cd877f1191e642cefc6d2a1b4f0a7a80c109c025'
-            'bbe45a316140c145d7de67dbe95764e44a0787ad9c6bcd2f7e0694484bd79640'
-            '83e4df6e1c0c23e7b38c1d523c236108eae177ba11c5d466825690845ef99fcf'
+            '2911474a2921c7cf73fd2a358b64e1fe07154f1d2ce05a3d0b88998a3e27f2f6'
+            '0cb428a7eee95774791e7df727c35b9fe43ca0614369cc779cf9c1cbf00a3332'
+            '3a2c331177efb9530791d777297aba32822c55f0e9de116d89c640d3d1ba0843'
+            '5809f21a93a26a610a11c2e41fe6c9b64a142877c2accd45c83350459b1d357c'
             'e9058d261138e637248b20243e3e81ff337ab669a4a25fbff387bf9558a682c6')
 options=(debug)
 
@@ -40,6 +42,7 @@
   patch -d $pkgname-$pkgver -p1 < sddm-fix-race.patch # Fix race at startup
   patch -d $pkgname-$pkgver -p1 < sddm-desktop-session.patch # Fix desktop 
session name
   patch -d $pkgname-$pkgver -p1 < sddm-fix-build.patch # Fix build with Qt 
post 5.15.2
+  patch -d $pkgname-$pkgver -p1 < sddm-no-portal.patch # Don't launch 
xdg-desktop-portal
 }
 
 build() {

Added: sddm-no-portal.patch
===================================================================
--- sddm-no-portal.patch                                (rev 0)
+++ sddm-no-portal.patch        2022-10-24 13:31:28 UTC (rev 458840)
@@ -0,0 +1,14 @@
+diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp
+index bbce512..183f7d1 100644
+--- a/src/greeter/GreeterApp.cpp
++++ b/src/greeter/GreeterApp.cpp
+@@ -334,6 +334,9 @@ int main(int argc, char **argv)
+         QSurfaceFormat::setDefaultFormat(format);
+     }
+ 
++    // Qt internally may load the xdg portal system early on, prevent this, 
we do not have a functional session running.
++    qputenv("QT_NO_XDG_DESKTOP_PORTAL", "1");
++
+     QGuiApplication app(argc, argv);
+ 
+     QCommandLineParser parser;

Reply via email to