public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/
Date: Mon, 27 Jan 2025 23:22:35 +0000 (UTC)	[thread overview]
Message-ID: <1738020023.060710c3d83bb8cae96cf22e622f049902caa5ee.asturm@gentoo> (raw)

commit:     060710c3d83bb8cae96cf22e622f049902caa5ee
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 21:03:12 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 23:20:23 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=060710c3

dev-db/sqlitebrowser: Port to Qt6

Bug: https://bugs.gentoo.org/948063
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild | 38 +++++++-------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild
index a423fd763348..9ff0f452d75b 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild
@@ -5,10 +5,10 @@ EAPI=8
 
 inherit cmake flag-o-matic xdg
 
-DESCRIPTION="A light GUI editor for SQLite databases"
+DESCRIPTION="Light GUI editor for SQLite databases"
 HOMEPAGE="https://sqlitebrowser.org/"
 
-if [[ "${PV}" = 9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/sqlitebrowser/sqlitebrowser.git"
 else
@@ -22,46 +22,28 @@ IUSE="sqlcipher test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	app-editors/qhexedit2
+	>=app-editors/qhexedit2-0.8.10
 	dev-db/sqlite:3
-	dev-libs/qcustomplot
-	>=dev-qt/qtcore-5.15.9:5
-	>=dev-qt/qtgui-5.15.9:5
-	>=dev-qt/qtnetwork-5.15.9:5[ssl]
-	>=dev-qt/qtprintsupport-5.15.9:5
-	>=dev-qt/qtwidgets-5.15.9:5
-	>=dev-qt/qtxml-5.15.9:5
-	>=x11-libs/qscintilla-2.8.10:=[qt5(+)]
+	>=dev-libs/qcustomplot-2.1.1-r10
+	dev-qt/qtbase:6[gui,network,ssl,widgets,xml]
+	>=x11-libs/qscintilla-2.14.1-r1:=[qt6(+)]
 	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 )
+	dev-qt/qtbase:6[concurrent]
 "
+BDEPEND="dev-qt/qttools:6[linguist]"
 
 DOCS=( images/ {BUILDING,CHANGELOG,README}.md )
 
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use test; then
-		sed -i CMakeLists.txt \
-			-e "/find_package/ s/ Test//" \
-			-e "/set/ s/ Qt5::Test//" \
-			|| die "Cannot remove Qt Test from CMake dependencies"
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_TESTING=$(usex test)
+		-DQT_MAJOR=Qt6
 		-DFORCE_INTERNAL_QSCINTILLA=OFF
 		-DFORCE_INTERNAL_QCUSTOMPLOT=OFF
 		-DFORCE_INTERNAL_QHEXEDIT=OFF
 		-Dsqlcipher=$(usex sqlcipher)
+		-DENABLE_TESTING=$(usex test)
 	)
 
 	# https://bugs.gentoo.org/855254


             reply	other threads:[~2025-01-27 23:22 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-27 23:22 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-03  7:53 [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/ Andreas Sturmlechner
2025-05-03  7:53 Andreas Sturmlechner
2025-01-23 20:32 Andreas Sturmlechner
2025-01-08 17:03 Andreas Sturmlechner
2025-01-06  1:37 Sam James
2025-01-06  1:37 Sam James
2024-12-01 12:04 Sam James
2024-09-04 20:30 Jakov Smolić
2024-09-04 20:30 Jakov Smolić
2024-08-04  7:03 Joonas Niilola
2024-04-16 16:30 Jimi Huotari
2024-03-07 10:54 Andreas Sturmlechner
2024-03-02 18:23 Arthur Zamarin
2024-03-02 18:23 Arthur Zamarin
2024-01-20 12:23 Sam James
2022-12-20 21:07 Andreas Sturmlechner
2021-07-15 21:39 Sam James
2021-07-15 21:33 Sam James
2021-06-17  6:49 Joonas Niilola
2021-02-17 11:36 Joonas Niilola
2019-10-17  4:52 Joonas Niilola
2019-03-25 17:41 Rick Farina
2019-02-28 17:37 Rick Farina
2019-02-14 23:06 Andreas Sturmlechner
2019-02-14 23:06 Andreas Sturmlechner
2018-04-11 20:43 Thomas Deutschmann
2018-04-06 15:58 Aaron Bauman
2017-12-11  9:11 Michael Weber
2017-09-23  2:27 Michael Palimaka
2017-06-04 22:52 Michael Weber
2017-06-01  7:41 Agostino Sarubbo
2016-12-22 18:26 David Seifert
2016-11-15 22:29 David Seifert
2016-11-15 22:29 David Seifert
2016-03-15 11:26 Agostino Sarubbo
2016-01-10 18:41 Michael Weber
2015-12-06 21:50 James Le Cuirot
2015-12-06 21:50 James Le Cuirot
2015-10-01 14:21 Michael Palimaka

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=1738020023.060710c3d83bb8cae96cf22e622f049902caa5ee.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