[PR PATCH] libaccounts-qt6

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] libaccounts-qt6
@ 2024-04-07  9:04 sgn
  2024-04-07  9:06 ` [PR PATCH] [Updated] libaccounts-qt6 sgn
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: sgn @ 2024-04-07  9:04 UTC (permalink / raw)
  To: ml

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

There is a new 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: 19263 bytes --]

From d1c23c12912d99448a32fdfa6991ffeee35e6fee 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/3] libaccounts-glib: update to 1.26.

---
 common/shlibs                                 |  2 +-
 srcpkgs/libaccounts-glib/template             | 16 ++---
 .../patches/avoid-deprecate.patch             | 65 +++++++++++++++++++
 3 files changed, 70 insertions(+), 13 deletions(-)
 create mode 100644 srcpkgs/thunar-archive-plugin/patches/avoid-deprecate.patch

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..31f0ed8d3d51e8 100644
--- a/srcpkgs/libaccounts-glib/template
+++ b/srcpkgs/libaccounts-glib/template
@@ -1,9 +1,9 @@
 # Template file for 'libaccounts-glib'
 pkgname=libaccounts-glib
-version=1.24
-revision=7
+version=1.26
+revision=1
 build_style=meson
-build_helper="gir"
+build_helper="gir qemu"
 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"
@@ -12,15 +12,7 @@ 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
-
-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
+checksum=1e245338186bd481690d259d3a8b412c20c17149fcef3e8a66ec1f1705fabda4
 
 libaccounts-glib-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/thunar-archive-plugin/patches/avoid-deprecate.patch b/srcpkgs/thunar-archive-plugin/patches/avoid-deprecate.patch
new file mode 100644
index 00000000000000..a19fcc8fbc82a0
--- /dev/null
+++ b/srcpkgs/thunar-archive-plugin/patches/avoid-deprecate.patch
@@ -0,0 +1,65 @@
+diff --git a/thunar-archive-plugin/tap-backend.c b/thunar-archive-plugin/tap-backend.c
+index 1c8d00e..4f95cdf 100644
+--- a/thunar-archive-plugin/tap-backend.c
++++ b/thunar-archive-plugin/tap-backend.c
+@@ -32,6 +32,9 @@
+ 
+ #include <exo/exo.h>
+ #include <thunar-archive-plugin/tap-backend.h>
++#ifdef GDK_WINDOWING_WAYLAND
++#include <gdk/gdkwayland.h>
++#endif
+ 
+ 
+ 
+@@ -389,6 +392,7 @@ tap_backend_run (const gchar *action,
+   GAppInfo                 *mime_application;
+   gchar                    *mime_type;
+   GdkScreen                *screen;
++  GdkDisplay               *display;
+   gchar                    *wrapper;
+   gchar                   **argv;
+   gchar                   **envp;
+@@ -396,7 +400,7 @@ tap_backend_run (const gchar *action,
+   GList                    *lp;
+   GPid                      pid = -1;
+   gint                      n;
+-  gchar                    *display = NULL;
++  const gchar              *displayname;
+ 
+   /* determine the mime infos on-demand */
+   if (G_LIKELY (content_types == NULL))
+@@ -444,9 +448,22 @@ tap_backend_run (const gchar *action,
+ 
+           if (screen != NULL)
+             {
+-              display = gdk_screen_make_display_name (screen);
+-              if (display != NULL)
+-                envp = g_environ_setenv(envp, "DISPLAY", display, TRUE);
++              display = gdk_screen_get_display (screen);
++              displayname = gdk_display_get_name (display);
++              if (displayname != NULL)
++                {
++#ifdef GDK_WINDOWING_WAYLAND
++                  if (GDK_IS_WAYLAND_DISPLAY (display))
++                    {
++                      g_debug("Setting WAYLAND_DISPLAY to %s", displayname);
++                      envp = g_environ_setenv (envp, "WAYLAND_DISPLAY", displayname, TRUE);
++                    }
++                  else
++#endif
++                  if (TRUE) {
++                      envp = g_environ_setenv(envp, "DISPLAY", displayname, TRUE);
++                    }
++                }
+             }
+ 
+           /* try to run the command */
+@@ -456,7 +473,6 @@ tap_backend_run (const gchar *action,
+           /* cleanup */
+           g_strfreev (envp);
+           g_strfreev (argv);
+-          g_free (display);
+         }
+ 
+       /* cleanup */

From 3445d00335b4addd12292f94407f657d05045b82 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/3] 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}
 

From 3b5bdf38ec0b762170d9c1ace060a3d46dc6ef99 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:14 +0700
Subject: [PATCH 3/3] New package: libaccounts-qt-1.17

---
 srcpkgs/libaccounts-qt/patches/cross.patch    | 61 +++++++++++++++
 srcpkgs/libaccounts-qt/template               | 78 +++++++++++++++++++
 .../update                                    |  0
 srcpkgs/libaccounts-qt5                       |  1 +
 srcpkgs/libaccounts-qt5-devel                 |  2 +-
 srcpkgs/libaccounts-qt5/patches/cross.patch   | 26 -------
 srcpkgs/libaccounts-qt5/template              | 26 -------
 srcpkgs/libaccounts-qt6                       |  1 +
 srcpkgs/libaccounts-qt6-devel                 |  1 +
 9 files changed, 143 insertions(+), 53 deletions(-)
 create mode 100644 srcpkgs/libaccounts-qt/patches/cross.patch
 create mode 100644 srcpkgs/libaccounts-qt/template
 rename srcpkgs/{libaccounts-qt5 => libaccounts-qt}/update (100%)
 create mode 120000 srcpkgs/libaccounts-qt5
 delete mode 100644 srcpkgs/libaccounts-qt5/patches/cross.patch
 delete mode 100644 srcpkgs/libaccounts-qt5/template
 create mode 120000 srcpkgs/libaccounts-qt6
 create mode 120000 srcpkgs/libaccounts-qt6-devel

diff --git a/srcpkgs/libaccounts-qt/patches/cross.patch b/srcpkgs/libaccounts-qt/patches/cross.patch
new file mode 100644
index 00000000000000..2ddb5ca1710eae
--- /dev/null
+++ b/srcpkgs/libaccounts-qt/patches/cross.patch
@@ -0,0 +1,61 @@
+--- a/Accounts/AccountsQt5Config.cmake.in
++++ b/Accounts/AccountsQt5Config.cmake.in
+@@ -1,5 +1,25 @@
+ #  ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
+ #  ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
+ 
+-set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
+-set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
++# Compute the installation prefix relative to this file.
++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
++# Use original install prefix when loaded through a
++# cross-prefix symbolic link such as /lib -> /usr/lib.
++get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH)
++get_filename_component(_realOrig "/usr/lib/cmake/AccountsQt5" REALPATH)
++if(_realCurr STREQUAL _realOrig)
++  set(_IMPORT_PREFIX "/usr/lib/cmake/AccountsQt5")
++endif()
++unset(_realOrig)
++unset(_realCurr)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++if(_IMPORT_PREFIX STREQUAL "/")
++  set(_IMPORT_PREFIX "")
++endif()
++
++set(ACCOUNTSQT_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
++set(ACCOUNTSQT_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
++set(ACCOUNTSQT5_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
++set(ACCOUNTSQT5_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
+--- a/Accounts/AccountsQt6Config.cmake.in
++++ b/Accounts/AccountsQt6Config.cmake.in
+@@ -1,5 +1,25 @@
+ #  ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
+ #  ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
+ 
+-set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
+-set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
+\ No newline at end of file
++# Compute the installation prefix relative to this file.
++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
++# Use original install prefix when loaded through a
++# cross-prefix symbolic link such as /lib -> /usr/lib.
++get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH)
++get_filename_component(_realOrig "/usr/lib/cmake/AccountsQt6" REALPATH)
++if(_realCurr STREQUAL _realOrig)
++  set(_IMPORT_PREFIX "/usr/lib/cmake/AccountsQt6")
++endif()
++unset(_realOrig)
++unset(_realCurr)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++if(_IMPORT_PREFIX STREQUAL "/")
++  set(_IMPORT_PREFIX "")
++endif()
++
++set(ACCOUNTSQT_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
++set(ACCOUNTSQT_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
++set(ACCOUNTSQT6_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
++set(ACCOUNTSQT6_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
diff --git a/srcpkgs/libaccounts-qt/template b/srcpkgs/libaccounts-qt/template
new file mode 100644
index 00000000000000..c291b9f7514080
--- /dev/null
+++ b/srcpkgs/libaccounts-qt/template
@@ -0,0 +1,78 @@
+# Template file for 'libaccounts-qt'
+pkgname=libaccounts-qt
+version=1.17
+revision=1
+build_style=qmake
+configure_args="LIBDIR=/usr/lib .."
+hostmakedepends="pkg-config doxygen qt5-qmake qt5-host-tools
+ qt6-base"
+makedepends="libaccounts-glib-devel qt5-devel qt6-base-devel"
+short_desc="Client library to the accounts database"
+maintainer="John Rowley <enterthevoid@codesector.co>"
+license="LGPL-2.1-only"
+homepage="https://gitlab.com/accounts-sso/libaccounts-qt"
+distfiles="${homepage}/-/archive/VERSION_${version}/libaccounts-qt-VERSION_${version}.tar.gz"
+checksum=6ed3e976133962c1c88f6c66928ba0d0a17a570843577d31e783dc891659e5d8
+
+post_extract() {
+	mkdir -p build-qt5 build-qt6
+}
+
+pre_configure() {
+	build_wrksrc=build-qt5
+}
+
+post_configure() {
+	build_wrksrc="build-qt6"
+	QT=qt6
+	do_configure
+}
+
+do_build() {
+	make -C build-qt5 ${make_jobs}
+	make -C build-qt6 ${make_jobs}
+}
+
+do_install() {
+	make -C build-qt5 install DESTDIR=${DESTDIR} PREFIX=/usr \
+		INSTALL_ROOT=${DESTDIR} STRIP=true
+	make -C build-qt6 install DESTDIR=${DESTDIR} PREFIX=/usr \
+		INSTALL_ROOT=${DESTDIR} STRIP=true
+}
+
+libaccounts-qt5_package() {
+	short_desc+=" - Qt5"
+	pkg_install() {
+		vmove "usr/lib/libaccounts-qt5.so.*"
+	}
+}
+
+libaccounts-qt6_package() {
+	short_desc+=" - Qt6"
+	pkg_install() {
+		vmove "usr/lib/libaccounts-qt6.so.*"
+	}
+}
+
+libaccounts-qt5-devel_package() {
+	short_desc+=" - Qt5 - development files"
+	depends="qt5-devel libaccounts-qt5>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include/accounts-qt5
+		vmove usr/lib/libaccounts-qt5.so
+		vmove usr/lib/cmake/AccountsQt5
+		vmove usr/lib/pkgconfig/accounts-qt5.pc
+	}
+}
+
+libaccounts-qt6-devel_package() {
+	short_desc+=" - Qt6 - development files"
+	depends="qt6-base-devel libaccounts-qt6>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include/accounts-qt6
+		vmove usr/lib/libaccounts-qt6.so
+		vmove usr/lib/cmake/AccountsQt6
+		vmove usr/lib/pkgconfig/accounts-qt6.pc
+		vmove usr/share/doc
+	}
+}
diff --git a/srcpkgs/libaccounts-qt5/update b/srcpkgs/libaccounts-qt/update
similarity index 100%
rename from srcpkgs/libaccounts-qt5/update
rename to srcpkgs/libaccounts-qt/update
diff --git a/srcpkgs/libaccounts-qt5 b/srcpkgs/libaccounts-qt5
new file mode 120000
index 00000000000000..b490868d44e4b5
--- /dev/null
+++ b/srcpkgs/libaccounts-qt5
@@ -0,0 +1 @@
+libaccounts-qt
\ No newline at end of file
diff --git a/srcpkgs/libaccounts-qt5-devel b/srcpkgs/libaccounts-qt5-devel
index d3f04ed4865af9..b490868d44e4b5 120000
--- a/srcpkgs/libaccounts-qt5-devel
+++ b/srcpkgs/libaccounts-qt5-devel
@@ -1 +1 @@
-libaccounts-qt5
\ No newline at end of file
+libaccounts-qt
\ No newline at end of file
diff --git a/srcpkgs/libaccounts-qt5/patches/cross.patch b/srcpkgs/libaccounts-qt5/patches/cross.patch
deleted file mode 100644
index c3265b7db9be41..00000000000000
--- a/srcpkgs/libaccounts-qt5/patches/cross.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/Accounts/AccountsQt5Config.cmake.in	2019-09-18 21:00:34.000000000 +0200
-+++ b/Accounts/AccountsQt5Config.cmake.in	2019-09-18 21:00:34.000000000 +0200
-@@ -1,5 +1,20 @@
- #  ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
- #  ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
-+ 
-+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
-+if(_realCurr STREQUAL _realOrig)
-+  set(_IMPORT_PREFIX "/usr/lib/cmake/AccountsQt5")
-+endif()
-+unset(_realOrig)
-+unset(_realCurr)
-+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-+if(_IMPORT_PREFIX STREQUAL "/")
-+  set(_IMPORT_PREFIX "")
-+endif()
-+ 
-+set(ACCOUNTSQT_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
-+set(ACCOUNTSQT_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
- 
--set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
--set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
-\ No newline at end of file
-+set(_IMPORT_PREFIX)
diff --git a/srcpkgs/libaccounts-qt5/template b/srcpkgs/libaccounts-qt5/template
deleted file mode 100644
index f7da82daa10eef..00000000000000
--- a/srcpkgs/libaccounts-qt5/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'libaccounts-qt5'
-pkgname=libaccounts-qt5
-version=1.16
-revision=2
-build_style=qmake
-configure_args="LIBDIR=/usr/lib"
-hostmakedepends="pkg-config doxygen qt5-qmake qt5-host-tools"
-makedepends="libaccounts-glib-devel qt5-devel"
-short_desc="Client library to the accounts database, with a Qt5-based API"
-maintainer="John Rowley <enterthevoid@codesector.co>"
-license="LGPL-2.1-only"
-homepage="https://gitlab.com/accounts-sso/libaccounts-qt"
-distfiles="${homepage}/-/archive/VERSION_${version}/libaccounts-qt-VERSION_${version}.tar.gz"
-checksum=3e527b151ee87e851b0f027214bda1353d8e48e10a5b54109f1e4b7d422a7de3
-
-libaccounts-qt5-devel_package() {
-	short_desc+=" - development files"
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc/accounts-qt
-		vmove usr/lib/cmake
-	}
-}
diff --git a/srcpkgs/libaccounts-qt6 b/srcpkgs/libaccounts-qt6
new file mode 120000
index 00000000000000..b490868d44e4b5
--- /dev/null
+++ b/srcpkgs/libaccounts-qt6
@@ -0,0 +1 @@
+libaccounts-qt
\ No newline at end of file
diff --git a/srcpkgs/libaccounts-qt6-devel b/srcpkgs/libaccounts-qt6-devel
new file mode 120000
index 00000000000000..b490868d44e4b5
--- /dev/null
+++ b/srcpkgs/libaccounts-qt6-devel
@@ -0,0 +1 @@
+libaccounts-qt
\ No newline at end of file

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] libaccounts-qt6
  2024-04-07  9:04 [PR PATCH] libaccounts-qt6 sgn
@ 2024-04-07  9:06 ` sgn
  2024-04-07 12:22 ` sgn
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2024-04-07  9:06 UTC (permalink / raw)
  To: ml

[-- 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: 16499 bytes --]

From 6d475a34c886630e204bfb828be5049736c47661 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/3] libaccounts-glib: update to 1.26.

---
 common/shlibs                     |  2 +-
 srcpkgs/libaccounts-glib/template | 16 ++++------------
 2 files changed, 5 insertions(+), 13 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..31f0ed8d3d51e8 100644
--- a/srcpkgs/libaccounts-glib/template
+++ b/srcpkgs/libaccounts-glib/template
@@ -1,9 +1,9 @@
 # Template file for 'libaccounts-glib'
 pkgname=libaccounts-glib
-version=1.24
-revision=7
+version=1.26
+revision=1
 build_style=meson
-build_helper="gir"
+build_helper="gir qemu"
 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"
@@ -12,15 +12,7 @@ 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
-
-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
+checksum=1e245338186bd481690d259d3a8b412c20c17149fcef3e8a66ec1f1705fabda4
 
 libaccounts-glib-devel_package() {
 	short_desc+=" - development files"

From efc30106046301eb4a25b6c085d61b20c3974bb3 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/3] 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}
 

From 949b7ac0fb8ab19cf03ead905b95dbbd4b6510bb 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:14 +0700
Subject: [PATCH 3/3] New package: libaccounts-qt-1.17

---
 srcpkgs/libaccounts-qt/patches/cross.patch    | 61 +++++++++++++++
 srcpkgs/libaccounts-qt/template               | 78 +++++++++++++++++++
 .../update                                    |  0
 srcpkgs/libaccounts-qt5                       |  1 +
 srcpkgs/libaccounts-qt5-devel                 |  2 +-
 srcpkgs/libaccounts-qt5/patches/cross.patch   | 26 -------
 srcpkgs/libaccounts-qt5/template              | 26 -------
 srcpkgs/libaccounts-qt6                       |  1 +
 srcpkgs/libaccounts-qt6-devel                 |  1 +
 9 files changed, 143 insertions(+), 53 deletions(-)
 create mode 100644 srcpkgs/libaccounts-qt/patches/cross.patch
 create mode 100644 srcpkgs/libaccounts-qt/template
 rename srcpkgs/{libaccounts-qt5 => libaccounts-qt}/update (100%)
 create mode 120000 srcpkgs/libaccounts-qt5
 delete mode 100644 srcpkgs/libaccounts-qt5/patches/cross.patch
 delete mode 100644 srcpkgs/libaccounts-qt5/template
 create mode 120000 srcpkgs/libaccounts-qt6
 create mode 120000 srcpkgs/libaccounts-qt6-devel

diff --git a/srcpkgs/libaccounts-qt/patches/cross.patch b/srcpkgs/libaccounts-qt/patches/cross.patch
new file mode 100644
index 00000000000000..2ddb5ca1710eae
--- /dev/null
+++ b/srcpkgs/libaccounts-qt/patches/cross.patch
@@ -0,0 +1,61 @@
+--- a/Accounts/AccountsQt5Config.cmake.in
++++ b/Accounts/AccountsQt5Config.cmake.in
+@@ -1,5 +1,25 @@
+ #  ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
+ #  ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
+ 
+-set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
+-set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
++# Compute the installation prefix relative to this file.
++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
++# Use original install prefix when loaded through a
++# cross-prefix symbolic link such as /lib -> /usr/lib.
++get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH)
++get_filename_component(_realOrig "/usr/lib/cmake/AccountsQt5" REALPATH)
++if(_realCurr STREQUAL _realOrig)
++  set(_IMPORT_PREFIX "/usr/lib/cmake/AccountsQt5")
++endif()
++unset(_realOrig)
++unset(_realCurr)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++if(_IMPORT_PREFIX STREQUAL "/")
++  set(_IMPORT_PREFIX "")
++endif()
++
++set(ACCOUNTSQT_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
++set(ACCOUNTSQT_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
++set(ACCOUNTSQT5_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
++set(ACCOUNTSQT5_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
+--- a/Accounts/AccountsQt6Config.cmake.in
++++ b/Accounts/AccountsQt6Config.cmake.in
+@@ -1,5 +1,25 @@
+ #  ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
+ #  ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
+ 
+-set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
+-set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
+\ No newline at end of file
++# Compute the installation prefix relative to this file.
++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
++# Use original install prefix when loaded through a
++# cross-prefix symbolic link such as /lib -> /usr/lib.
++get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH)
++get_filename_component(_realOrig "/usr/lib/cmake/AccountsQt6" REALPATH)
++if(_realCurr STREQUAL _realOrig)
++  set(_IMPORT_PREFIX "/usr/lib/cmake/AccountsQt6")
++endif()
++unset(_realOrig)
++unset(_realCurr)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++if(_IMPORT_PREFIX STREQUAL "/")
++  set(_IMPORT_PREFIX "")
++endif()
++
++set(ACCOUNTSQT_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
++set(ACCOUNTSQT_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
++set(ACCOUNTSQT6_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
++set(ACCOUNTSQT6_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
diff --git a/srcpkgs/libaccounts-qt/template b/srcpkgs/libaccounts-qt/template
new file mode 100644
index 00000000000000..c291b9f7514080
--- /dev/null
+++ b/srcpkgs/libaccounts-qt/template
@@ -0,0 +1,78 @@
+# Template file for 'libaccounts-qt'
+pkgname=libaccounts-qt
+version=1.17
+revision=1
+build_style=qmake
+configure_args="LIBDIR=/usr/lib .."
+hostmakedepends="pkg-config doxygen qt5-qmake qt5-host-tools
+ qt6-base"
+makedepends="libaccounts-glib-devel qt5-devel qt6-base-devel"
+short_desc="Client library to the accounts database"
+maintainer="John Rowley <enterthevoid@codesector.co>"
+license="LGPL-2.1-only"
+homepage="https://gitlab.com/accounts-sso/libaccounts-qt"
+distfiles="${homepage}/-/archive/VERSION_${version}/libaccounts-qt-VERSION_${version}.tar.gz"
+checksum=6ed3e976133962c1c88f6c66928ba0d0a17a570843577d31e783dc891659e5d8
+
+post_extract() {
+	mkdir -p build-qt5 build-qt6
+}
+
+pre_configure() {
+	build_wrksrc=build-qt5
+}
+
+post_configure() {
+	build_wrksrc="build-qt6"
+	QT=qt6
+	do_configure
+}
+
+do_build() {
+	make -C build-qt5 ${make_jobs}
+	make -C build-qt6 ${make_jobs}
+}
+
+do_install() {
+	make -C build-qt5 install DESTDIR=${DESTDIR} PREFIX=/usr \
+		INSTALL_ROOT=${DESTDIR} STRIP=true
+	make -C build-qt6 install DESTDIR=${DESTDIR} PREFIX=/usr \
+		INSTALL_ROOT=${DESTDIR} STRIP=true
+}
+
+libaccounts-qt5_package() {
+	short_desc+=" - Qt5"
+	pkg_install() {
+		vmove "usr/lib/libaccounts-qt5.so.*"
+	}
+}
+
+libaccounts-qt6_package() {
+	short_desc+=" - Qt6"
+	pkg_install() {
+		vmove "usr/lib/libaccounts-qt6.so.*"
+	}
+}
+
+libaccounts-qt5-devel_package() {
+	short_desc+=" - Qt5 - development files"
+	depends="qt5-devel libaccounts-qt5>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include/accounts-qt5
+		vmove usr/lib/libaccounts-qt5.so
+		vmove usr/lib/cmake/AccountsQt5
+		vmove usr/lib/pkgconfig/accounts-qt5.pc
+	}
+}
+
+libaccounts-qt6-devel_package() {
+	short_desc+=" - Qt6 - development files"
+	depends="qt6-base-devel libaccounts-qt6>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include/accounts-qt6
+		vmove usr/lib/libaccounts-qt6.so
+		vmove usr/lib/cmake/AccountsQt6
+		vmove usr/lib/pkgconfig/accounts-qt6.pc
+		vmove usr/share/doc
+	}
+}
diff --git a/srcpkgs/libaccounts-qt5/update b/srcpkgs/libaccounts-qt/update
similarity index 100%
rename from srcpkgs/libaccounts-qt5/update
rename to srcpkgs/libaccounts-qt/update
diff --git a/srcpkgs/libaccounts-qt5 b/srcpkgs/libaccounts-qt5
new file mode 120000
index 00000000000000..b490868d44e4b5
--- /dev/null
+++ b/srcpkgs/libaccounts-qt5
@@ -0,0 +1 @@
+libaccounts-qt
\ No newline at end of file
diff --git a/srcpkgs/libaccounts-qt5-devel b/srcpkgs/libaccounts-qt5-devel
index d3f04ed4865af9..b490868d44e4b5 120000
--- a/srcpkgs/libaccounts-qt5-devel
+++ b/srcpkgs/libaccounts-qt5-devel
@@ -1 +1 @@
-libaccounts-qt5
\ No newline at end of file
+libaccounts-qt
\ No newline at end of file
diff --git a/srcpkgs/libaccounts-qt5/patches/cross.patch b/srcpkgs/libaccounts-qt5/patches/cross.patch
deleted file mode 100644
index c3265b7db9be41..00000000000000
--- a/srcpkgs/libaccounts-qt5/patches/cross.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/Accounts/AccountsQt5Config.cmake.in	2019-09-18 21:00:34.000000000 +0200
-+++ b/Accounts/AccountsQt5Config.cmake.in	2019-09-18 21:00:34.000000000 +0200
-@@ -1,5 +1,20 @@
- #  ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
- #  ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
-+ 
-+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
-+if(_realCurr STREQUAL _realOrig)
-+  set(_IMPORT_PREFIX "/usr/lib/cmake/AccountsQt5")
-+endif()
-+unset(_realOrig)
-+unset(_realCurr)
-+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-+if(_IMPORT_PREFIX STREQUAL "/")
-+  set(_IMPORT_PREFIX "")
-+endif()
-+ 
-+set(ACCOUNTSQT_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
-+set(ACCOUNTSQT_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
- 
--set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
--set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
-\ No newline at end of file
-+set(_IMPORT_PREFIX)
diff --git a/srcpkgs/libaccounts-qt5/template b/srcpkgs/libaccounts-qt5/template
deleted file mode 100644
index f7da82daa10eef..00000000000000
--- a/srcpkgs/libaccounts-qt5/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'libaccounts-qt5'
-pkgname=libaccounts-qt5
-version=1.16
-revision=2
-build_style=qmake
-configure_args="LIBDIR=/usr/lib"
-hostmakedepends="pkg-config doxygen qt5-qmake qt5-host-tools"
-makedepends="libaccounts-glib-devel qt5-devel"
-short_desc="Client library to the accounts database, with a Qt5-based API"
-maintainer="John Rowley <enterthevoid@codesector.co>"
-license="LGPL-2.1-only"
-homepage="https://gitlab.com/accounts-sso/libaccounts-qt"
-distfiles="${homepage}/-/archive/VERSION_${version}/libaccounts-qt-VERSION_${version}.tar.gz"
-checksum=3e527b151ee87e851b0f027214bda1353d8e48e10a5b54109f1e4b7d422a7de3
-
-libaccounts-qt5-devel_package() {
-	short_desc+=" - development files"
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc/accounts-qt
-		vmove usr/lib/cmake
-	}
-}
diff --git a/srcpkgs/libaccounts-qt6 b/srcpkgs/libaccounts-qt6
new file mode 120000
index 00000000000000..b490868d44e4b5
--- /dev/null
+++ b/srcpkgs/libaccounts-qt6
@@ -0,0 +1 @@
+libaccounts-qt
\ No newline at end of file
diff --git a/srcpkgs/libaccounts-qt6-devel b/srcpkgs/libaccounts-qt6-devel
new file mode 120000
index 00000000000000..b490868d44e4b5
--- /dev/null
+++ b/srcpkgs/libaccounts-qt6-devel
@@ -0,0 +1 @@
+libaccounts-qt
\ No newline at end of file

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] libaccounts-qt6
  2024-04-07  9:04 [PR PATCH] libaccounts-qt6 sgn
  2024-04-07  9:06 ` [PR PATCH] [Updated] libaccounts-qt6 sgn
@ 2024-04-07 12:22 ` sgn
  2024-04-07 12:35 ` sgn
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2024-04-07 12:22 UTC (permalink / raw)
  To: ml

[-- 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: 18762 bytes --]

From 22134c2d94dd74087bcc25b7214971c58d0de5e4 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:47:02 +0700
Subject: [PATCH 1/4] chroot: provides a machine-id

A lot of packages expect a machine-id these days
---
 common/xbps-src/shutils/chroot.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 69ca6b78f5838e..21f7ad223c292f 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -23,6 +23,10 @@ install_base_chroot() {
         XBPS_ARCH=$XBPS_TARGET_PKG xbps-reconfigure -r $XBPS_MASTERDIR -f base-files &>/dev/null
     fi
 
+    msg_normal "xbps-src: set machine-id...\n"
+    # This is the value currently used in template
+    echo 'dcb30309cd6c8b7cc20383d85a5c7012' >$XBPS_MASTERDIR/etc/machine-id
+
     msg_normal "xbps-src: installed base-chroot successfully!\n"
     chroot_prepare $XBPS_TARGET_PKG || msg_error "xbps-src: failed to initialize chroot!\n"
     chroot_check
@@ -55,6 +59,8 @@ update_base_chroot() {
     msg_normal "xbps-src: cleaning up $XBPS_MASTERDIR masterdir...\n"
     [ -z "$XBPS_KEEP_ALL" -a -z "$XBPS_SKIP_DEPS" ] && remove_pkg_autodeps
     [ -z "$XBPS_KEEP_ALL" -a -z "$keep_all_force" ] && rm -rf $XBPS_MASTERDIR/builddir $XBPS_MASTERDIR/destdir
+    msg_normal "xbps-src: set machine-id...\n"
+    echo 'dcb30309cd6c8b7cc20383d85a5c7012' >$XBPS_MASTERDIR/etc/machine-id
 }
 
 # FIXME: $XBPS_FFLAGS is not set when chroot_init() is run

From 86e8d5ae96ecd8b4d96791c14817feccef1b861b 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 2/4] libaccounts-glib: update to 1.26.

---
 common/shlibs                     |  2 +-
 srcpkgs/libaccounts-glib/template | 34 ++++++++++++++++++-------------
 2 files changed, 21 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..4b03fbaf0d1e83 100644
--- a/srcpkgs/libaccounts-glib/template
+++ b/srcpkgs/libaccounts-glib/template
@@ -1,26 +1,27 @@
 # 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"
+makedepends="sqlite-devel libxml2-devel libglib-devel python3-gobject-devel
+ check-devel"
 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
 
-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 +30,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 3db7094d9b5d13aa737e84258eec66c10efb494b 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 3/4] 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}
 

From 542d6196e20d0c7f3b3449a8e04bf4d35384b143 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:14 +0700
Subject: [PATCH 4/4] New package: libaccounts-qt-1.17

---
 srcpkgs/libaccounts-qt/patches/cross.patch    | 61 +++++++++++++++
 srcpkgs/libaccounts-qt/template               | 78 +++++++++++++++++++
 .../update                                    |  0
 srcpkgs/libaccounts-qt5                       |  1 +
 srcpkgs/libaccounts-qt5-devel                 |  2 +-
 srcpkgs/libaccounts-qt5/patches/cross.patch   | 26 -------
 srcpkgs/libaccounts-qt5/template              | 26 -------
 srcpkgs/libaccounts-qt6                       |  1 +
 srcpkgs/libaccounts-qt6-devel                 |  1 +
 9 files changed, 143 insertions(+), 53 deletions(-)
 create mode 100644 srcpkgs/libaccounts-qt/patches/cross.patch
 create mode 100644 srcpkgs/libaccounts-qt/template
 rename srcpkgs/{libaccounts-qt5 => libaccounts-qt}/update (100%)
 create mode 120000 srcpkgs/libaccounts-qt5
 delete mode 100644 srcpkgs/libaccounts-qt5/patches/cross.patch
 delete mode 100644 srcpkgs/libaccounts-qt5/template
 create mode 120000 srcpkgs/libaccounts-qt6
 create mode 120000 srcpkgs/libaccounts-qt6-devel

diff --git a/srcpkgs/libaccounts-qt/patches/cross.patch b/srcpkgs/libaccounts-qt/patches/cross.patch
new file mode 100644
index 00000000000000..2ddb5ca1710eae
--- /dev/null
+++ b/srcpkgs/libaccounts-qt/patches/cross.patch
@@ -0,0 +1,61 @@
+--- a/Accounts/AccountsQt5Config.cmake.in
++++ b/Accounts/AccountsQt5Config.cmake.in
+@@ -1,5 +1,25 @@
+ #  ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
+ #  ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
+ 
+-set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
+-set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
++# Compute the installation prefix relative to this file.
++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
++# Use original install prefix when loaded through a
++# cross-prefix symbolic link such as /lib -> /usr/lib.
++get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH)
++get_filename_component(_realOrig "/usr/lib/cmake/AccountsQt5" REALPATH)
++if(_realCurr STREQUAL _realOrig)
++  set(_IMPORT_PREFIX "/usr/lib/cmake/AccountsQt5")
++endif()
++unset(_realOrig)
++unset(_realCurr)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++if(_IMPORT_PREFIX STREQUAL "/")
++  set(_IMPORT_PREFIX "")
++endif()
++
++set(ACCOUNTSQT_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
++set(ACCOUNTSQT_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
++set(ACCOUNTSQT5_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
++set(ACCOUNTSQT5_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
+--- a/Accounts/AccountsQt6Config.cmake.in
++++ b/Accounts/AccountsQt6Config.cmake.in
+@@ -1,5 +1,25 @@
+ #  ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
+ #  ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
+ 
+-set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
+-set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
+\ No newline at end of file
++# Compute the installation prefix relative to this file.
++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
++# Use original install prefix when loaded through a
++# cross-prefix symbolic link such as /lib -> /usr/lib.
++get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH)
++get_filename_component(_realOrig "/usr/lib/cmake/AccountsQt6" REALPATH)
++if(_realCurr STREQUAL _realOrig)
++  set(_IMPORT_PREFIX "/usr/lib/cmake/AccountsQt6")
++endif()
++unset(_realOrig)
++unset(_realCurr)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++if(_IMPORT_PREFIX STREQUAL "/")
++  set(_IMPORT_PREFIX "")
++endif()
++
++set(ACCOUNTSQT_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
++set(ACCOUNTSQT_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
++set(ACCOUNTSQT6_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
++set(ACCOUNTSQT6_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
diff --git a/srcpkgs/libaccounts-qt/template b/srcpkgs/libaccounts-qt/template
new file mode 100644
index 00000000000000..c291b9f7514080
--- /dev/null
+++ b/srcpkgs/libaccounts-qt/template
@@ -0,0 +1,78 @@
+# Template file for 'libaccounts-qt'
+pkgname=libaccounts-qt
+version=1.17
+revision=1
+build_style=qmake
+configure_args="LIBDIR=/usr/lib .."
+hostmakedepends="pkg-config doxygen qt5-qmake qt5-host-tools
+ qt6-base"
+makedepends="libaccounts-glib-devel qt5-devel qt6-base-devel"
+short_desc="Client library to the accounts database"
+maintainer="John Rowley <enterthevoid@codesector.co>"
+license="LGPL-2.1-only"
+homepage="https://gitlab.com/accounts-sso/libaccounts-qt"
+distfiles="${homepage}/-/archive/VERSION_${version}/libaccounts-qt-VERSION_${version}.tar.gz"
+checksum=6ed3e976133962c1c88f6c66928ba0d0a17a570843577d31e783dc891659e5d8
+
+post_extract() {
+	mkdir -p build-qt5 build-qt6
+}
+
+pre_configure() {
+	build_wrksrc=build-qt5
+}
+
+post_configure() {
+	build_wrksrc="build-qt6"
+	QT=qt6
+	do_configure
+}
+
+do_build() {
+	make -C build-qt5 ${make_jobs}
+	make -C build-qt6 ${make_jobs}
+}
+
+do_install() {
+	make -C build-qt5 install DESTDIR=${DESTDIR} PREFIX=/usr \
+		INSTALL_ROOT=${DESTDIR} STRIP=true
+	make -C build-qt6 install DESTDIR=${DESTDIR} PREFIX=/usr \
+		INSTALL_ROOT=${DESTDIR} STRIP=true
+}
+
+libaccounts-qt5_package() {
+	short_desc+=" - Qt5"
+	pkg_install() {
+		vmove "usr/lib/libaccounts-qt5.so.*"
+	}
+}
+
+libaccounts-qt6_package() {
+	short_desc+=" - Qt6"
+	pkg_install() {
+		vmove "usr/lib/libaccounts-qt6.so.*"
+	}
+}
+
+libaccounts-qt5-devel_package() {
+	short_desc+=" - Qt5 - development files"
+	depends="qt5-devel libaccounts-qt5>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include/accounts-qt5
+		vmove usr/lib/libaccounts-qt5.so
+		vmove usr/lib/cmake/AccountsQt5
+		vmove usr/lib/pkgconfig/accounts-qt5.pc
+	}
+}
+
+libaccounts-qt6-devel_package() {
+	short_desc+=" - Qt6 - development files"
+	depends="qt6-base-devel libaccounts-qt6>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include/accounts-qt6
+		vmove usr/lib/libaccounts-qt6.so
+		vmove usr/lib/cmake/AccountsQt6
+		vmove usr/lib/pkgconfig/accounts-qt6.pc
+		vmove usr/share/doc
+	}
+}
diff --git a/srcpkgs/libaccounts-qt5/update b/srcpkgs/libaccounts-qt/update
similarity index 100%
rename from srcpkgs/libaccounts-qt5/update
rename to srcpkgs/libaccounts-qt/update
diff --git a/srcpkgs/libaccounts-qt5 b/srcpkgs/libaccounts-qt5
new file mode 120000
index 00000000000000..b490868d44e4b5
--- /dev/null
+++ b/srcpkgs/libaccounts-qt5
@@ -0,0 +1 @@
+libaccounts-qt
\ No newline at end of file
diff --git a/srcpkgs/libaccounts-qt5-devel b/srcpkgs/libaccounts-qt5-devel
index d3f04ed4865af9..b490868d44e4b5 120000
--- a/srcpkgs/libaccounts-qt5-devel
+++ b/srcpkgs/libaccounts-qt5-devel
@@ -1 +1 @@
-libaccounts-qt5
\ No newline at end of file
+libaccounts-qt
\ No newline at end of file
diff --git a/srcpkgs/libaccounts-qt5/patches/cross.patch b/srcpkgs/libaccounts-qt5/patches/cross.patch
deleted file mode 100644
index c3265b7db9be41..00000000000000
--- a/srcpkgs/libaccounts-qt5/patches/cross.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/Accounts/AccountsQt5Config.cmake.in	2019-09-18 21:00:34.000000000 +0200
-+++ b/Accounts/AccountsQt5Config.cmake.in	2019-09-18 21:00:34.000000000 +0200
-@@ -1,5 +1,20 @@
- #  ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
- #  ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
-+ 
-+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
-+if(_realCurr STREQUAL _realOrig)
-+  set(_IMPORT_PREFIX "/usr/lib/cmake/AccountsQt5")
-+endif()
-+unset(_realOrig)
-+unset(_realCurr)
-+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-+if(_IMPORT_PREFIX STREQUAL "/")
-+  set(_IMPORT_PREFIX "")
-+endif()
-+ 
-+set(ACCOUNTSQT_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
-+set(ACCOUNTSQT_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
- 
--set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
--set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
-\ No newline at end of file
-+set(_IMPORT_PREFIX)
diff --git a/srcpkgs/libaccounts-qt5/template b/srcpkgs/libaccounts-qt5/template
deleted file mode 100644
index f7da82daa10eef..00000000000000
--- a/srcpkgs/libaccounts-qt5/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'libaccounts-qt5'
-pkgname=libaccounts-qt5
-version=1.16
-revision=2
-build_style=qmake
-configure_args="LIBDIR=/usr/lib"
-hostmakedepends="pkg-config doxygen qt5-qmake qt5-host-tools"
-makedepends="libaccounts-glib-devel qt5-devel"
-short_desc="Client library to the accounts database, with a Qt5-based API"
-maintainer="John Rowley <enterthevoid@codesector.co>"
-license="LGPL-2.1-only"
-homepage="https://gitlab.com/accounts-sso/libaccounts-qt"
-distfiles="${homepage}/-/archive/VERSION_${version}/libaccounts-qt-VERSION_${version}.tar.gz"
-checksum=3e527b151ee87e851b0f027214bda1353d8e48e10a5b54109f1e4b7d422a7de3
-
-libaccounts-qt5-devel_package() {
-	short_desc+=" - development files"
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc/accounts-qt
-		vmove usr/lib/cmake
-	}
-}
diff --git a/srcpkgs/libaccounts-qt6 b/srcpkgs/libaccounts-qt6
new file mode 120000
index 00000000000000..b490868d44e4b5
--- /dev/null
+++ b/srcpkgs/libaccounts-qt6
@@ -0,0 +1 @@
+libaccounts-qt
\ No newline at end of file
diff --git a/srcpkgs/libaccounts-qt6-devel b/srcpkgs/libaccounts-qt6-devel
new file mode 120000
index 00000000000000..b490868d44e4b5
--- /dev/null
+++ b/srcpkgs/libaccounts-qt6-devel
@@ -0,0 +1 @@
+libaccounts-qt
\ No newline at end of file

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] libaccounts-qt6
  2024-04-07  9:04 [PR PATCH] libaccounts-qt6 sgn
  2024-04-07  9:06 ` [PR PATCH] [Updated] libaccounts-qt6 sgn
  2024-04-07 12:22 ` sgn
@ 2024-04-07 12:35 ` sgn
  2024-04-07 12:36 ` sgn
  2024-04-08  9:45 ` [PR PATCH] [Merged]: libaccounts-qt6 sgn
  4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2024-04-07 12:35 UTC (permalink / raw)
  To: ml

[-- 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}
 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] libaccounts-qt6
  2024-04-07  9:04 [PR PATCH] libaccounts-qt6 sgn
                   ` (2 preceding siblings ...)
  2024-04-07 12:35 ` sgn
@ 2024-04-07 12:36 ` sgn
  2024-04-08  9:45 ` [PR PATCH] [Merged]: libaccounts-qt6 sgn
  4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2024-04-07 12:36 UTC (permalink / raw)
  To: ml

[-- 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: 17308 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/3] 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/3] 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}
 

From 206d9bda10d4df9c90f8c59a715d117620cc36c0 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:14 +0700
Subject: [PATCH 3/3] New package: libaccounts-qt-1.17

---
 srcpkgs/libaccounts-qt/patches/cross.patch    | 61 +++++++++++++++
 srcpkgs/libaccounts-qt/template               | 78 +++++++++++++++++++
 .../update                                    |  0
 srcpkgs/libaccounts-qt5                       |  1 +
 srcpkgs/libaccounts-qt5-devel                 |  2 +-
 srcpkgs/libaccounts-qt5/patches/cross.patch   | 26 -------
 srcpkgs/libaccounts-qt5/template              | 26 -------
 srcpkgs/libaccounts-qt6                       |  1 +
 srcpkgs/libaccounts-qt6-devel                 |  1 +
 9 files changed, 143 insertions(+), 53 deletions(-)
 create mode 100644 srcpkgs/libaccounts-qt/patches/cross.patch
 create mode 100644 srcpkgs/libaccounts-qt/template
 rename srcpkgs/{libaccounts-qt5 => libaccounts-qt}/update (100%)
 create mode 120000 srcpkgs/libaccounts-qt5
 delete mode 100644 srcpkgs/libaccounts-qt5/patches/cross.patch
 delete mode 100644 srcpkgs/libaccounts-qt5/template
 create mode 120000 srcpkgs/libaccounts-qt6
 create mode 120000 srcpkgs/libaccounts-qt6-devel

diff --git a/srcpkgs/libaccounts-qt/patches/cross.patch b/srcpkgs/libaccounts-qt/patches/cross.patch
new file mode 100644
index 00000000000000..2ddb5ca1710eae
--- /dev/null
+++ b/srcpkgs/libaccounts-qt/patches/cross.patch
@@ -0,0 +1,61 @@
+--- a/Accounts/AccountsQt5Config.cmake.in
++++ b/Accounts/AccountsQt5Config.cmake.in
+@@ -1,5 +1,25 @@
+ #  ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
+ #  ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
+ 
+-set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
+-set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
++# Compute the installation prefix relative to this file.
++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
++# Use original install prefix when loaded through a
++# cross-prefix symbolic link such as /lib -> /usr/lib.
++get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH)
++get_filename_component(_realOrig "/usr/lib/cmake/AccountsQt5" REALPATH)
++if(_realCurr STREQUAL _realOrig)
++  set(_IMPORT_PREFIX "/usr/lib/cmake/AccountsQt5")
++endif()
++unset(_realOrig)
++unset(_realCurr)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++if(_IMPORT_PREFIX STREQUAL "/")
++  set(_IMPORT_PREFIX "")
++endif()
++
++set(ACCOUNTSQT_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
++set(ACCOUNTSQT_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
++set(ACCOUNTSQT5_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
++set(ACCOUNTSQT5_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
+--- a/Accounts/AccountsQt6Config.cmake.in
++++ b/Accounts/AccountsQt6Config.cmake.in
+@@ -1,5 +1,25 @@
+ #  ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
+ #  ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
+ 
+-set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
+-set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
+\ No newline at end of file
++# Compute the installation prefix relative to this file.
++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
++# Use original install prefix when loaded through a
++# cross-prefix symbolic link such as /lib -> /usr/lib.
++get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH)
++get_filename_component(_realOrig "/usr/lib/cmake/AccountsQt6" REALPATH)
++if(_realCurr STREQUAL _realOrig)
++  set(_IMPORT_PREFIX "/usr/lib/cmake/AccountsQt6")
++endif()
++unset(_realOrig)
++unset(_realCurr)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++if(_IMPORT_PREFIX STREQUAL "/")
++  set(_IMPORT_PREFIX "")
++endif()
++
++set(ACCOUNTSQT_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
++set(ACCOUNTSQT_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
++set(ACCOUNTSQT6_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
++set(ACCOUNTSQT6_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
diff --git a/srcpkgs/libaccounts-qt/template b/srcpkgs/libaccounts-qt/template
new file mode 100644
index 00000000000000..c291b9f7514080
--- /dev/null
+++ b/srcpkgs/libaccounts-qt/template
@@ -0,0 +1,78 @@
+# Template file for 'libaccounts-qt'
+pkgname=libaccounts-qt
+version=1.17
+revision=1
+build_style=qmake
+configure_args="LIBDIR=/usr/lib .."
+hostmakedepends="pkg-config doxygen qt5-qmake qt5-host-tools
+ qt6-base"
+makedepends="libaccounts-glib-devel qt5-devel qt6-base-devel"
+short_desc="Client library to the accounts database"
+maintainer="John Rowley <enterthevoid@codesector.co>"
+license="LGPL-2.1-only"
+homepage="https://gitlab.com/accounts-sso/libaccounts-qt"
+distfiles="${homepage}/-/archive/VERSION_${version}/libaccounts-qt-VERSION_${version}.tar.gz"
+checksum=6ed3e976133962c1c88f6c66928ba0d0a17a570843577d31e783dc891659e5d8
+
+post_extract() {
+	mkdir -p build-qt5 build-qt6
+}
+
+pre_configure() {
+	build_wrksrc=build-qt5
+}
+
+post_configure() {
+	build_wrksrc="build-qt6"
+	QT=qt6
+	do_configure
+}
+
+do_build() {
+	make -C build-qt5 ${make_jobs}
+	make -C build-qt6 ${make_jobs}
+}
+
+do_install() {
+	make -C build-qt5 install DESTDIR=${DESTDIR} PREFIX=/usr \
+		INSTALL_ROOT=${DESTDIR} STRIP=true
+	make -C build-qt6 install DESTDIR=${DESTDIR} PREFIX=/usr \
+		INSTALL_ROOT=${DESTDIR} STRIP=true
+}
+
+libaccounts-qt5_package() {
+	short_desc+=" - Qt5"
+	pkg_install() {
+		vmove "usr/lib/libaccounts-qt5.so.*"
+	}
+}
+
+libaccounts-qt6_package() {
+	short_desc+=" - Qt6"
+	pkg_install() {
+		vmove "usr/lib/libaccounts-qt6.so.*"
+	}
+}
+
+libaccounts-qt5-devel_package() {
+	short_desc+=" - Qt5 - development files"
+	depends="qt5-devel libaccounts-qt5>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include/accounts-qt5
+		vmove usr/lib/libaccounts-qt5.so
+		vmove usr/lib/cmake/AccountsQt5
+		vmove usr/lib/pkgconfig/accounts-qt5.pc
+	}
+}
+
+libaccounts-qt6-devel_package() {
+	short_desc+=" - Qt6 - development files"
+	depends="qt6-base-devel libaccounts-qt6>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include/accounts-qt6
+		vmove usr/lib/libaccounts-qt6.so
+		vmove usr/lib/cmake/AccountsQt6
+		vmove usr/lib/pkgconfig/accounts-qt6.pc
+		vmove usr/share/doc
+	}
+}
diff --git a/srcpkgs/libaccounts-qt5/update b/srcpkgs/libaccounts-qt/update
similarity index 100%
rename from srcpkgs/libaccounts-qt5/update
rename to srcpkgs/libaccounts-qt/update
diff --git a/srcpkgs/libaccounts-qt5 b/srcpkgs/libaccounts-qt5
new file mode 120000
index 00000000000000..b490868d44e4b5
--- /dev/null
+++ b/srcpkgs/libaccounts-qt5
@@ -0,0 +1 @@
+libaccounts-qt
\ No newline at end of file
diff --git a/srcpkgs/libaccounts-qt5-devel b/srcpkgs/libaccounts-qt5-devel
index d3f04ed4865af9..b490868d44e4b5 120000
--- a/srcpkgs/libaccounts-qt5-devel
+++ b/srcpkgs/libaccounts-qt5-devel
@@ -1 +1 @@
-libaccounts-qt5
\ No newline at end of file
+libaccounts-qt
\ No newline at end of file
diff --git a/srcpkgs/libaccounts-qt5/patches/cross.patch b/srcpkgs/libaccounts-qt5/patches/cross.patch
deleted file mode 100644
index c3265b7db9be41..00000000000000
--- a/srcpkgs/libaccounts-qt5/patches/cross.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/Accounts/AccountsQt5Config.cmake.in	2019-09-18 21:00:34.000000000 +0200
-+++ b/Accounts/AccountsQt5Config.cmake.in	2019-09-18 21:00:34.000000000 +0200
-@@ -1,5 +1,20 @@
- #  ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
- #  ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
-+ 
-+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
-+if(_realCurr STREQUAL _realOrig)
-+  set(_IMPORT_PREFIX "/usr/lib/cmake/AccountsQt5")
-+endif()
-+unset(_realOrig)
-+unset(_realCurr)
-+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-+if(_IMPORT_PREFIX STREQUAL "/")
-+  set(_IMPORT_PREFIX "")
-+endif()
-+ 
-+set(ACCOUNTSQT_LIBRARIES ${_IMPORT_PREFIX}/lib/lib$${TARGET}.so)
-+set(ACCOUNTSQT_INCLUDE_DIRS ${_IMPORT_PREFIX}/include/$${TARGET}/)
- 
--set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
--set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
-\ No newline at end of file
-+set(_IMPORT_PREFIX)
diff --git a/srcpkgs/libaccounts-qt5/template b/srcpkgs/libaccounts-qt5/template
deleted file mode 100644
index f7da82daa10eef..00000000000000
--- a/srcpkgs/libaccounts-qt5/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'libaccounts-qt5'
-pkgname=libaccounts-qt5
-version=1.16
-revision=2
-build_style=qmake
-configure_args="LIBDIR=/usr/lib"
-hostmakedepends="pkg-config doxygen qt5-qmake qt5-host-tools"
-makedepends="libaccounts-glib-devel qt5-devel"
-short_desc="Client library to the accounts database, with a Qt5-based API"
-maintainer="John Rowley <enterthevoid@codesector.co>"
-license="LGPL-2.1-only"
-homepage="https://gitlab.com/accounts-sso/libaccounts-qt"
-distfiles="${homepage}/-/archive/VERSION_${version}/libaccounts-qt-VERSION_${version}.tar.gz"
-checksum=3e527b151ee87e851b0f027214bda1353d8e48e10a5b54109f1e4b7d422a7de3
-
-libaccounts-qt5-devel_package() {
-	short_desc+=" - development files"
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc/accounts-qt
-		vmove usr/lib/cmake
-	}
-}
diff --git a/srcpkgs/libaccounts-qt6 b/srcpkgs/libaccounts-qt6
new file mode 120000
index 00000000000000..b490868d44e4b5
--- /dev/null
+++ b/srcpkgs/libaccounts-qt6
@@ -0,0 +1 @@
+libaccounts-qt
\ No newline at end of file
diff --git a/srcpkgs/libaccounts-qt6-devel b/srcpkgs/libaccounts-qt6-devel
new file mode 120000
index 00000000000000..b490868d44e4b5
--- /dev/null
+++ b/srcpkgs/libaccounts-qt6-devel
@@ -0,0 +1 @@
+libaccounts-qt
\ No newline at end of file

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Merged]: libaccounts-qt6
  2024-04-07  9:04 [PR PATCH] libaccounts-qt6 sgn
                   ` (3 preceding siblings ...)
  2024-04-07 12:36 ` sgn
@ 2024-04-08  9:45 ` sgn
  4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2024-04-08  9:45 UTC (permalink / raw)
  To: ml

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

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

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

Description:
<!-- 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] 6+ messages in thread

end of thread, other threads:[~2024-04-08  9:45 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-07  9:04 [PR PATCH] libaccounts-qt6 sgn
2024-04-07  9:06 ` [PR PATCH] [Updated] libaccounts-qt6 sgn
2024-04-07 12:22 ` sgn
2024-04-07 12:35 ` sgn
2024-04-07 12:36 ` sgn
2024-04-08  9:45 ` [PR PATCH] [Merged]: libaccounts-qt6 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).