* [PR PATCH] sddm: update to 0.21.0.
@ 2024-03-07 16:34 Johnnynator
2024-03-09 11:38 ` [PR PATCH] [Updated] " Johnnynator
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Johnnynator @ 2024-03-07 16:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]
There is a new pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages sddm
https://github.com/void-linux/void-packages/pull/49175
sddm: update to 0.21.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49175.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sddm-49175.patch --]
[-- Type: text/x-diff, Size: 3046 bytes --]
From 55d37c4e195a4b3c7ace12069c03e3e7efdfc782 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Mar 2024 16:51:02 +0100
Subject: [PATCH] sddm: update to 0.21.0.
---
srcpkgs/sddm/template | 41 +++++++++++++++++++++++++++++++++++------
1 file changed, 35 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/sddm/template b/srcpkgs/sddm/template
index 296160f94303bd..8d972569564ce5 100644
--- a/srcpkgs/sddm/template
+++ b/srcpkgs/sddm/template
@@ -1,14 +1,17 @@
# Template file for 'sddm'
pkgname=sddm
-version=0.20.0
-revision=2
+version=0.21.0
+revision=1
build_style=cmake
-configure_args="-DBUILD_MAN_PAGES=ON -DNO_SYSTEMD=ON -DUSE_ELOGIND=ON
+_configure_args="-DBUILD_MAN_PAGES=ON -DNO_SYSTEMD=ON -DUSE_ELOGIND=ON
-DLOGIN_DEFS_PATH=${XBPS_SRCPKGDIR}/shadow/files/login.defs
-DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf
-DSDDM_INITIAL_VT=7"
-hostmakedepends="extra-cmake-modules pkg-config python3-docutils"
-makedepends="qt5-declarative-devel qt5-tools-devel pam-devel elogind-devel"
+configure_args="${_configure_args} -DBUILD_WITH_QT6=ON"
+hostmakedepends="extra-cmake-modules pkg-config python3-docutils
+ qt6-tools qt6-base"
+makedepends="qt6-declarative-devel qt5-declarative-devel qt5-tools-devel
+ pam-devel elogind-devel"
depends="dbus"
short_desc="QML based X11 display manager"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
@@ -16,7 +19,7 @@ license="GPL-2.0-or-later, CC-BY-3.0"
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
+checksum=f895de2683627e969e4849dbfbbb2b500787481ca5ba0de6d6dfdae5f1549abf
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" sddm qt5-host-tools qt5-qmake qt5-tools"
@@ -31,7 +34,33 @@ conf_files="
/etc/pam.d/sddm-autologin"
make_dirs="/var/lib/sddm 0755 sddm sddm"
+post_configure() {
+ local cmake_args=""
+ if [ "$CROSS_BUILD" ]; then
+ cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${build_wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
+ cmake_args+=" -DQT_HOST_PATH=/usr"
+ fi
+ cmake_args+=" -DCMAKE_INSTALL_PREFIX:PATH=/usr"
+ cmake_args+=" -DCMAKE_BUILD_TYPE=None"
+ cmake_args+=" -DCMAKE_INSTALL_LIBDIR:PATH=lib${XBPS_TARGET_WORDSIZE}"
+ cmake_args+=" -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc"
+ cmake_args+=" -DCMAKE_INSTALL_SBINDIR:PATH=bin"
+
+ export CMAKE_GENERATOR="Ninja"
+ CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
+ cmake -B build5 ${cmake_args} ${_configure_args} \
+ ${wrksrc}/${build_wrksrc}
+}
+
+do_build() {
+ ninja -C build5 ${makejobs} sddm-greeter
+}
+
post_install() {
+ ninja -C build5 src/greeter/install components/install
+ DESTDIR="$DESTDIR" cmake --install build5/src/greeter
+ DESTDIR="$DESTDIR" cmake --install build5/components
+
vsed -i '/tally/d' ${DESTDIR}/etc/pam.d/sddm-autologin
vsv sddm
vlicense LICENSE.CC-BY-3.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] sddm: update to 0.21.0.
2024-03-07 16:34 [PR PATCH] sddm: update to 0.21.0 Johnnynator
@ 2024-03-09 11:38 ` Johnnynator
2024-03-10 12:52 ` Johnnynator
2024-03-11 9:54 ` [PR PATCH] [Merged]: " Johnnynator
2 siblings, 0 replies; 4+ messages in thread
From: Johnnynator @ 2024-03-09 11:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages sddm
https://github.com/void-linux/void-packages/pull/49175
sddm: update to 0.21.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49175.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sddm-49175.patch --]
[-- Type: text/x-diff, Size: 3048 bytes --]
From d3019f32e3b3ae84d0129a31bc430dfb9eead4fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Mar 2024 16:51:02 +0100
Subject: [PATCH] sddm: update to 0.21.0.
---
srcpkgs/sddm/template | 41 +++++++++++++++++++++++++++++++++++------
1 file changed, 35 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/sddm/template b/srcpkgs/sddm/template
index 296160f94303bd..4fcb574a53f314 100644
--- a/srcpkgs/sddm/template
+++ b/srcpkgs/sddm/template
@@ -1,14 +1,17 @@
# Template file for 'sddm'
pkgname=sddm
-version=0.20.0
-revision=2
+version=0.21.0
+revision=1
build_style=cmake
-configure_args="-DBUILD_MAN_PAGES=ON -DNO_SYSTEMD=ON -DUSE_ELOGIND=ON
+_configure_args="-DBUILD_MAN_PAGES=ON -DNO_SYSTEMD=ON -DUSE_ELOGIND=ON
-DLOGIN_DEFS_PATH=${XBPS_SRCPKGDIR}/shadow/files/login.defs
-DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf
-DSDDM_INITIAL_VT=7"
-hostmakedepends="extra-cmake-modules pkg-config python3-docutils"
-makedepends="qt5-declarative-devel qt5-tools-devel pam-devel elogind-devel"
+configure_args="${_configure_args} -DBUILD_WITH_QT6=ON"
+hostmakedepends="extra-cmake-modules pkg-config python3-docutils
+ qt6-tools qt6-base"
+makedepends="qt6-declarative-devel qt5-declarative-devel qt5-tools-devel
+ pam-devel elogind-devel"
depends="dbus"
short_desc="QML based X11 display manager"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
@@ -16,7 +19,7 @@ license="GPL-2.0-or-later, CC-BY-3.0"
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
+checksum=f895de2683627e969e4849dbfbbb2b500787481ca5ba0de6d6dfdae5f1549abf
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" sddm qt5-host-tools qt5-qmake qt5-tools"
@@ -31,7 +34,33 @@ conf_files="
/etc/pam.d/sddm-autologin"
make_dirs="/var/lib/sddm 0755 sddm sddm"
+post_configure() {
+ local cmake_args=""
+ if [ "$CROSS_BUILD" ]; then
+ cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${build_wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
+ cmake_args+=" -DQT_HOST_PATH=/usr"
+ fi
+ cmake_args+=" -DCMAKE_INSTALL_PREFIX:PATH=/usr"
+ cmake_args+=" -DCMAKE_BUILD_TYPE=None"
+ cmake_args+=" -DCMAKE_INSTALL_LIBDIR:PATH=lib${XBPS_TARGET_WORDSIZE}"
+ cmake_args+=" -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc"
+ cmake_args+=" -DCMAKE_INSTALL_SBINDIR:PATH=bin"
+
+ export CMAKE_GENERATOR="Ninja"
+ CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
+ cmake -B build5 ${cmake_args} ${_configure_args} \
+ ${wrksrc}/${build_wrksrc}
+}
+
+post_build() {
+ ninja -C build5 ${makejobs} sddm-greeter
+}
+
post_install() {
+ ninja -C build5 src/greeter/install components/install
+ DESTDIR="$DESTDIR" cmake --install build5/src/greeter
+ DESTDIR="$DESTDIR" cmake --install build5/components
+
vsed -i '/tally/d' ${DESTDIR}/etc/pam.d/sddm-autologin
vsv sddm
vlicense LICENSE.CC-BY-3.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] sddm: update to 0.21.0.
2024-03-07 16:34 [PR PATCH] sddm: update to 0.21.0 Johnnynator
2024-03-09 11:38 ` [PR PATCH] [Updated] " Johnnynator
@ 2024-03-10 12:52 ` Johnnynator
2024-03-11 9:54 ` [PR PATCH] [Merged]: " Johnnynator
2 siblings, 0 replies; 4+ messages in thread
From: Johnnynator @ 2024-03-10 12:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages sddm
https://github.com/void-linux/void-packages/pull/49175
sddm: update to 0.21.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49175.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sddm-49175.patch --]
[-- Type: text/x-diff, Size: 3085 bytes --]
From 8fef602dfbbb2f3decc78ee458f665d587ad9032 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Mar 2024 16:51:02 +0100
Subject: [PATCH] sddm: update to 0.21.0.
---
srcpkgs/sddm/template | 42 ++++++++++++++++++++++++++++++++++++------
1 file changed, 36 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/sddm/template b/srcpkgs/sddm/template
index 296160f94303bd..69a18d1f917639 100644
--- a/srcpkgs/sddm/template
+++ b/srcpkgs/sddm/template
@@ -1,14 +1,18 @@
# Template file for 'sddm'
pkgname=sddm
-version=0.20.0
-revision=2
+version=0.21.0
+revision=1
build_style=cmake
-configure_args="-DBUILD_MAN_PAGES=ON -DNO_SYSTEMD=ON -DUSE_ELOGIND=ON
+_configure_args="-DBUILD_MAN_PAGES=ON -DNO_SYSTEMD=ON -DUSE_ELOGIND=ON
-DLOGIN_DEFS_PATH=${XBPS_SRCPKGDIR}/shadow/files/login.defs
-DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf
-DSDDM_INITIAL_VT=7"
-hostmakedepends="extra-cmake-modules pkg-config python3-docutils"
-makedepends="qt5-declarative-devel qt5-tools-devel pam-devel elogind-devel"
+configure_args="${_configure_args} -DBUILD_WITH_QT6=ON
+ -DQT_IMPORTS_DIR=/usr/lib/qt6/qml"
+hostmakedepends="extra-cmake-modules pkg-config python3-docutils
+ qt6-tools qt6-base"
+makedepends="qt6-declarative-devel qt5-declarative-devel qt5-tools-devel
+ pam-devel elogind-devel"
depends="dbus"
short_desc="QML based X11 display manager"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
@@ -16,7 +20,7 @@ license="GPL-2.0-or-later, CC-BY-3.0"
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
+checksum=f895de2683627e969e4849dbfbbb2b500787481ca5ba0de6d6dfdae5f1549abf
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" sddm qt5-host-tools qt5-qmake qt5-tools"
@@ -31,7 +35,33 @@ conf_files="
/etc/pam.d/sddm-autologin"
make_dirs="/var/lib/sddm 0755 sddm sddm"
+post_configure() {
+ local cmake_args=""
+ if [ "$CROSS_BUILD" ]; then
+ cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${build_wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
+ cmake_args+=" -DQT_HOST_PATH=/usr"
+ fi
+ cmake_args+=" -DCMAKE_INSTALL_PREFIX:PATH=/usr"
+ cmake_args+=" -DCMAKE_BUILD_TYPE=None"
+ cmake_args+=" -DCMAKE_INSTALL_LIBDIR:PATH=lib${XBPS_TARGET_WORDSIZE}"
+ cmake_args+=" -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc"
+ cmake_args+=" -DCMAKE_INSTALL_SBINDIR:PATH=bin"
+
+ export CMAKE_GENERATOR="Ninja"
+ CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
+ cmake -B build5 ${cmake_args} ${_configure_args} \
+ ${wrksrc}/${build_wrksrc}
+}
+
+post_build() {
+ ninja -C build5 ${makejobs} sddm-greeter
+}
+
post_install() {
+ ninja -C build5 src/greeter/install components/install
+ DESTDIR="$DESTDIR" cmake --install build5/src/greeter
+ DESTDIR="$DESTDIR" cmake --install build5/components
+
vsed -i '/tally/d' ${DESTDIR}/etc/pam.d/sddm-autologin
vsv sddm
vlicense LICENSE.CC-BY-3.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: sddm: update to 0.21.0.
2024-03-07 16:34 [PR PATCH] sddm: update to 0.21.0 Johnnynator
2024-03-09 11:38 ` [PR PATCH] [Updated] " Johnnynator
2024-03-10 12:52 ` Johnnynator
@ 2024-03-11 9:54 ` Johnnynator
2 siblings, 0 replies; 4+ messages in thread
From: Johnnynator @ 2024-03-11 9:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1086 bytes --]
There's a merged pull request on the void-packages repository
sddm: update to 0.21.0.
https://github.com/void-linux/void-packages/pull/49175
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-03-11 9:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-07 16:34 [PR PATCH] sddm: update to 0.21.0 Johnnynator
2024-03-09 11:38 ` [PR PATCH] [Updated] " Johnnynator
2024-03-10 12:52 ` Johnnynator
2024-03-11 9:54 ` [PR PATCH] [Merged]: " Johnnynator
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).