Re: [PR PATCH] [Updated] libaccounts-qt6

[sgn <sgn@users.noreply.github.com>]

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

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

https://github.com/sgn/void-packages libaccounts-qt6
https://github.com/void-linux/void-packages/pull/49741

libaccounts-qt6
<!-- 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/49741.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libaccounts-qt6-49741.patch --]
[-- Type: text/x-diff, Size: 6959 bytes --]

From 7c492176bf500f28e2636988d6654568f1c6d305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 7 Apr 2024 14:42:21 +0700
Subject: [PATCH 1/2] libaccounts-glib: update to 1.26.

---
 common/shlibs                     |  2 +-
 srcpkgs/libaccounts-glib/template | 37 +++++++++++++++++++------------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a3ede5e9185342..cc85d666d5e98a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2721,7 +2721,7 @@ libflimage.so.2 xforms-1.2.4_2
 libutilspp.so.0 curlpp-0.7.3_2
 libcurlpp.so.1 curlpp-0.8.1_1
 libtcd.so.1 libtcd-2.2.7.r2_1
-libaccounts-glib.so.1 libaccounts-glib-1.24_1
+libaccounts-glib.so.0 libaccounts-glib-1.26_1
 libaccounts-qt5.so.1 libaccounts-qt5-1.14_1
 libshotwell-plugin-dev-1.0.so.0 shotwell-0.30.0_1
 libshotwell-plugin-common.so.0 shotwell-0.30.0_1
diff --git a/srcpkgs/libaccounts-glib/template b/srcpkgs/libaccounts-glib/template
index 03eea3d7aa0fba..a5d7c58dec6b27 100644
--- a/srcpkgs/libaccounts-glib/template
+++ b/srcpkgs/libaccounts-glib/template
@@ -1,26 +1,30 @@
 # Template file for 'libaccounts-glib'
 pkgname=libaccounts-glib
-version=1.24
-revision=7
+version=1.26
+revision=1
 build_style=meson
-build_helper="gir"
-hostmakedepends="gtk-doc pkg-config python3-gobject-devel
- glib-devel gobject-introspection vala"
-makedepends="sqlite-devel libxml2-devel libglib-devel python3-gobject-devel check-devel"
+build_helper="gir qemu"
+configure_args="-Dpy-overrides-dir=/${py3_sitelib}/gi/overrides"
+hostmakedepends="gtk-doc pkg-config glib-devel gobject-introspection vala
+ libxml2 dbus-test-runner"
+makedepends="sqlite-devel libxml2-devel libglib-devel python3-gobject-devel
+ check-devel"
+checkdepends="dbus xvfb-run"
 short_desc="GLib-based client library for the accounts database"
 maintainer="John Rowley <enterthevoid@codesector.co>"
 license="LGPL-2.1-only"
 homepage="https://gitlab.com/accounts-sso/libaccounts-glib"
 distfiles="https://gitlab.com/accounts-sso/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=eebb1c6debfcf929efb388a0f28d8cc8ec9b32f273e4abe4224a33e5d299cd73
+checksum=1e245338186bd481690d259d3a8b412c20c17149fcef3e8a66ec1f1705fabda4
+# make_check_pre="dbus-run-session xvfb-run"
+make_check=no # test_store_locked_cancel
 
-if [ "$CROSS_BUILD" ]; then
-	# Remove docs. During install of package, it will try
-	# to run target binary with host, which causes exec error
-	post_patch() {
-		vsed -e '/docs/d' -i meson.build
-	}
-fi
+post_patch() {
+	# Failing on musl
+	if [ "$CROSS_BUILD" ]; then
+		sed -i "/subdir.'docs'/d" meson.build
+	fi
+}
 
 libaccounts-glib-devel_package() {
 	short_desc+=" - development files"
@@ -29,5 +33,10 @@ libaccounts-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/*.so
 		vmove usr/lib/pkgconfig
+		vmove "usr/share/gir-*"
+		vmove usr/share/vala
+		if [ ! "$CROSS_BUILD" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

From 5eea12cdec88e2fa5142473703b10ff6ff5f391d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 7 Apr 2024 16:02:37 +0700
Subject: [PATCH 2/2] build-style/qmake: build in build_wrksrc

---
 common/build-style/qmake.sh | 39 ++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/common/build-style/qmake.sh b/common/build-style/qmake.sh
index 31745833606eff..e4356ce6797d04 100644
--- a/common/build-style/qmake.sh
+++ b/common/build-style/qmake.sh
@@ -4,17 +4,22 @@
 do_configure() {
 	local qmake
 	local qmake_args
-	local qt
-	if [ -x "/usr/lib/qt5/bin/qmake" ]; then
-		qmake="/usr/lib/qt5/bin/qmake"
+	local qt=${QT:-}
+	local builddir="${wrksrc}/${build_wrksrc}"
+	cd ${builddir}
+	if [ "${QT}" ]; then
+		qt=${QT}
+		if [ ! -x "/usr/lib/${qt}/bin/qmake" ]; then
+			msg_error "${QT} is requested, but not found\n"
+		fi
+	elif [ -x "/usr/lib/qt5/bin/qmake" ]; then
 		qt="qt5"
 	elif [ -x "/usr/lib/qt6/bin/qmake" ]; then
-		qmake="/usr/lib/qt6/bin/qmake"
 		qt="qt6"
-	fi
-	if [ -z "${qmake}" ]; then
+	else
 		msg_error "${pkgver}: Could not find qmake - missing in hostmakedepends?\n"
 	fi
+	qmake="/usr/lib/${qt}/bin/qmake"
 	if [ "$CROSS_BUILD" ]; then
 		case $XBPS_TARGET_MACHINE in
 			i686*) _qt_arch=i386;;
@@ -25,8 +30,8 @@ do_configure() {
 			ppc64*) _qt_arch=power64;;
 			ppc*) _qt_arch=power;;
 		esac
-		mkdir -p "${wrksrc}/.target-spec/linux-g++"
-		cat > "${wrksrc}/.target-spec/linux-g++/qmake.conf" <<_EOF
+		mkdir -p "${builddir}/.target-spec/linux-g++"
+		cat > "${builddir}/.target-spec/linux-g++/qmake.conf" <<_EOF
 MAKEFILE_GENERATOR      = UNIX
 CONFIG                 += incremental no_qt_rpath
 QMAKE_INCREMENTAL_STYLE = sublib
@@ -54,10 +59,10 @@ QMAKE_CXXFLAGS          = ${CXXFLAGS}
 QMAKE_LFLAGS            = ${LDFLAGS}
 load(qt_config)
 _EOF
-		echo "#include \"${XBPS_CROSS_BASE}/usr/lib/${qt}/mkspecs/linux-g++/qplatformdefs.h\"" > "${wrksrc}/.target-spec/linux-g++/qplatformdefs.h"
+		echo "#include \"${XBPS_CROSS_BASE}/usr/lib/${qt}/mkspecs/linux-g++/qplatformdefs.h\"" > "${builddir}/.target-spec/linux-g++/qplatformdefs.h"
 
-		mkdir -p "${wrksrc}/.host-spec/linux-g++"
-		cat > "${wrksrc}/.host-spec/linux-g++/qmake.conf" <<_EOF
+		mkdir -p "${builddir}/.host-spec/linux-g++"
+		cat > "${builddir}/.host-spec/linux-g++/qmake.conf" <<_EOF
 MAKEFILE_GENERATOR      = UNIX
 CONFIG                 += incremental no_qt_rpath
 QMAKE_INCREMENTAL_STYLE = sublib
@@ -84,8 +89,8 @@ QMAKE_CXXFLAGS          = ${CXXFLAGS_host}
 QMAKE_LFLAGS            = ${LDFLAGS_host}
 load(qt_config)
 _EOF
-echo '#include "/usr/lib/${qt}/mkspecs/linux-g++/qplatformdefs.h"' > "${wrksrc}/.host-spec/linux-g++/qplatformdefs.h"
-		cat > "${wrksrc}/qt.conf" <<_EOF
+echo '#include "/usr/lib/${qt}/mkspecs/linux-g++/qplatformdefs.h"' > "${builddir}/.host-spec/linux-g++/qplatformdefs.h"
+		cat > "${builddir}/qt.conf" <<_EOF
 [Paths]
 Sysroot=${XBPS_CROSS_BASE}
 Prefix=/usr
@@ -108,10 +113,10 @@ HostData=/usr/lib/${qt}
 HostBinaries=/usr/lib/${qt}/bin
 HostLibraries=/usr/lib
 HostLibraryExecutables=/usr/lib/${qt}/libexec
-Spec=${wrksrc}/.host-spec/linux-g++
-TargetSpec=${wrksrc}/.target-spec/linux-g++
+Spec=${builddir}/.host-spec/linux-g++
+TargetSpec=${builddir}/.target-spec/linux-g++
 _EOF
-		qmake_args="-qtconf ${wrksrc}/qt.conf PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG}"
+		qmake_args="-qtconf ${builddir}/qt.conf PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG}"
 		${qmake} ${qmake_args} \
 			PREFIX=/usr \
 			QT_INSTALL_PREFIX=/usr \
@@ -134,6 +139,7 @@ _EOF
 }
 
 do_build() {
+	cd "${wrksrc}/${build_wrksrc}"
 	: ${make_cmd:=make}
 
 	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target} \
@@ -141,6 +147,7 @@ do_build() {
 }
 
 do_install() {
+	cd "${wrksrc}/${build_wrksrc}"
 	: ${make_cmd:=make}
 	: ${make_install_target:=install}