gentoo auto-resync : 06:05:2023 - 05:33:06

4 files changed, 432 insertions, 0 deletions

diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest
index 1aead405bb05..87c9d2a13183 100644
--- a/dev-db/sqlitestudio/Manifest
+++ b/dev-db/sqlitestudio/Manifest
@@ -1,6 +1,10 @@
+AUX sqlitestudio-3.4.3-fix-PyThreadState.patch 2084 BLAKE2B b9fdd9b233a8e053013484a6c0d9949a5a71374d62bd3fc3cd2d0c180a8bc1a709cf0ba12f5d6a62d5ac0d2f3bb522972599a808a2a45d9e165303cecd73c954 SHA512 d0aedf2ff6dd0e567d410f8e809179a5504f04c39284e0ab9b1a089a6062da6e50a8e9c5640712491742ce34b58b60bfdbe0e5d89cc9256af7e5adf6937ac548
 AUX sqlitestudio-3.4.3-fix-python.patch 382 BLAKE2B 81da31e4f4d712e005639d12c3d1d41a2f339edc054e985903de16986967348fe0a2cca13a6dbced8762fc1f8bd497f8d061ac58a8810abc8f7cfab8b4a3150a SHA512 d391b549f842d7dbb1b8027c6814ad79f44d8bdc30adf407401fd2f139069a56ddbd8ceee0b2093bdd69922dd0f01ecd77d1f9f1b4550ba3bbbf67e59c4a87db
 DIST sqlitestudio-3.3.3.tar.gz 8863232 BLAKE2B 1dfa74ab405ec057090f87726c3562470de4c1fd7b97c0fbc3e3fb4b3c8413825ec1884ac8bc9cb86e0d3d64b42af323a46ae4aa324de98c1dc8e967a4eb0d35 SHA512 1b92b06dbca3b5ee051d2582345c0e9a0a3cbd2cbbde0c6b9b18f75ca30140c777746fc9d35a3c314c13d99300dbe8d9bbd313b2ae4cb069b8e81446b27e982f
 DIST sqlitestudio-3.4.3.tar.gz 16115078 BLAKE2B ac083ea53276a87917a532359c5f3eae665140e04efe01c8172fbcb135df65f4128a6b09b96f781c411e3b105f47a2c30172e37ab1bd82be32a36027c75770d9 SHA512 5261bd9c5a7e5be3e140eefda45961dc1978b6d1f9f180a8db07671acc55d275c0f2755a580f57681b17fe233ef54b2680a633693c1ec62d3517e4f968e80549
+DIST sqlitestudio-3.4.4.tar.gz 16187828 BLAKE2B 34a19880c0ce82a0457c8b34fe713d1792101563dd37849f02538a3f62310e0720939a3930c2c1d2fe43a8379c66012e75cf9e45e961a382c3ea5fbd857e42d3 SHA512 ddbb926afcca0afe8e4199be64254d0a9a47bef66f260c51cc7e5c5d38c8a00bfbe2012e8ec933bf69e85481c0c214136146cd3bff0975f6178f9fe7884e8190
 EBUILD sqlitestudio-3.3.3.ebuild 3952 BLAKE2B fb3090ed69f3c53b5258f25a1f9c047fd1de9e1d53873a8ef3895d9ab31aeadb281965fea15ad893901984066835a70b7ddff5040ed32cda47a7e3e15ccab21d SHA512 cd38500033a8ad70d544ed57ceecfd4508f6112f8a40deb888e7c302c16cd427065ae3c67a596b8944d27a18459b50f078365fabf8c2bcec8026dc6f0471bb79
+EBUILD sqlitestudio-3.4.3-r1.ebuild 4710 BLAKE2B 51a3b094d932bfd7ccdd44c8be63645cf18245cd734a2d0530d2a7c8410ed1d4b314fa828d12047b8f6767c3a862221d0b72dcd630deb2e2d59c640135c4458b SHA512 2e5107d274fe37e909a75b9c4383af97c4aef953bea520d07b72b196774187c9113cb03d5083976dc92774f82df0b5cd2a788522d6ce5fe66c40f5f3860e8ef6
 EBUILD sqlitestudio-3.4.3.ebuild 4666 BLAKE2B db64bb9caf66d1d6e0852b4b426217f7b3f8d29e97d6c3ed9823076c5ee35f55d755eff013062055a58467cca120e4b53d0c645ce528fb8db41d0062f2842cc9 SHA512 fe2af8cf6fe6ba29c9c51bac69ae6ebaa9f8abe2923c3efc2bb1aa19a60b2abe69c2910108d7e406835ee8cd3e11fe5495905307004a4022fa1285160376920f
+EBUILD sqlitestudio-3.4.4.ebuild 4728 BLAKE2B ca59c81a76c8270e339ecf3b55e22e9ebb2a37ee8ce067baabd19aa8d772457926111dcf8ded9bb19de515f58ae79b7ea13cce1ff1e92e3408600e288db0033b SHA512 a7778c0f1392cedac0bffecf05a80211fd16f30c023d95f5421fc3ebd0b916d459a258aba8296c27191180cc1b0dfba84318f0e0a1149bfc1c7467cd1c44c320
 MISC metadata.xml 318 BLAKE2B dbda5d06a4e9349a582d2d09cf846580b383388ec7db0986675d1b4fe63e0ded9dbc7f50c332d855b600d9df99935b67e77a2fab9c0a37fc3b6af2d03b4e3212 SHA512 d1bf82ea37f8d16e7dd51d8da26eb5f93383a05df40ca1b91309be7fbad0b786db9365b8bc8f72b63556ccbf96969d2e38c785112754b035e3242b75ff2bacb7
diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.4.3-fix-PyThreadState.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.4.3-fix-PyThreadState.patch
new file mode 100644
index 000000000000..5f69298bb6d3
--- /dev/null
+++ b/dev-db/sqlitestudio/files/sqlitestudio-3.4.3-fix-PyThreadState.patch
@@ -0,0 +1,54 @@
+From 364981e072039de1322a72c936e3747c462e57d4 Mon Sep 17 00:00:00 2001
+From: Matthew White <mehw.is.me@inventati.org>
+Date: Fri, 5 May 2023 11:46:27 +0000
+Subject: [PATCH] Plugins: fix compiling with Python 3.11
+
+Python 3.11 removed PyThreadState()->frame, but since Python 3.9
+PyThreadState_GetFrame() can be used to get the frame.
+
+To get the frame's f_locals and f_globals use PyFrame_GetLocals()
+and PyFrame_GetGlobals() when compiling with Python 3.11.
+
+Merged here is also 'Fixed compilation for Python < 3.11':
+https://github.com/pawelsalawa/sqlitestudio/commit/30ad718415ffe78a5ac0ff9cf12cff2bd01e9810
+
+References:
+https://docs.python.org/3/c-api/frame.html
+---
+ Plugins/ScriptingPython/scriptingpython.cpp | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/Plugins/ScriptingPython/scriptingpython.cpp b/Plugins/ScriptingPython/scriptingpython.cpp
+index 1dedb5c106..663c55b7d7 100644
+--- a/Plugins/ScriptingPython/scriptingpython.cpp
++++ b/Plugins/ScriptingPython/scriptingpython.cpp
+@@ -582,15 +582,25 @@ SqlQueryPtr ScriptingPython::dbCommonEval(PyObject* sqlArg, const char* fnName)
+ QVariant ScriptingPython::getVariable(const QString& name)
+ {
+     PyThreadState* state = PyThreadState_Get();
+-    if (!state->frame)
++#if PY_VERSION_HEX < 0x03090000
++    PyFrameObject* frame = state->frame;
++#else
++    PyFrameObject* frame = PyThreadState_GetFrame(state);
++#endif
++    if (!frame)
+         return QVariant();
+ 
+     const char* varName = name.toUtf8().constData();
+     PyObject* obj = nullptr;
+ 
+-    PyFrame_FastToLocals(state->frame);
+-    PyObject* locals = state->frame->f_locals;
+-    PyObject* globals = state->frame->f_globals;
++    PyFrame_FastToLocals(frame);
++#if PY_VERSION_HEX < 0x030b0000
++    PyObject* locals = frame->f_locals;
++    PyObject* globals = frame->f_globals;
++#else
++    PyObject* locals = PyFrame_GetLocals(frame);
++    PyObject* globals = PyFrame_GetGlobals(frame);
++#endif
+     if (PyMapping_Check(locals))
+         obj = PyMapping_GetItemString(locals, varName);
+     else if (PyDict_Check(globals))
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.4.3-r1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.4.3-r1.ebuild
new file mode 100644
index 000000000000..ff3c591f1c38
--- /dev/null
+++ b/dev-db/sqlitestudio/sqlitestudio-3.4.3-r1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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 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..11} )
+
+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"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli cups 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/qtscript:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	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 )
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-python.patch
+	"${FILESDIR}"/${P}-fix-PyThreadState.patch
+)
+
+core_build_dir="${S}/output/build"
+plugins_build_dir="${core_build_dir}/Plugins"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	disable_modules() {
+		[[ $# -lt 2 ]] && die "not enough arguments"
+
+		local pro="$1"; shift
+		local modules="${@}"
+
+		sed -r -i \
+			-e 's/('${modules// /|}')[[:space:]]*(\\?)/\2/' \
+			${pro} || die
+	}
+
+	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 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' {} \;)
+
+	# delete all "*.qm"
+	for ts_dir in ${ts_dir_lst[@]}; do
+		rm "${ts_dir}"/*.qm || die
+	done
+
+	lrelease_locale() {
+		for ts_dir in ${ts_dir_lst[@]}; do
+			local ts=$(find "${ts_dir}" -type f -name "*${1}.ts" || continue)
+			"${mylrelease}" "${ts}" || die "preparing ${1} locale failed"
+		done
+	}
+
+	rm_locale() {
+		for ts_pro in ${ts_pro_lst[@]}; do
+			sed -i -r -e 's/[^[:space:]]*'${1}'\.ts//' \
+				${ts_pro} || die
+		done
+
+		for ts_qrc in ${ts_qrc_lst[@]}; do
+			sed -i -e '/'${1}'\.qm/d' \
+				${ts_qrc} || die
+		done
+	}
+
+	local ts_dir_main="SQLiteStudio3/sqlitestudio/translations"
+	plocale_find_changes ${ts_dir_main} "sqlitestudio_" '.ts'
+	plocale_for_each_locale lrelease_locale
+	plocale_for_each_disabled_locale rm_locale
+
+	# prevent "multilib-strict check failed" with USE test by
+	# replacing target paths with dynamic lib dir
+	#
+	sed -i -e 's/\(target\.path = .*\/\)lib/\1'$(get_libdir)'/' \
+		SQLiteStudio3/Tests/TestUtils/TestUtils.pro || die
+}
+
+src_configure() {
+	# NOTE: QMAKE_CFLAGS_ISYSTEM option prevents
+	# build error with tcl use enabled (stdlib.h is missing)
+	# "QMAKE_CFLAGS_ISYSTEM=\"\""
+	# CONFIG+ borrowed from compile.sh of tarball
+	local myqmakeargs=(
+		"BINDIR=${EPREFIX}/usr/bin"
+		"LIBDIR=${EPREFIX}/usr/$(get_libdir)"
+		"CONFIG+=portable"
+		$(usex test 'DEFINES+=tests' '')
+	)
+
+	# Combination of kvirc ebuild and qtcompress
+	if use python; then
+		myqmakeargs+=(
+			INCLUDEPATH+=" $(python_get_includedir)"
+			LIBS+=" $(python_get_LIBS)"
+		)
+	fi
+
+	## Core
+	mkdir -p "${core_build_dir}" && cd "${core_build_dir}" || die
+	eqmake5 "${myqmakeargs[@]}" "${S}/SQLiteStudio3"
+
+	## Plugins
+	mkdir -p "${plugins_build_dir}" && cd "${plugins_build_dir}" || die
+	eqmake5 "${myqmakeargs[@]}" "${S}/Plugins"
+}
+
+src_compile() {
+	emake -C "${core_build_dir}"
+	emake -C "${plugins_build_dir}"
+}
+
+src_install() {
+	emake -C "${core_build_dir}" INSTALL_ROOT="${D}" install
+	emake -C "${plugins_build_dir}" INSTALL_ROOT="${D}" 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
+	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;" )"
+}
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.4.4.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.4.4.ebuild
new file mode 100644
index 000000000000..72ae21dc8d10
--- /dev/null
+++ b/dev-db/sqlitestudio/sqlitestudio-3.4.4.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+
+# ScriptingPython says exactly 3.9
+PYTHON_COMPAT=( python3_{9..11} )
+
+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"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli cups 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/qtscript:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	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 )
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.3-fix-python.patch
+	"${FILESDIR}"/${PN}-3.4.3-fix-PyThreadState.patch
+)
+
+core_build_dir="${S}/output/build"
+plugins_build_dir="${core_build_dir}/Plugins"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	disable_modules() {
+		[[ $# -lt 2 ]] && die "not enough arguments"
+
+		local pro="$1"; shift
+		local modules="${@}"
+
+		sed -r -i \
+			-e 's/('${modules// /|}')[[:space:]]*(\\?)/\2/' \
+			${pro} || die
+	}
+
+	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 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' {} \;)
+
+	# delete all "*.qm"
+	for ts_dir in ${ts_dir_lst[@]}; do
+		rm "${ts_dir}"/*.qm || die
+	done
+
+	lrelease_locale() {
+		for ts_dir in ${ts_dir_lst[@]}; do
+			local ts=$(find "${ts_dir}" -type f -name "*${1}.ts" || continue)
+			"${mylrelease}" "${ts}" || die "preparing ${1} locale failed"
+		done
+	}
+
+	rm_locale() {
+		for ts_pro in ${ts_pro_lst[@]}; do
+			sed -i -r -e 's/[^[:space:]]*'${1}'\.ts//' \
+				${ts_pro} || die
+		done
+
+		for ts_qrc in ${ts_qrc_lst[@]}; do
+			sed -i -e '/'${1}'\.qm/d' \
+				${ts_qrc} || die
+		done
+	}
+
+	local ts_dir_main="SQLiteStudio3/sqlitestudio/translations"
+	plocale_find_changes ${ts_dir_main} "sqlitestudio_" '.ts'
+	plocale_for_each_locale lrelease_locale
+	plocale_for_each_disabled_locale rm_locale
+
+	# prevent "multilib-strict check failed" with USE test by
+	# replacing target paths with dynamic lib dir
+	#
+	sed -i -e 's/\(target\.path = .*\/\)lib/\1'$(get_libdir)'/' \
+		SQLiteStudio3/Tests/TestUtils/TestUtils.pro || die
+}
+
+src_configure() {
+	# NOTE: QMAKE_CFLAGS_ISYSTEM option prevents
+	# build error with tcl use enabled (stdlib.h is missing)
+	# "QMAKE_CFLAGS_ISYSTEM=\"\""
+	# CONFIG+ borrowed from compile.sh of tarball
+	local myqmakeargs=(
+		"BINDIR=${EPREFIX}/usr/bin"
+		"LIBDIR=${EPREFIX}/usr/$(get_libdir)"
+		"CONFIG+=portable"
+		$(usex test 'DEFINES+=tests' '')
+	)
+
+	# Combination of kvirc ebuild and qtcompress
+	if use python; then
+		myqmakeargs+=(
+			INCLUDEPATH+=" $(python_get_includedir)"
+			LIBS+=" $(python_get_LIBS)"
+		)
+	fi
+
+	## Core
+	mkdir -p "${core_build_dir}" && cd "${core_build_dir}" || die
+	eqmake5 "${myqmakeargs[@]}" "${S}/SQLiteStudio3"
+
+	## Plugins
+	mkdir -p "${plugins_build_dir}" && cd "${plugins_build_dir}" || die
+	eqmake5 "${myqmakeargs[@]}" "${S}/Plugins"
+}
+
+src_compile() {
+	emake -C "${core_build_dir}"
+	emake -C "${plugins_build_dir}"
+}
+
+src_install() {
+	emake -C "${core_build_dir}" INSTALL_ROOT="${D}" install
+	emake -C "${plugins_build_dir}" INSTALL_ROOT="${D}" 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
+	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;" )"
+}