From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/
Date: Sat, 28 Jun 2025 03:05:17 +0000 (UTC) [thread overview]
Message-ID: <1751079373.1544277caa672bae727a5dea188b4234b4f9381c.sam@gentoo> (raw)
commit: 1544277caa672bae727a5dea188b4234b4f9381c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 28 02:56:13 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 28 02:56:13 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1544277c
dev-db/sqlitebrowser: fix build w/ qt-6.9
Closes: https://bugs.gentoo.org/957676
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../sqlitebrowser-3.13.1_p20250502-qt-6.9.patch | 35 ++++++++++++++++++++++
.../sqlitebrowser-3.13.1_p20250502-r1.ebuild | 5 +++-
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.13.1_p20250502-qt-6.9.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.13.1_p20250502-qt-6.9.patch
new file mode 100644
index 000000000000..4b5a32015027
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.13.1_p20250502-qt-6.9.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/957676
+https://github.com/sqlitebrowser/sqlitebrowser/pull/3948
+
+From 94b2f23517e59fdd8dd222989f704bef2c9460a2 Mon Sep 17 00:00:00 2001
+From: Patrick Ziegler <zipat@proton.me>
+Date: Wed, 4 Jun 2025 15:42:29 +0200
+Subject: [PATCH] Fix enum class value conversion for storing last locations
+
+See issue #3949.
+---
+ src/FileDialog.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/FileDialog.cpp b/src/FileDialog.cpp
+index a3b611747..df4271b68 100644
+--- a/src/FileDialog.cpp
++++ b/src/FileDialog.cpp
+@@ -48,7 +48,7 @@ QString FileDialog::getFileDialogPath(const FileDialogTypes dialogType)
+ case 2: { // Remember last location for current session only
+ QHash<QString, QVariant> lastLocations = Settings::getValue("db", "lastlocations").toHash();
+
+- return lastLocations[QString(QChar(dialogType))].toString();
++ return lastLocations[QString::number(static_cast<int>(dialogType))].toString();
+ }
+ case 1: // Always use this locations
+ return Settings::getValue("db", "defaultlocation").toString();
+@@ -62,7 +62,7 @@ void FileDialog::setFileDialogPath(const FileDialogTypes dialogType, const QStri
+ QString dir = QFileInfo(new_path).absolutePath();
+ QHash<QString, QVariant> lastLocations = Settings::getValue("db", "lastlocations").toHash();
+
+- lastLocations[QString(QChar(dialogType))] = dir;
++ lastLocations[QString::number(static_cast<int>(dialogType))] = dir;
+
+ switch(Settings::getValue("db", "savedefaultlocation").toInt())
+ {
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.13.1_p20250502-r1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.13.1_p20250502-r1.ebuild
index afd3734523b8..8d5d57a26253 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.13.1_p20250502-r1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.13.1_p20250502-r1.ebuild
@@ -39,7 +39,10 @@ BDEPEND="dev-qt/qttools:6[linguist]"
DOCS=( images/ {BUILDING,CHANGELOG,README}.md )
-PATCHES=( "${FILESDIR}/${P}-no-git.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-no-git.patch"
+ "${FILESDIR}/${P}-qt-6.9.patch"
+)
src_configure() {
local mycmakeargs=(
next reply other threads:[~2025-06-28 3:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-28 3:05 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-01 19:17 [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/ Andreas Sturmlechner
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=1751079373.1544277caa672bae727a5dea188b4234b4f9381c.sam@gentoo \
--to=sam@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