diff options
Diffstat (limited to 'dev-db/sqlitestudio')
| -rw-r--r-- | dev-db/sqlitestudio/Manifest | 2 | ||||
| -rw-r--r-- | dev-db/sqlitestudio/files/sqlitestudio-3.4.17-fix-python.patch | 13 | ||||
| -rw-r--r-- | dev-db/sqlitestudio/files/sqlitestudio-4.0.0_pre20251207-fix-python.patch | 13 | ||||
| -rw-r--r-- | dev-db/sqlitestudio/files/sqlitestudio-4.0.0_pre20251207-missing-headers.patch | 26 | ||||
| -rw-r--r-- | dev-db/sqlitestudio/sqlitestudio-4.0.0_pre20251207.ebuild (renamed from dev-db/sqlitestudio/sqlitestudio-3.4.17.ebuild) | 52 |
5 files changed, 61 insertions, 45 deletions
diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest index 632f49e64582..aac0427d27ee 100644 --- a/dev-db/sqlitestudio/Manifest +++ b/dev-db/sqlitestudio/Manifest @@ -1 +1 @@ -DIST sqlitestudio-3.4.17.tar.gz 16696859 BLAKE2B 6b1d4660c7b4ed4880df3c7e2e68d7b52edb46d7e19a751d49825c08a477adc02646729418e3a8b1fd6e5bc8192cc35197a23aa7e9142e4c2ebd184c049ee1eb SHA512 2fab60c9a695022998ad7848b0ece614170070fd9603fb559a942692fb644204aa4437cf33b18f66bbcfe36f82bdfddb7e1d5c934e2946a3e56f537171798f4a +DIST sqlitestudio-4.0.0_pre20251207-bac238cc.tar.gz 17654915 BLAKE2B fb93d688076cc27752b5578f764e4e99ee89bd7ff49ac2c06b4cc7fb3018835df1675aa053bad5eee06b6db40fae20535b63e6a4076213a05e4592d2faafdace SHA512 50fbe053ae9bc93019a71c9d4be4671e7c3b49e77eab7e341f6b7e2254fd9b2541b556e5e7eec0737ce39da2219ddb2b10bfdcb7637c789027370f7d8b59b0a9 diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.4.17-fix-python.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.4.17-fix-python.patch deleted file mode 100644 index 9bc5d1b11607..000000000000 --- a/dev-db/sqlitestudio/files/sqlitestudio-3.4.17-fix-python.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Plugins/ScriptingPython/ScriptingPython.pro.orig b/Plugins/ScriptingPython/ScriptingPython.pro -index 75375da..614cfe8 100644 ---- a/Plugins/ScriptingPython/ScriptingPython.pro.orig -+++ b/Plugins/ScriptingPython/ScriptingPython.pro -@@ -22,7 +22,7 @@ isEmpty(PYTHON_VERSION) { - } - - linux: { -- LIBS += -lpython$$PYTHON_VERSION -+ #LIBS += -lpython$$PYTHON_VERSION - } - - macx: { diff --git a/dev-db/sqlitestudio/files/sqlitestudio-4.0.0_pre20251207-fix-python.patch b/dev-db/sqlitestudio/files/sqlitestudio-4.0.0_pre20251207-fix-python.patch new file mode 100644 index 000000000000..ddb88534257e --- /dev/null +++ b/dev-db/sqlitestudio/files/sqlitestudio-4.0.0_pre20251207-fix-python.patch @@ -0,0 +1,13 @@ +diff --git a/Plugins/ScriptingPython/ScriptingPython.pro b/Plugins/ScriptingPython/ScriptingPython.pro +index 75375da..614cfe8 100644 +--- a/Plugins/ScriptingPython/ScriptingPython.pro ++++ b/Plugins/ScriptingPython/ScriptingPython.pro +@@ -22,7 +22,7 @@ isEmpty(PYTHON_VERSION) { + PYTHON_VERSION = 3.9 + } + linux: { +- LIBS += -lpython$$PYTHON_VERSION ++ #LIBS += -lpython$$PYTHON_VERSION + } + + macx: { diff --git a/dev-db/sqlitestudio/files/sqlitestudio-4.0.0_pre20251207-missing-headers.patch b/dev-db/sqlitestudio/files/sqlitestudio-4.0.0_pre20251207-missing-headers.patch new file mode 100644 index 000000000000..4461f0264bcb --- /dev/null +++ b/dev-db/sqlitestudio/files/sqlitestudio-4.0.0_pre20251207-missing-headers.patch @@ -0,0 +1,26 @@ +From fba5a4e01a4d4e1114bbea21bf3ac9c27f3f8af9 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 12 Dec 2025 22:42:31 +0100 +Subject: [PATCH] Add missing QJsonValue and QUuid headers + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + SQLiteStudio3/coreSQLiteStudio/common/utils.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp b/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp +index f9b550901..dc6177456 100644 +--- a/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp ++++ b/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp +@@ -4,6 +4,8 @@ + #include "dbobjecttype.h" + #include "rsa/RSA.h" + #include <QJsonDocument> ++#include <QJsonValue> ++#include <QUuid> + #include <QLine> + #include <QString> + #include <QStringConverter> +-- +2.52.0 + diff --git a/dev-db/sqlitestudio/sqlitestudio-3.4.17.ebuild b/dev-db/sqlitestudio/sqlitestudio-4.0.0_pre20251207.ebuild index 49d2fbd37123..10f4543508c8 100644 --- a/dev-db/sqlitestudio/sqlitestudio-3.4.17.ebuild +++ b/dev-db/sqlitestudio/sqlitestudio-4.0.0_pre20251207.ebuild @@ -3,58 +3,55 @@ EAPI=8 -PLOCALES="af_ZA ar_SA ca_ES cs_CZ da_DK de_DE el_GR en_US es_ES fa_IR fi_FI fr_FR he_IL hu_HU it_IT ja_JP kaa ko_KR nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr_SP sv_SE tr_TR uk_UA vi_VN zh_CN zh_TW" +COMMIT=bac238ccb0000419a66f3b2134b08d1f7a2bd076 + +PLOCALES="af_ZA ar_SA be_BY ca_ES cs_CZ da_DK de_DE el_GR en_US es_ES fa_IR fi_FI fr_FR he_IL hu_HU it_IT ja_JP kaa ko_KR nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr_SP sv_SE tr_TR uk_UA vi_VN zh_CN zh_TW" # ScriptingPython says exactly 3.9 -PYTHON_COMPAT=( python3_{9..13} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit desktop plocale python-single-r1 qmake-utils xdg DESCRIPTION="Powerful cross-platform SQLite database manager" HOMEPAGE="https://sqlitestudio.pl" -SRC_URI="https://github.com/pawelsalawa/sqlitestudio/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/pawelsalawa/sqlitestudio/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT:0:8}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="cli cups python tcl test" +IUSE="cli python tcl test" REQUIRED_USE=" test? ( cli ) python? ( ${PYTHON_REQUIRED_USE} ) " - RESTRICT="!test? ( test )" RDEPEND=" dev-libs/openssl:= dev-db/sqlite:3 - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 + dev-qt/qtbase:6[gui,network,widgets,xml] + dev-qt/qtdeclarative:6 + dev-qt/qtsvg:6 cli? ( sys-libs/readline:= sys-libs/ncurses:= ) python? ( ${PYTHON_DEPS} ) - cups? ( dev-qt/qtprintsupport:5 ) tcl? ( dev-lang/tcl:0= ) " DEPEND="${RDEPEND} - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - test? ( dev-qt/qttest:5 ) + dev-qt/qttools:6[designer] + dev-qt/qtbase:6[concurrent] " BDEPEND=" - dev-qt/linguist-tools:5 + dev-qt/qttools:6[linguist] virtual/pkgconfig " PATCHES=( - "${FILESDIR}"/${PN}-3.4.17-fix-python.patch + "${FILESDIR}"/${P}-fix-python.patch + "${FILESDIR}"/${P}-missing-headers.patch ) core_build_dir="${S}/output/build" @@ -81,12 +78,11 @@ src_prepare() { use cli || disable_modules SQLiteStudio3/SQLiteStudio3.pro cli local mod_lst=( DbSqlite2 ) - use cups || mod_lst+=( Printing ) use tcl || mod_lst+=( ScriptingTcl ) use python || mod_lst+=( ScriptingPython ) disable_modules Plugins/Plugins.pro ${mod_lst[@]} - local mylrelease="$(qt5_get_bindir)"/lrelease + local mylrelease="$(qt6_get_bindir)"/lrelease local ts_dir_lst=$(find * -type f -name "*.qm" -printf '%h\n' | sort -u) local ts_pro_lst=$(find * -type f -name "*.pro" -exec grep -l 'TRANSLATIONS' {} \;) local ts_qrc_lst=$(find * -type f -name "*.qrc" -exec grep -l '\.qm' {} \;) @@ -149,11 +145,11 @@ src_configure() { ## Core mkdir -p "${core_build_dir}" && cd "${core_build_dir}" || die - eqmake5 "${myqmakeargs[@]}" "${S}/SQLiteStudio3" + eqmake6 "${myqmakeargs[@]}" "${S}/SQLiteStudio3" ## Plugins mkdir -p "${plugins_build_dir}" && cd "${plugins_build_dir}" || die - eqmake5 "${myqmakeargs[@]}" "${S}/Plugins" + eqmake6 "${myqmakeargs[@]}" "${S}/Plugins" } src_compile() { @@ -169,17 +165,11 @@ src_install() { if use test; then # remove test artifacts that must not be installed rm -r "${ED}"/lib64 || die - rm -r "${ED}"/usr/share/qt5/tests || die + rm -r "${ED}"/usr/share/qt6/tests || die fi doicon -s scalable "SQLiteStudio3/guiSQLiteStudio/img/${PN}.svg" - local make_desktop_entry_args=( - "${PN} -- %F" - 'SQLiteStudio3' - "${PN}" - 'Development;Database;Utility' - ) - make_desktop_entry "${make_desktop_entry_args[@]}" \ - "$( printf '%s\n' "MimeType=application/x-sqlite3;" )" + make_desktop_entry --eapi9 ${PN} -a "-- %F" -n SQLiteStudio3 -i ${PN} \ + -c "Development;Database;Utility" -e "MimeType=application/x-sqlite3;" } |