From a94725cbda6580bb68c1000d73724c2d1f856461 Mon Sep 17 00:00:00 2001 From: Victor Tebar Date: Fri, 18 Nov 2022 09:10:44 +0000 Subject: [PATCH] sddm : fix build with qt5-5.15 --- main/sddm/.checksums | 1 + main/sddm/qt5.15.patch | 13 +++++++++++++ main/sddm/spkgbuild | 4 +++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 main/sddm/qt5.15.patch diff --git a/main/sddm/.checksums b/main/sddm/.checksums index 7e134a5ce..22e8a478d 100644 --- a/main/sddm/.checksums +++ b/main/sddm/.checksums @@ -1,2 +1,3 @@ +8689d16de01631e3de4cc18d653536a9 qt5.15.patch fa4a39188ff891688ebe642c3d7998fb rc.sddm 66c089720bb8ce0a50a745394e5d2b91 sddm-0.19.0.tar.xz diff --git a/main/sddm/qt5.15.patch b/main/sddm/qt5.15.patch new file mode 100644 index 000000000..8e6cde83e --- /dev/null +++ b/main/sddm/qt5.15.patch @@ -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() { diff --git a/main/sddm/spkgbuild b/main/sddm/spkgbuild index 6b81381d1..03643b091 100755 --- a/main/sddm/spkgbuild +++ b/main/sddm/spkgbuild @@ -7,10 +7,12 @@ release=1 backup="usr/share/sddm/scripts/Xsetup etc/sddm.conf" source="https://github.com/sddm/sddm/releases/download/v$version/sddm-$version.tar.xz + qt5.15.patch rc.$name" build() { cd $name-$version + patch -p1 -i $SRC/qt5.15.patch sed -e '/UPOWER_SERVICE)/ s:^://:' \ -i src/daemon/PowerManager.cpp @@ -29,7 +31,7 @@ build() { -Wno-dev .. make make DESTDIR=$PKG install - install -dm755 -o sddm -g sddm $PKG/var/lib/sddm + install -dm 755 -o sddm -g sddm $PKG/var/lib/sddm install -d $PKG/usr/lib/sddm/sddm.conf.d $PKG/usr/bin/sddm --example-config > $PKG/etc/sddm.conf