* [PR PATCH] lightdm: enable cross-build of liblightdm-qt5
@ 2022-11-01 2:34 JamiKettunen
2022-11-01 3:24 ` [PR PATCH] [Merged]: " sgn
0 siblings, 1 reply; 2+ messages in thread
From: JamiKettunen @ 2022-11-01 2:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1418 bytes --]
There is a new pull request by JamiKettunen against master on the void-packages repository
https://github.com/JamiKettunen/void-packages liblightdm-qt5-cross
https://github.com/void-linux/void-packages/pull/40256
lightdm: enable cross-build of liblightdm-qt5
This was excluded way back in Qt4 days of early 2015 to enable cross-building of `lightdm` but doesn't appear to be a problem anymore.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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/40256.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-liblightdm-qt5-cross-40256.patch --]
[-- Type: text/x-diff, Size: 2588 bytes --]
From 835bf426d2e5fe3c620f8573456fa1fdfa350e6b Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 23 Mar 2022 18:09:32 +0200
Subject: [PATCH] lightdm: enable cross-build of liblightdm-qt5
This was excluded way back in Qt4 days of early 2015 to enable
cross-building of lightdm but doesn't appear to be a problem anymore.
---
srcpkgs/lightdm/template | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template
index 1e02e713a5bd..f527616261ba 100644
--- a/srcpkgs/lightdm/template
+++ b/srcpkgs/lightdm/template
@@ -1,16 +1,17 @@
# Template file for 'lightdm'
pkgname=lightdm
version=1.32.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--sbindir=/usr/bin --with-greeter-session=lightdm-gtk-greeter
--with-greeter-user=lightdm --disable-static --disable-tests
$(vopt_enable gir introspection)"
-hostmakedepends="pkg-config intltool itstool $(vopt_if gir 'gobject-introspection vala')"
+hostmakedepends="pkg-config intltool itstool $(vopt_if gir 'gobject-introspection vala')
+ qt5-host-tools"
makedepends="dbus-glib-devel libxklavier-devel libxml2-devel
gtk+3-devel libxcb-devel libXdmcp-devel pam-devel vala-devel
- libgcrypt-devel accountsservice-devel"
+ libgcrypt-devel accountsservice-devel qt5-devel"
depends="dbus accountsservice"
short_desc="Light Display Manager"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -22,7 +23,6 @@ checksum=12f5ab432748f0387c7cf8b94430495a558a035a4f8465e5181af6faff133e4b
conf_files="/etc/${pkgname}/*.conf /etc/pam.d/*"
system_accounts="lightdm"
lightdm_homedir="/var/lib/lightdm"
-subpackages="liblightdm-gobject lightdm-devel"
make_dirs="
/var/lib/lightdm 0755 lightdm lightdm
/var/lib/lightdm-data 0755 lightdm lightdm"
@@ -30,12 +30,6 @@ make_dirs="
build_options="gir"
build_options_default="gir"
-if [ -z "$CROSS_BUILD" ]; then
- configure_args+=" MOC5=/usr/lib/qt5/bin/moc"
- makedepends+=" qt5-devel"
- subpackages+=" liblightdm-qt5"
-fi
-
post_install() {
# Remove provided init file and use our own.
rm -rf ${DESTDIR}/etc/init
@@ -69,10 +63,8 @@ liblightdm-qt5_package() {
}
lightdm-devel_package() {
- depends="libglib-devel liblightdm-gobject-${version}_${revision}"
- if [ -z "$CROSS_BUILD" ]; then
- depends+=" liblightdm-qt5-${version}_${revision}"
- fi
+ depends="libglib-devel liblightdm-gobject-${version}_${revision}
+ liblightdm-qt5-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: lightdm: enable cross-build of liblightdm-qt5
2022-11-01 2:34 [PR PATCH] lightdm: enable cross-build of liblightdm-qt5 JamiKettunen
@ 2022-11-01 3:24 ` sgn
0 siblings, 0 replies; 2+ messages in thread
From: sgn @ 2022-11-01 3:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
There's a merged pull request on the void-packages repository
lightdm: enable cross-build of liblightdm-qt5
https://github.com/void-linux/void-packages/pull/40256
Description:
This was excluded way back in Qt4 days of early 2015 to enable cross-building of `lightdm` but doesn't appear to be a problem anymore.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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] 2+ messages in thread
end of thread, other threads:[~2022-11-01 3:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-01 2:34 [PR PATCH] lightdm: enable cross-build of liblightdm-qt5 JamiKettunen
2022-11-01 3:24 ` [PR PATCH] [Merged]: " sgn
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).