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
