[arch-commits] Commit in sddm/trunk (PKGBUILD sddm-fix-build.patch)

Antonio Rojas arojas at archlinux.org
Mon Apr 19 16:06:01 UTC 2021


    Date: Monday, April 19, 2021 @ 16:06:01
  Author: arojas
Revision: 412900

Fix allocating VTs (FS#70436)

Added:
  sddm/trunk/sddm-fix-build.patch
Modified:
  sddm/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   12 +++++++++---
 sddm-fix-build.patch |   13 +++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-19 14:51:28 UTC (rev 412899)
+++ PKGBUILD	2021-04-19 16:06:01 UTC (rev 412900)
@@ -4,7 +4,7 @@
 
 pkgname=sddm
 pkgver=0.19.0
-pkgrel=4
+pkgrel=5
 pkgdesc='QML based X11 and Wayland display manager'
 arch=(x86_64)
 url='https://github.com/sddm/sddm'
@@ -22,7 +22,9 @@
         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-desktop-session.patch::"https://github.com/sddm/sddm/commit/5fd5ed27.patch"
+        sddm-x11-server-vt-allocate.patch::"https://github.com/sddm/sddm/commit/f0b6dec6.patch"
+        sddm-fix-build.patch)
 sha256sums=('e76da1f13d5ad5e0179e3fec57543126044339405ef19c397e105e0807bd4e41'
             '9fce66f325d170c61caed57816f4bc72e9591df083e89da114a3bb16b0a0e60f'
             'db625f2a3649d6d203e1e1b187a054d5c6263cadf7edd824774d8ace52219677'
@@ -29,7 +31,9 @@
             '441f441fc63c16c5dbd83411a305d88b17e50836c958677db881b9b6c13c668a'
             '33770560315b5369fd15baf5cd877f1191e642cefc6d2a1b4f0a7a80c109c025'
             'bbe45a316140c145d7de67dbe95764e44a0787ad9c6bcd2f7e0694484bd79640'
-            '83e4df6e1c0c23e7b38c1d523c236108eae177ba11c5d466825690845ef99fcf')
+            '83e4df6e1c0c23e7b38c1d523c236108eae177ba11c5d466825690845ef99fcf'
+            '2ddf6cbf626548094ba34dce3db1aa07671b27f00e2d378ae1a5b1d022d43350'
+            'e9058d261138e637248b20243e3e81ff337ab669a4a25fbff387bf9558a682c6')
 
 prepare() {
   patch -d $pkgname-$pkgver -p1 < pam-faillock.patch # Port away from deprecated pam_tally2
@@ -36,6 +40,8 @@
   patch -d $pkgname-$pkgver -p1 < sddm-fix-race-pre.patch # Make next patch apply
   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-x11-server-vt-allocate.patch # Fix allocating VTs
+  patch -d $pkgname-$pkgver -p1 < sddm-fix-build.patch # Fix build with Qt post 5.15.2
 }
 
 build() {

Added: sddm-fix-build.patch
===================================================================
--- sddm-fix-build.patch	                        (rev 0)
+++ sddm-fix-build.patch	2021-04-19 16:06:01 UTC (rev 412900)
@@ -0,0 +1,13 @@
+diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
+index 5f93a1b..d5f29a9 100644
+--- a/src/daemon/XorgDisplayServer.cpp
++++ b/src/daemon/XorgDisplayServer.cpp
+@@ -65,7 +65,7 @@ namespace SDDM {
+         // create a random hexadecimal number
+         const char *digits = "0123456789abcdef";
+         for (int i = 0; i < 32; ++i)
+-            m_cookie[i] = digits[dis(gen)];
++            m_cookie[i] = QLatin1Char(digits[dis(gen)]);
+     }
+ 
+     XorgDisplayServer::~XorgDisplayServer() {



More information about the arch-commits mailing list