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

2 files changed, 30 insertions, 14 deletions

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)
-