public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-libs/accounts-qml/files/, net-libs/accounts-qml/
@ 2022-09-14 21:10 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-09-14 21:10 UTC (permalink / raw
  To: gentoo-commits

commit:     18bf489a4d20212b9d840a5cd884e4c5739adffa
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 20:56:55 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 21:10:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18bf489a

net-libs/accounts-qml: Drop no-tests.patch from FILESDIR, use tarball

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild           |  5 +++--
 .../accounts-qml/files/accounts-qml-0.7-no-tests.patch     | 14 --------------
 2 files changed, 3 insertions(+), 16 deletions(-)

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


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

* [gentoo-commits] repo/gentoo:master commit in: net-libs/accounts-qml/files/, net-libs/accounts-qml/
@ 2022-09-14 21:45 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-09-14 21:45 UTC (permalink / raw
  To: gentoo-commits

commit:     28cfd86d9f4fe2f05f70c7b217d0c5f7652b45b6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 21:44:00 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 21:44:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28cfd86d

net-libs/accounts-qml: Fix build with GCC-12

Thanks-to: Sam James <sam <AT> gentoo.org>
Closes: https://bugs.gentoo.org/870157
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild   |  5 +++-
 .../files/accounts-qml-0.7-gcc12.patch             | 30 ++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild b/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild
index 1510ade09dbc..2555f92d251b 100644
--- a/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild
+++ b/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild
@@ -40,7 +40,10 @@ BDEPEND="
 
 DOCS=( README.md )
 
-PATCHES=( "${WORKDIR}/${P}-patches-1" ) # bug 849773
+PATCHES=(
+	"${WORKDIR}/${P}-patches-1" # bug 849773
+	"${FILESDIR}/${P}-gcc12.patch" # bug 870157, pending upstream
+)
 
 src_prepare() {
 	default

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
+


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

* [gentoo-commits] repo/gentoo:master commit in: net-libs/accounts-qml/files/, net-libs/accounts-qml/
@ 2024-06-29 16:34 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2024-06-29 16:34 UTC (permalink / raw
  To: gentoo-commits

commit:     1ea7870beb8529be5e409148d0ebee4914ceee5f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 28 20:37:37 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 16:33:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ea7870b

net-libs/accounts-qml: drop 0.7-r2

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-libs/accounts-qml/Manifest                     |  2 -
 net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild   | 71 ----------------------
 .../files/accounts-qml-0.7-gcc12.patch             | 30 ---------
 3 files changed, 103 deletions(-)

diff --git a/net-libs/accounts-qml/Manifest b/net-libs/accounts-qml/Manifest
index 89f2b085af73..b39449f80e23 100644
--- a/net-libs/accounts-qml/Manifest
+++ b/net-libs/accounts-qml/Manifest
@@ -1,3 +1 @@
-DIST accounts-qml-0.7-patches-1.tar.xz 3416 BLAKE2B bbaef28c3d455d4aa458790a875a321870c90e88ba3e6735790b3ea50d89c6ac4ac3ef3320239fb4a120681690af4144ea616638ebe21e51e898e178a94eb5cb SHA512 3f3f4996311fe76c9a438dc2794394879b655373146baa38be13c54a93f0016035d371ae7152df02b56b25f7898ab7d0752de636202e88acae1ee536f2809ad6
 DIST accounts-qml-0.7_p20231028.tar.bz2 50521 BLAKE2B 6704557e50b40d0be6e706c05ce888f959fd2028c7fa9aea9d3f2064828b6869bee454cd88189e70abe483b0809ec857634b0b8fa5f989fca05ae7af55efb80a SHA512 0d366b526873bdeecb9a5582992b8d659777beff3b5449745141a3c8156e130714acd81343440a2edcff7ed7bfeed2ce1afdb89188c8be2a2737491278b44253
-DIST accounts-qml-module-VERSION_0.7.tar.gz 62029 BLAKE2B 0924b73868135ad5d9ec7545d5b0ba84f140053f0be4d17f1c6d3754ec19e362af906af60fb45e6405b5d080dd8f63845070815b12e8bfeda30032c9ed172708 SHA512 4e0e5df64d0a477e11f412c0def85d0de1730efff9682790f5339a57d58778282aa8ca0fa201e409b3b9a2a75fea70f10555b1f70224a3b95ab8d44b942cf7e1

diff --git a/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild b/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild
deleted file mode 100644
index d1a1aa9bc909..000000000000
--- a/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 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-text/doxygen
-		dev-qt/qdoc:5
-		dev-qt/qthelp: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
deleted file mode 100644
index abe820f2383d..000000000000
--- a/net-libs/accounts-qml/files/accounts-qml-0.7-gcc12.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
-


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

end of thread, other threads:[~2024-06-29 16:34 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-14 21:45 [gentoo-commits] repo/gentoo:master commit in: net-libs/accounts-qml/files/, net-libs/accounts-qml/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2024-06-29 16:34 Andreas Sturmlechner
2022-09-14 21:10 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox