diff options
Diffstat (limited to 'dev-db/sqlitestudio')
| -rw-r--r-- | dev-db/sqlitestudio/Manifest | 7 | ||||
| -rw-r--r-- | dev-db/sqlitestudio/files/sqlitestudio-3.4.17-fix-python.patch (renamed from dev-db/sqlitestudio/files/sqlitestudio-3.4.3-fix-python.patch) | 10 | ||||
| -rw-r--r-- | dev-db/sqlitestudio/files/sqlitestudio-3.4.3-fix-PyThreadState.patch | 54 | ||||
| -rw-r--r-- | dev-db/sqlitestudio/sqlitestudio-3.4.17.ebuild (renamed from dev-db/sqlitestudio/sqlitestudio-3.4.4-r1.ebuild) | 8 |
4 files changed, 11 insertions, 68 deletions
diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest index 623d79390e46..cf75d1a8bdad 100644 --- a/dev-db/sqlitestudio/Manifest +++ b/dev-db/sqlitestudio/Manifest @@ -1,5 +1,4 @@ -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.4.4.tar.gz 16187828 BLAKE2B 34a19880c0ce82a0457c8b34fe713d1792101563dd37849f02538a3f62310e0720939a3930c2c1d2fe43a8379c66012e75cf9e45e961a382c3ea5fbd857e42d3 SHA512 ddbb926afcca0afe8e4199be64254d0a9a47bef66f260c51cc7e5c5d38c8a00bfbe2012e8ec933bf69e85481c0c214136146cd3bff0975f6178f9fe7884e8190 -EBUILD sqlitestudio-3.4.4-r1.ebuild 4786 BLAKE2B 4926024bd08aa718ec7f5475ab0b83a9826b6ab00827b5db343824000cfa40519959074a87ddca077e6945f47f49788d0d1ff7aa5f168fe677264a0870b56d9e SHA512 7aa70e135314b70d041ce14e73eac40d3b6d357502c6a263cb767aed7628de9b05345f5c1af32a3ad697afde41b3d7ea57c1fa93ff64cdc44d1fe293ba29ba8d +AUX sqlitestudio-3.4.17-fix-python.patch 393 BLAKE2B ade724444f57b54ef2bce44f4edb754dca311a62a79987f1ab751e9229623a91e8abfbf64a79ea1c411a3cacb6ef3ec2aacc4bc2b93b1b350b25c47bf3af66f6 SHA512 591ccc9f719aaa442a497dac033f180b503dcbfb48eee736a94197683919754ecf42e90bce941e79f5f9652113b9c9903b646644a7977956e08f283b6b989385 +DIST sqlitestudio-3.4.17.tar.gz 16696859 BLAKE2B 6b1d4660c7b4ed4880df3c7e2e68d7b52edb46d7e19a751d49825c08a477adc02646729418e3a8b1fd6e5bc8192cc35197a23aa7e9142e4c2ebd184c049ee1eb SHA512 2fab60c9a695022998ad7848b0ece614170070fd9603fb559a942692fb644204aa4437cf33b18f66bbcfe36f82bdfddb7e1d5c934e2946a3e56f537171798f4a +EBUILD sqlitestudio-3.4.17.ebuild 4735 BLAKE2B 68266bec6218f1cf579a5b00ad185fa69ea159641d4cc0c6fc46d1628ba8f67f5ff4848d5c76d4bf7ffd4a164deb4b15dba54bdbd66e68d586d780f8b0fa2b2e SHA512 50821e372a605fc65e7d1ac617bbf7ef720bda95a121cc2ae73ecd2db88b3fed58d1915521c9ea470c31cead180c16858fc05d426475bb50c0bd4fd65a86c5b8 MISC metadata.xml 318 BLAKE2B dbda5d06a4e9349a582d2d09cf846580b383388ec7db0986675d1b4fe63e0ded9dbc7f50c332d855b600d9df99935b67e77a2fab9c0a37fc3b6af2d03b4e3212 SHA512 d1bf82ea37f8d16e7dd51d8da26eb5f93383a05df40ca1b91309be7fbad0b786db9365b8bc8f72b63556ccbf96969d2e38c785112754b035e3242b75ff2bacb7 diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.4.3-fix-python.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.4.17-fix-python.patch index 856bb6e30c69..9bc5d1b11607 100644 --- a/dev-db/sqlitestudio/files/sqlitestudio-3.4.3-fix-python.patch +++ b/dev-db/sqlitestudio/files/sqlitestudio-3.4.17-fix-python.patch @@ -1,13 +1,13 @@ diff --git a/Plugins/ScriptingPython/ScriptingPython.pro.orig b/Plugins/ScriptingPython/ScriptingPython.pro -index 02fb5d3..d928aaf 100644 +index 75375da..614cfe8 100644 --- a/Plugins/ScriptingPython/ScriptingPython.pro.orig +++ b/Plugins/ScriptingPython/ScriptingPython.pro -@@ -18,7 +18,7 @@ OTHER_FILES += \ - scriptingpython.json +@@ -22,7 +22,7 @@ isEmpty(PYTHON_VERSION) { + } linux: { -- LIBS += -lpython3.9 -+ # LIBS += -lpython3.9 +- LIBS += -lpython$$PYTHON_VERSION ++ #LIBS += -lpython$$PYTHON_VERSION } macx: { 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 deleted file mode 100644 index 5f69298bb6d3..000000000000 --- a/dev-db/sqlitestudio/files/sqlitestudio-3.4.3-fix-PyThreadState.patch +++ /dev/null @@ -1,54 +0,0 @@ -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.4-r1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.4.17.ebuild index 5b746ecdf792..49d2fbd37123 100644 --- a/dev-db/sqlitestudio/sqlitestudio-3.4.4-r1.ebuild +++ b/dev-db/sqlitestudio/sqlitestudio-3.4.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,8 +6,7 @@ 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..12} ) - +PYTHON_COMPAT=( python3_{9..13} ) inherit desktop plocale python-single-r1 qmake-utils xdg DESCRIPTION="Powerful cross-platform SQLite database manager" @@ -55,8 +54,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-3.4.3-fix-python.patch - "${FILESDIR}"/${PN}-3.4.3-fix-PyThreadState.patch + "${FILESDIR}"/${PN}-3.4.17-fix-python.patch ) core_build_dir="${S}/output/build" |