gentoo auto-resync : 15:09:2022 - 05:12:09

5 files changed, 107 insertions, 18 deletions

diff --git a/net-libs/accounts-qml/Manifest b/net-libs/accounts-qml/Manifest
index 168da047ba21..69c66d804455 100644
--- a/net-libs/accounts-qml/Manifest
+++ b/net-libs/accounts-qml/Manifest
@@ -1,4 +1,6 @@
-AUX accounts-qml-0.7-no-tests.patch 307 BLAKE2B 2faefed0d6de1d0f271aece811b5fa064bf67017a8964ad4cd83d2b618e30cce6fabc0272ba3fa5949da1229255602a4b86191dd9e27a91c9f95fd20cffb26e1 SHA512 d0b199098bd7993178084b795138fc87282015525d11e14913056fbaa1b0954fd37d2ad6bb56855513d900fa0ea7a4a4beb31de6bdd4338785bcba9eb1df2eba
+AUX accounts-qml-0.7-gcc12.patch 819 BLAKE2B b53cdf8fd455f84c8cc053e10c3082f683f6cd30d5e133695ae44f8afd2b749bc47d9e5ea9f7deb4f894e21ca683bfe75d9928b4a28fc5e0e7ec3c715b16551a SHA512 5c714ba915bf7f0181df491b8a56e3692896d3145b6b869cd6128f4d712ce821c208d8992e75d9cc18841bfa19e2fb9da60a03e4a1b6d2dfb3bc6531b28dae73
+DIST accounts-qml-0.7-patches-1.tar.xz 3416 BLAKE2B bbaef28c3d455d4aa458790a875a321870c90e88ba3e6735790b3ea50d89c6ac4ac3ef3320239fb4a120681690af4144ea616638ebe21e51e898e178a94eb5cb SHA512 3f3f4996311fe76c9a438dc2794394879b655373146baa38be13c54a93f0016035d371ae7152df02b56b25f7898ab7d0752de636202e88acae1ee536f2809ad6
 DIST accounts-qml-module-VERSION_0.7.tar.gz 62029 BLAKE2B 0924b73868135ad5d9ec7545d5b0ba84f140053f0be4d17f1c6d3754ec19e362af906af60fb45e6405b5d080dd8f63845070815b12e8bfeda30032c9ed172708 SHA512 4e0e5df64d0a477e11f412c0def85d0de1730efff9682790f5339a57d58778282aa8ca0fa201e409b3b9a2a75fea70f10555b1f70224a3b95ab8d44b942cf7e1
-EBUILD accounts-qml-0.7-r1.ebuild 971 BLAKE2B 25c8e54d5a5bdf0d24ffd4fbd2663bef48d57e1d5bc44f3834aa9de5eca7e86bb49f838dc6ced1278ea8707513564fa32d4d1a41e12467d849481a0c7395953f SHA512 65adb21f20fe7f72e6985f8d5ce57fa913591c23b6a13fa225b47b72ea9093126af556c3cce29ac305de6b9a7fd4fe6ddbe902cc7f7291c5f59ee4fc863f6301
+EBUILD accounts-qml-0.7-r1.ebuild 1049 BLAKE2B 8fae52112fb577853524b79790a4bfd1225399ba2469a9a711e483280c3cc7dab89f6055d386070f04a0bf6ac508005b12dce0fa3c8bc0ccf20907fde98d46f6 SHA512 69d71aba53cda35fbf261f8677945edfc3ca80dd5dcd03a4ad8b9c6e6211781071b0605d093582033d6283a419258d0f53e9428c0d4ba298f1aebdecee835f0b
+EBUILD accounts-qml-0.7-r2.ebuild 1328 BLAKE2B 804d603c5fdcba79f7b63871c07b10ddf7b2d0ef58e1a8bbc882a046a38e9fea8095c8ef61759e5ed4e23c3540373df4a64dfcfeeb4e384a3d505ac891b53955 SHA512 78cd170252199f1369fc90364e48d9c20faeb798ab3fc31ddde900425879767ade7a40a354484f0ad6fa2c608f4f8103d230b5fe49a8cbd38bdded55ce3d1de8
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild b/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
index 2e93ec2c43fd..69d8dd7a258a 100644
--- a/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
+++ b/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
@@ -7,7 +7,8 @@ inherit qmake-utils
 
 DESCRIPTION="QML bindings for accounts-qt and signond"
 HOMEPAGE="https://accounts-sso.gitlab.io/"
-SRC_URI="https://gitlab.com/accounts-sso/${PN}-module/-/archive/VERSION_${PV}/${PN}-module-VERSION_${PV}.tar.gz"
+SRC_URI="https://gitlab.com/accounts-sso/${PN}-module/-/archive/VERSION_${PV}/${PN}-module-VERSION_${PV}.tar.gz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-patches-1.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -33,7 +34,7 @@ DEPEND="${RDEPEND}
 # dbus problems
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${P}-no-tests.patch" )
+PATCHES=( "${WORKDIR}/${P}-patches-1/${P}-no-tests.patch" )
 
 S="${WORKDIR}/${PN}-module-VERSION_${PV}"
 
diff --git a/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild b/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild
new file mode 100644
index 000000000000..2555f92d251b
--- /dev/null
+++ b/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+DESCRIPTION="QML bindings for accounts-qt and signond"
+HOMEPAGE="https://accounts-sso.gitlab.io/"
+SRC_URI="https://gitlab.com/accounts-sso/${PN}-module/-/archive/VERSION_${PV}/${PN}-module-VERSION_${PV}.tar.gz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-patches-1.tar.xz"
+S="${WORKDIR}/${PN}-module-VERSION_${PV}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="doc test"
+
+# dbus problems
+RESTRICT="test"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	net-libs/accounts-qt
+	net-libs/signond
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-qt/qtgui:5
+		dev-qt/qttest:5
+	)
+"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-qt/qdoc:5
+	)
+"
+
+DOCS=( README.md )
+
+PATCHES=(
+	"${WORKDIR}/${P}-patches-1" # bug 849773
+	"${FILESDIR}/${P}-gcc12.patch" # bug 870157, pending upstream
+)
+
+src_prepare() {
+	default
+	rm -v .gitignore doc/html/.gitignore || die
+}
+
+src_configure() {
+	eqmake5 \
+		CONFIG+=no_docs \
+		PREFIX="${EPREFIX}"/usr
+}
+
+src_compile() {
+	default
+	if use doc; then
+		$(qt5_get_bindir)/qdoc doc/accounts-qml-module.qdocconf || die
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install_subtargets
+	use doc && local HTML_DOCS=( doc/html )
+	einstalldocs
+}
diff --git a/net-libs/accounts-qml/files/accounts-qml-0.7-gcc12.patch b/net-libs/accounts-qml/files/accounts-qml-0.7-gcc12.patch
new file mode 100644
index 000000000000..abe820f2383d
--- /dev/null
+++ b/net-libs/accounts-qml/files/accounts-qml-0.7-gcc12.patch
@@ -0,0 +1,30 @@
+From 6bfa9d24363e28971839d86925d9de3d7aef512c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 14 Sep 2022 22:40:30 +0100
+Subject: [PATCH] Fix build failure with GCC 12 (missing <algorithms> include)
+
+Needed for std::sort.
+
+Bug: https://bugs.gentoo.org/870157
+Fixes: 69e17dec5add40655cd9334ec7ad4eef13fed8a4
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ src/account-service-model.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/account-service-model.cpp b/src/account-service-model.cpp
+index deb157e..20a445c 100644
+--- a/src/account-service-model.cpp
++++ b/src/account-service-model.cpp
+@@ -20,6 +20,8 @@
+ #include "debug.h"
+ #include "manager.h"
+ 
++#include <algorithm>
++
+ #include <Accounts/Account>
+ #include <Accounts/AccountService>
+ #include <Accounts/Application>
+-- 
+GitLab
+
diff --git a/net-libs/accounts-qml/files/accounts-qml-0.7-no-tests.patch b/net-libs/accounts-qml/files/accounts-qml-0.7-no-tests.patch
deleted file mode 100644
index cfe8dec082bb..000000000000
--- a/net-libs/accounts-qml/files/accounts-qml-0.7-no-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/accounts-qml-module.pro	2016-06-08 09:26:26.000000000 +0200
-+++ b/accounts-qml-module.pro	2019-12-08 14:16:24.058806381 +0100
-@@ -5,8 +5,9 @@
- TEMPLATE = subdirs
- CONFIG += ordered
- SUBDIRS = \
--    src \
--    tests
-+    src
-+
-+CONFIG(tests): SUBDIRS += tests
- 
- include(common-installs-config.pri)
-