From: abenson <abenson@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] [NOMERGE] sddm: update to 0.20.0.
Date: Thu, 29 Jun 2023 12:25:29 +0200 [thread overview]
Message-ID: <20230629102529.Rko-hiiaXRnKmrjgu-C1JX4PpeW2TdshbdyixvRUrgY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-44593@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2023-06-29 10:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-23 17:39 [PR PATCH] " abenson
2023-06-23 22:24 ` abenson
2023-06-24 5:36 ` [PR REVIEW] " classabbyamp
2023-06-24 5:39 ` classabbyamp
2023-06-29 10:23 ` [PR PATCH] [Updated] " abenson
2023-06-29 10:25 ` abenson [this message]
2023-06-29 10:34 ` abenson
2023-07-03 22:36 ` [PR PATCH] [Closed]: " abenson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230629102529.Rko-hiiaXRnKmrjgu-C1JX4PpeW2TdshbdyixvRUrgY@z \
--to=abenson@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).