From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/
Date: Wed, 01 Jan 2025 19:17:05 +0000 (UTC) [thread overview]
Message-ID: <1735759014.851c96ce14baa853f681d424612c0ca1332fe5b2.asturm@gentoo> (raw)
commit: 851c96ce14baa853f681d424612c0ca1332fe5b2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 1 19:03:49 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 1 19:16:54 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=851c96ce
dev-db/sqlitebrowser: Re-add missing dev-qt/qtconcurrent:5 DEPEND
Add missing include patch as well, just upstreamed.
Closes: https://bugs.gentoo.org/945694
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../sqlitebrowser-3.13.1-missing-include.patch | 25 ++++++++++++++++++++++
dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild | 20 +++++++----------
dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild | 20 ++++++-----------
3 files changed, 40 insertions(+), 25 deletions(-)
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.13.1-missing-include.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.13.1-missing-include.patch
new file mode 100644
index 000000000000..a0b2dfb284e4
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.13.1-missing-include.patch
@@ -0,0 +1,25 @@
+From 8f68c57177a9b120fe7d1f7b2b4f9b317d85f7e5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 30 Dec 2024 21:59:36 +0100
+Subject: [PATCH] Add missing QActionGroup include
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/MainWindow.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index 4b1d4aa5..89546255 100644
+--- a/src/MainWindow.cpp
++++ b/src/MainWindow.cpp
+@@ -53,6 +53,7 @@
+ #include <QTemporaryFile>
+ #include <QToolButton>
+ #include <QUrl>
++#include <QActionGroup>
+
+ #ifdef Q_OS_MACX //Needed only on macOS
+ #include <QOpenGLWidget>
+--
+2.47.1
+
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild
index 2570150a6735..f8729348579f 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,7 +21,7 @@ SLOT="0"
IUSE="sqlcipher test"
RESTRICT="!test? ( test )"
-DEPEND="
+RDEPEND="
app-editors/qhexedit2
dev-db/sqlite:3
dev-libs/qcustomplot
@@ -34,20 +34,17 @@ DEPEND="
>=x11-libs/qscintilla-2.8.10:=[qt5(+)]
sqlcipher? ( dev-db/sqlcipher )
"
-
+DEPEND="${RDEPEND}
+ >=dev-qt/qtconcurrent-5.15.9:5
+"
BDEPEND="
>=dev-qt/linguist-tools-5.15.9:5
test? ( >=dev-qt/qttest-5.15.9:5 )
"
-RDEPEND="${DEPEND}"
+DOCS=( images/ {BUILDING,CHANGELOG,README}.md )
-DOCS=(
- images/
- BUILDING.md
- CHANGELOG.md
- README.md
-)
+PATCHES=( "${FILESDIR}/${P}-missing-include.patch" )
src_prepare() {
cmake_src_prepare
@@ -77,7 +74,6 @@ src_configure() {
}
src_install() {
+ [[ ${PV} == *9999* ]] && DOCS+=( SECURITY.md )
cmake_src_install
-
- [[ "${PV}" = 9999 ]] && dodoc SECURITY.md
}
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild
index 2570150a6735..a423fd763348 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,7 +21,7 @@ SLOT="0"
IUSE="sqlcipher test"
RESTRICT="!test? ( test )"
-DEPEND="
+RDEPEND="
app-editors/qhexedit2
dev-db/sqlite:3
dev-libs/qcustomplot
@@ -34,20 +34,15 @@ DEPEND="
>=x11-libs/qscintilla-2.8.10:=[qt5(+)]
sqlcipher? ( dev-db/sqlcipher )
"
-
+DEPEND="${RDEPEND}
+ >=dev-qt/qtconcurrent-5.15.9:5
+"
BDEPEND="
>=dev-qt/linguist-tools-5.15.9:5
test? ( >=dev-qt/qttest-5.15.9:5 )
"
-RDEPEND="${DEPEND}"
-
-DOCS=(
- images/
- BUILDING.md
- CHANGELOG.md
- README.md
-)
+DOCS=( images/ {BUILDING,CHANGELOG,README}.md )
src_prepare() {
cmake_src_prepare
@@ -77,7 +72,6 @@ src_configure() {
}
src_install() {
+ [[ ${PV} == *9999* ]] && DOCS+=( SECURITY.md )
cmake_src_install
-
- [[ "${PV}" = 9999 ]] && dodoc SECURITY.md
}
next reply other threads:[~2025-01-01 19:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-01 19:17 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-06-28 3:05 [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/ Sam James
2024-10-07 3:27 Eli Schwartz
2024-05-28 1:59 Sam James
2019-03-20 15:31 Rick Farina
2019-01-27 11:05 Pacho Ramos
2017-12-11 9:05 Michael Weber
2016-11-15 22:29 David Seifert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1735759014.851c96ce14baa853f681d424612c0ca1332fe5b2.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox