dev-db/sqlitebrowser: add Qt6-based 3.13.1_p20250502

- 3.13.1 is from October '24 and unfit to use as Qt6 version
- gets rid of painful upper version limit on qhexedit, qcustomplot
- unblocks Qt5-based cleanup of the above +x11-libs/qscintilla[qt5]

Bug: https://bugs.gentoo.org/948063
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner 2025-05-02 20:12:52 +02:00
parent f5fc7787f2
commit 1cf79d3494
No known key found for this signature in database
GPG Key ID: AE591BBC73E4DD5E
3 changed files with 106 additions and 0 deletions

View File

@ -1 +1,2 @@
DIST sqlitebrowser-3.13.1.tar.gz 4923092 BLAKE2B 894790cc30b802b4aab19a8e7834aef1bf68b027bcd66b63901269d6d44b706ce5ddca1ae4ca4743d14f9a8d2a5cc6005711b6ee25cef068c55e0b01c56f8b5c SHA512 7482094823293a216e4df20105d1351a23fcc706fd9e64bca58cd1c6a46dcf639a945f919613f1a9550d0a15e60a4c2827ee5eee4f89a7b11046d8eefbf375ee
DIST sqlitebrowser-3.13.1_p20250502-03be1c69.tar.gz 5005637 BLAKE2B db597b2c3fee47bd4dae7de8bf9a8542baa04d83b81bc8132ad583b969a3f9ade13288d6f93ce95c2b6ca78db77c3854fa183abcda20a2cd16b1faafa166d6f6 SHA512 dd91e81ce66735389b4a5d61923108e82a30a17f91a1acd27c35eb85401a850ba57f31c37109e92c18d3b54623f66956ccc4f3531c4c425caf7b4019cd768fa4

View File

@ -0,0 +1,41 @@
From 922026f58bebe01f58d23f0b3369447fc0e17042 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Fri, 2 May 2025 20:23:16 +0200
Subject: [PATCH] Do not run git if GIT_COMMIT_HASH is already set
Useful for cutting snapshots.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
CMakeLists.txt | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e7610c3..869b3811 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,13 +37,14 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
MACOSX_BUNDLE ON
)
-execute_process(
- COMMAND git -C ${CMAKE_CURRENT_SOURCE_DIR} rev-parse --short --verify HEAD
- OUTPUT_VARIABLE GIT_COMMIT_HASH
- OUTPUT_STRIP_TRAILING_WHITESPACE
- ERROR_QUIET
-)
-
+if (NOT GIT_COMMIT_HASH)
+ execute_process(
+ COMMAND git -C ${CMAKE_CURRENT_SOURCE_DIR} rev-parse --short --verify HEAD
+ OUTPUT_VARIABLE GIT_COMMIT_HASH
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ ERROR_QUIET
+ )
+endif()
if (GIT_COMMIT_HASH STREQUAL "")
MESSAGE(WARNING "Could not determine git commit hash")
set(GIT_COMMIT_HASH "Unknown")
--
2.49.0

View File

@ -0,0 +1,64 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
COMMIT=03be1c69c40c74f08e880e754ce30d7af647c020
inherit cmake flag-o-matic xdg
DESCRIPTION="Light GUI editor for SQLite databases"
HOMEPAGE="https://sqlitebrowser.org/"
if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/sqlitebrowser/sqlitebrowser.git"
else
SRC_URI="https://github.com/sqlitebrowser/sqlitebrowser/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT:0:8}.tar.gz"
S="${WORKDIR}/${PN}-${COMMIT}"
KEYWORDS="~amd64 ~x86"
fi
LICENSE="GPL-3+ MPL-2.0"
SLOT="0"
IUSE="sqlcipher test"
RESTRICT="!test? ( test )"
RDEPEND="
>=app-editors/qhexedit2-0.8.10
dev-db/sqlite:3
>=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/qtbase:6[concurrent]
"
BDEPEND="dev-qt/qttools:6[linguist]"
DOCS=( images/ {BUILDING,CHANGELOG,README}.md )
PATCHES=( "${FILESDIR}/${P}-no-git.patch" )
src_configure() {
local mycmakeargs=(
-DQT_MAJOR=Qt6
-DFORCE_INTERNAL_QSCINTILLA=OFF
-DFORCE_INTERNAL_QCUSTOMPLOT=OFF
-DFORCE_INTERNAL_QHEXEDIT=OFF
-Dsqlcipher=$(usex sqlcipher)
-DENABLE_TESTING=$(usex test)
)
[[ -n ${COMMIT} ]] && mycmakeargs+=( -DGIT_COMMIT_HASH=${COMMIT:0:8} )
# https://bugs.gentoo.org/855254
append-flags -fno-strict-aliasing
filter-lto
cmake_src_configure
}
src_install() {
[[ ${PV} == *9999* ]] && DOCS+=( SECURITY.md )
cmake_src_install
}