[PR PATCH] [WIP] [NOMERGE] sddm: update to 0.20.0.

[PR PATCH] [WIP] [NOMERGE] sddm: update to 0.20.0.

[abenson]

[-- Attachment #1: Type: text/plain, Size: 634 bytes --]

There is a new pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages sddm_0.20
https://github.com/void-linux/void-packages/pull/44593

[WIP] [NOMERGE] sddm: update to 0.20.0.

#### Testing the changes
- I tested the changes in this PR: **NO** (I will be testing tonight when I have time)

#### Local build testing
- I built this PR locally for my native architecture, x86-64
- I built this PR locally for these architectures (if supported. mark crossbuilds)
  - aarch64-musl


A patch file from https://github.com/void-linux/void-packages/pull/44593.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sddm_0.20-44593.patch --]
[-- Type: text/x-diff, Size: 2435 bytes --]

From aa16feffae50585bf0f0c89c5dd4693072b3bca6 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 23 Jun 2023 12:22:59 -0500
Subject: [PATCH] sddm: update to 0.20.0.

---
 srcpkgs/sddm/patches/qt-5.15.2.patch | 23 -----------------------
 srcpkgs/sddm/template                |  6 +++---
 2 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 srcpkgs/sddm/patches/qt-5.15.2.patch

diff --git a/srcpkgs/sddm/patches/qt-5.15.2.patch b/srcpkgs/sddm/patches/qt-5.15.2.patch
deleted file mode 100644
index 51094817c6da..000000000000
--- a/srcpkgs/sddm/patches/qt-5.15.2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e93bf95c54ad8c2a1604f8d7be05339164b19308 Mon Sep 17 00:00:00 2001
-From: "aacid@kde.org" <aacid@kde.org>
-Date: Thu, 12 Nov 2020 23:42:48 +0100
-Subject: [PATCH] Fix compilation once QTBUG-88431 gets fixed
-
-And also comes closes to Qt6 compatibility
----
- src/daemon/XorgDisplayServer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
-index 5f93a1b37..d5f29a94a 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/srcpkgs/sddm/template b/srcpkgs/sddm/template
index 2a87381c8e8a..35c0d1a5d95f 100644
--- a/srcpkgs/sddm/template
+++ b/srcpkgs/sddm/template
@@ -1,7 +1,7 @@
 # Template file for 'sddm'
 pkgname=sddm
-version=0.19.0
-revision=3
+version=0.20.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_MAN_PAGES=ON -DNO_SYSTEMD=ON -DUSE_ELOGIND=ON
  -DLOGIN_DEFS_PATH=${XBPS_SRCPKGDIR}/shadow/files/login.defs
@@ -14,7 +14,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later, CC-BY-3.0"
 homepage="http://github.com/sddm/sddm"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=e76da1f13d5ad5e0179e3fec57543126044339405ef19c397e105e0807bd4e41
+checksum=467c8bd91e0d4f76d4bc4e57ab334f1f48a33478482ba9476d93b0b3d7ace9fb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" sddm qt5-host-tools qt5-qmake qt5-tools"

Re: [WIP] [NOMERGE] sddm: update to 0.20.0.

[abenson]

[-- Attachment #1: Type: text/plain, Size: 247 bytes --]

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/44593#issuecomment-1605055836

Comment:
x11 backend works great. Still working on getting it to correctly launch weston for the wayland backend. 

Re: [PR REVIEW] [WIP] [NOMERGE] sddm: update to 0.20.0.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44593#discussion_r1240604952

Comment:
```suggestion
homepage="https://github.com/sddm/sddm"
changelog="https://raw.githubusercontent.com/sddm/sddm/develop/ChangeLog"
distfiles="https://github.com/sddm/sddm/archive/v${version}.tar.gz"
```

Re: [WIP] [NOMERGE] sddm: update to 0.20.0.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44593#issuecomment-1605276428

Comment:
I think the way forward with the conflict is to move `linux-driver-management`'s `Xsetup` to `/usr/share/examples` or something like that (maybe `Xsetup.linux-driver-management`?). they should not be unilaterally taking over that script

Re: [PR PATCH] [Updated] [WIP] [NOMERGE] sddm: update to 0.20.0.

[abenson]

[-- Attachment #1: Type: text/plain, Size: 593 bytes --]

There is an updated pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages sddm_0.20
https://github.com/void-linux/void-packages/pull/44593

[WIP] [NOMERGE] sddm: update to 0.20.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86-64
- I built this PR locally for these architectures (if supported. mark crossbuilds)
  - aarch64-musl


A patch file from https://github.com/void-linux/void-packages/pull/44593.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sddm_0.20-44593.patch --]
[-- Type: text/x-diff, Size: 3567 bytes --]

From 148bb6848a7fae71e86656f7eed856795819b31b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 29 Jun 2023 06:20:49 -0400
Subject: [PATCH 1/2] linux-driver-management: move Xsetup to examples

---
 srcpkgs/linux-driver-management/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux-driver-management/template b/srcpkgs/linux-driver-management/template
index 0a8859cb73b4..a19c780adbf7 100644
--- a/srcpkgs/linux-driver-management/template
+++ b/srcpkgs/linux-driver-management/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-driver-management'
 pkgname=linux-driver-management
 version=1.0.3
-revision=2
+revision=3
 # Tests require unpackaged umockdev
 # https://github.com/martinpitt/umockdev
 build_style=meson
@@ -23,6 +23,10 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
 fi
 
+post_install() {
+	mv ${DESTDIR}/usr/share/sddm/scripts/Xsetup ${DESTDIR}/usr/share/examples/Xsetup.${pkgname}
+}
+
 linux-driver-management-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - Development files"

From 497a9c32ddf6c49598a93dcf63e26e7a07fa905b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 23 Jun 2023 12:22:59 -0500
Subject: [PATCH 2/2] sddm: update to 0.20.0.

---
 srcpkgs/sddm/patches/qt-5.15.2.patch | 23 -----------------------
 srcpkgs/sddm/template                |  6 +++---
 2 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 srcpkgs/sddm/patches/qt-5.15.2.patch

diff --git a/srcpkgs/sddm/patches/qt-5.15.2.patch b/srcpkgs/sddm/patches/qt-5.15.2.patch
deleted file mode 100644
index 51094817c6da..000000000000
--- a/srcpkgs/sddm/patches/qt-5.15.2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e93bf95c54ad8c2a1604f8d7be05339164b19308 Mon Sep 17 00:00:00 2001
-From: "aacid@kde.org" <aacid@kde.org>
-Date: Thu, 12 Nov 2020 23:42:48 +0100
-Subject: [PATCH] Fix compilation once QTBUG-88431 gets fixed
-
-And also comes closes to Qt6 compatibility
----
- src/daemon/XorgDisplayServer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
-index 5f93a1b37..d5f29a94a 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/srcpkgs/sddm/template b/srcpkgs/sddm/template
index 2a87381c8e8a..35c0d1a5d95f 100644
--- a/srcpkgs/sddm/template
+++ b/srcpkgs/sddm/template
@@ -1,7 +1,7 @@
 # Template file for 'sddm'
 pkgname=sddm
-version=0.19.0
-revision=3
+version=0.20.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_MAN_PAGES=ON -DNO_SYSTEMD=ON -DUSE_ELOGIND=ON
  -DLOGIN_DEFS_PATH=${XBPS_SRCPKGDIR}/shadow/files/login.defs
@@ -14,7 +14,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later, CC-BY-3.0"
 homepage="http://github.com/sddm/sddm"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=e76da1f13d5ad5e0179e3fec57543126044339405ef19c397e105e0807bd4e41
+checksum=467c8bd91e0d4f76d4bc4e57ab334f1f48a33478482ba9476d93b0b3d7ace9fb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" sddm qt5-host-tools qt5-qmake qt5-tools"

Re: [PR PATCH] [Updated] [WIP] [NOMERGE] sddm: update to 0.20.0.

[abenson]

[-- Attachment #1: Type: text/plain, Size: 593 bytes --]

There is an updated pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages sddm_0.20
https://github.com/void-linux/void-packages/pull/44593

[WIP] [NOMERGE] sddm: update to 0.20.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86-64
- I built this PR locally for these architectures (if supported. mark crossbuilds)
  - aarch64-musl


A patch file from https://github.com/void-linux/void-packages/pull/44593.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sddm_0.20-44593.patch --]
[-- Type: text/x-diff, Size: 3609 bytes --]

From be536064cba5b747deb975d99937520efa7c7b66 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 29 Jun 2023 06:20:49 -0400
Subject: [PATCH 1/2] linux-driver-management: move Xsetup to examples

---
 srcpkgs/linux-driver-management/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux-driver-management/template b/srcpkgs/linux-driver-management/template
index 0a8859cb73b4..66c76851127c 100644
--- a/srcpkgs/linux-driver-management/template
+++ b/srcpkgs/linux-driver-management/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-driver-management'
 pkgname=linux-driver-management
 version=1.0.3
-revision=2
+revision=3
 # Tests require unpackaged umockdev
 # https://github.com/martinpitt/umockdev
 build_style=meson
@@ -23,6 +23,11 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
 fi
 
+post_install() {
+	mkdir -p ${DESTDIR}/usr/share/examples
+	mv ${DESTDIR}/usr/share/sddm/scripts/Xsetup ${DESTDIR}/usr/share/examples/Xsetup.${pkgname}
+}
+
 linux-driver-management-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - Development files"

From 50b32d7a1d1ca9167785e9b208a7876bcf390dcb Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 23 Jun 2023 12:22:59 -0500
Subject: [PATCH 2/2] sddm: update to 0.20.0.

---
 srcpkgs/sddm/patches/qt-5.15.2.patch | 23 -----------------------
 srcpkgs/sddm/template                |  6 +++---
 2 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 srcpkgs/sddm/patches/qt-5.15.2.patch

diff --git a/srcpkgs/sddm/patches/qt-5.15.2.patch b/srcpkgs/sddm/patches/qt-5.15.2.patch
deleted file mode 100644
index 51094817c6da..000000000000
--- a/srcpkgs/sddm/patches/qt-5.15.2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e93bf95c54ad8c2a1604f8d7be05339164b19308 Mon Sep 17 00:00:00 2001
-From: "aacid@kde.org" <aacid@kde.org>
-Date: Thu, 12 Nov 2020 23:42:48 +0100
-Subject: [PATCH] Fix compilation once QTBUG-88431 gets fixed
-
-And also comes closes to Qt6 compatibility
----
- src/daemon/XorgDisplayServer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
-index 5f93a1b37..d5f29a94a 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/srcpkgs/sddm/template b/srcpkgs/sddm/template
index 2a87381c8e8a..35c0d1a5d95f 100644
--- a/srcpkgs/sddm/template
+++ b/srcpkgs/sddm/template
@@ -1,7 +1,7 @@
 # Template file for 'sddm'
 pkgname=sddm
-version=0.19.0
-revision=3
+version=0.20.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_MAN_PAGES=ON -DNO_SYSTEMD=ON -DUSE_ELOGIND=ON
  -DLOGIN_DEFS_PATH=${XBPS_SRCPKGDIR}/shadow/files/login.defs
@@ -14,7 +14,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later, CC-BY-3.0"
 homepage="http://github.com/sddm/sddm"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=e76da1f13d5ad5e0179e3fec57543126044339405ef19c397e105e0807bd4e41
+checksum=467c8bd91e0d4f76d4bc4e57ab334f1f48a33478482ba9476d93b0b3d7ace9fb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" sddm qt5-host-tools qt5-qmake qt5-tools"

Re: [PR PATCH] [Updated] [WIP] [NOMERGE] sddm: update to 0.20.0.

[abenson]

[-- Attachment #1: Type: text/plain, Size: 593 bytes --]

There is an updated pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages sddm_0.20
https://github.com/void-linux/void-packages/pull/44593

[WIP] [NOMERGE] sddm: update to 0.20.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86-64
- I built this PR locally for these architectures (if supported. mark crossbuilds)
  - aarch64-musl


A patch file from https://github.com/void-linux/void-packages/pull/44593.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sddm_0.20-44593.patch --]
[-- Type: text/x-diff, Size: 3860 bytes --]

From be536064cba5b747deb975d99937520efa7c7b66 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 29 Jun 2023 06:20:49 -0400
Subject: [PATCH 1/2] linux-driver-management: move Xsetup to examples

---
 srcpkgs/linux-driver-management/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux-driver-management/template b/srcpkgs/linux-driver-management/template
index 0a8859cb73b4..66c76851127c 100644
--- a/srcpkgs/linux-driver-management/template
+++ b/srcpkgs/linux-driver-management/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-driver-management'
 pkgname=linux-driver-management
 version=1.0.3
-revision=2
+revision=3
 # Tests require unpackaged umockdev
 # https://github.com/martinpitt/umockdev
 build_style=meson
@@ -23,6 +23,11 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
 fi
 
+post_install() {
+	mkdir -p ${DESTDIR}/usr/share/examples
+	mv ${DESTDIR}/usr/share/sddm/scripts/Xsetup ${DESTDIR}/usr/share/examples/Xsetup.${pkgname}
+}
+
 linux-driver-management-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - Development files"

From c76781d4467652ce8ea4948b6d0d07d4389a57d8 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 23 Jun 2023 12:22:59 -0500
Subject: [PATCH 2/2] sddm: update to 0.20.0.

---
 srcpkgs/sddm/patches/qt-5.15.2.patch | 23 -----------------------
 srcpkgs/sddm/template                | 11 ++++++-----
 2 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/sddm/patches/qt-5.15.2.patch

diff --git a/srcpkgs/sddm/patches/qt-5.15.2.patch b/srcpkgs/sddm/patches/qt-5.15.2.patch
deleted file mode 100644
index 51094817c6da..000000000000
--- a/srcpkgs/sddm/patches/qt-5.15.2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e93bf95c54ad8c2a1604f8d7be05339164b19308 Mon Sep 17 00:00:00 2001
-From: "aacid@kde.org" <aacid@kde.org>
-Date: Thu, 12 Nov 2020 23:42:48 +0100
-Subject: [PATCH] Fix compilation once QTBUG-88431 gets fixed
-
-And also comes closes to Qt6 compatibility
----
- src/daemon/XorgDisplayServer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
-index 5f93a1b37..d5f29a94a 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/srcpkgs/sddm/template b/srcpkgs/sddm/template
index 2a87381c8e8a..b91cef64249e 100644
--- a/srcpkgs/sddm/template
+++ b/srcpkgs/sddm/template
@@ -1,7 +1,7 @@
 # Template file for 'sddm'
 pkgname=sddm
-version=0.19.0
-revision=3
+version=0.20.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_MAN_PAGES=ON -DNO_SYSTEMD=ON -DUSE_ELOGIND=ON
  -DLOGIN_DEFS_PATH=${XBPS_SRCPKGDIR}/shadow/files/login.defs
@@ -12,9 +12,10 @@ depends="dbus"
 short_desc="QML based X11 display manager"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-2.0-or-later, CC-BY-3.0"
-homepage="http://github.com/sddm/sddm"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=e76da1f13d5ad5e0179e3fec57543126044339405ef19c397e105e0807bd4e41
+homepage="https://github.com/sddm/sddm"
+changelog="https://raw.githubusercontent.com/sddm/sddm/develop/ChangeLog"
+distfiles="https://github.com/sddm/sddm/archive/v${version}.tar.gz"
+checksum=467c8bd91e0d4f76d4bc4e57ab334f1f48a33478482ba9476d93b0b3d7ace9fb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" sddm qt5-host-tools qt5-qmake qt5-tools"

Re: [PR PATCH] [Closed]: sddm: update to 0.20.0.

[abenson]

[-- Attachment #1: Type: text/plain, Size: 419 bytes --]

There's a closed pull request on the void-packages repository

sddm: update to 0.20.0.
https://github.com/void-linux/void-packages/pull/44593

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86-64
- I built this PR locally for these architectures (if supported. mark crossbuilds)
  - aarch64-musl