summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2022-05-01 15:29:26 +0000
committerZach van Rijn <me@zv.io>2022-06-12 23:51:58 +0000
commitfb51dc6078f8c6cb152e252e8e951d2eefcc1e2e (patch)
tree44f8c7ba017500beb0f412681eb0c11c893db4ff
parentf785a67dc0e7e779429b1c8e87caad5f77d830e9 (diff)
downloadpackages-fb51dc6078f8c6cb152e252e8e951d2eefcc1e2e.tar.gz
packages-fb51dc6078f8c6cb152e252e8e951d2eefcc1e2e.tar.bz2
packages-fb51dc6078f8c6cb152e252e8e951d2eefcc1e2e.tar.xz
packages-fb51dc6078f8c6cb152e252e8e951d2eefcc1e2e.zip
user/sddm: patch for use of deleted function. fixes #646.
-rw-r--r--user/sddm/0002-sddm-fix-build.patch15
-rw-r--r--user/sddm/APKBUILD6
2 files changed, 19 insertions, 2 deletions
diff --git a/user/sddm/0002-sddm-fix-build.patch b/user/sddm/0002-sddm-fix-build.patch
new file mode 100644
index 000000000..e0b0fc71a
--- /dev/null
+++ b/user/sddm/0002-sddm-fix-build.patch
@@ -0,0 +1,15 @@
+Fixes a build issue with the latest Qt 5.15 patches
+
+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() {
diff --git a/user/sddm/APKBUILD b/user/sddm/APKBUILD
index 78ca0f8d5..51caedde8 100644
--- a/user/sddm/APKBUILD
+++ b/user/sddm/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=sddm
pkgver=0.18.1
-pkgrel=3
+pkgrel=4
pkgdesc="Simple Desktop Display Manager"
url="https://github.com/sddm/sddm/"
pkgusers="sddm"
@@ -20,6 +20,7 @@ source="https://github.com/sddm/sddm/releases/download/v$pkgver/sddm-$pkgver.tar
pam-path-fix.patch
sddm.initd
utmpx.patch
+ 0002-sddm-fix-build.patch
"
build() {
@@ -59,4 +60,5 @@ openrc() {
sha512sums="ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60 sddm-0.18.1.tar.xz
f0b4eb7ef0581701157f9decc637629156f36f6711b9a4bae517f94d7a1df614c81bbd891c918f07ac50e2a3d1519c43ccb9eefd80282c95dd79eca0e8d90904 pam-path-fix.patch
d603934552bad47edda458d7a4df2310e98bde74bdb3bf8588f5171b2a5d68814192b8dc8f5599b35402f9a747d519d985d4976e7aa50dabed445f99a112594c sddm.initd
-c42d8b3edbc0ae7e3d5ea7bb0080c5c50e0569f0ea947e1ba17bc794c8c0d67a214e62aad7eba0a51791c44b29a3017692bbe738250c63cb2219891bb1313422 utmpx.patch"
+c42d8b3edbc0ae7e3d5ea7bb0080c5c50e0569f0ea947e1ba17bc794c8c0d67a214e62aad7eba0a51791c44b29a3017692bbe738250c63cb2219891bb1313422 utmpx.patch
+d2d4a6df0a329f37776e3efe3359e730c20ee5da3180b23f9b728afe924d9146f50f3377b9bfa2d7439e09640c33ecefda75707fda74e91812f97ec6358343ab 0002-sddm-fix-build.patch"