diff options
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/Manifest.gz | bin | 15221 -> 15220 bytes | |||
-rw-r--r-- | dev-db/sqlitestudio/Manifest | 7 | ||||
-rw-r--r-- | dev-db/sqlitestudio/files/sqlitestudio-3.4.3-fix-python.patch | 13 | ||||
-rw-r--r-- | dev-db/sqlitestudio/metadata.xml | 3 | ||||
-rw-r--r-- | dev-db/sqlitestudio/sqlitestudio-3.4.3.ebuild (renamed from dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild) | 76 |
5 files changed, 77 insertions, 22 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz Binary files differindex d3c67886f0c4..b15ae7d2187e 100644 --- a/dev-db/Manifest.gz +++ b/dev-db/Manifest.gz diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest index caf041f902d1..1aead405bb05 100644 --- a/dev-db/sqlitestudio/Manifest +++ b/dev-db/sqlitestudio/Manifest @@ -1,5 +1,6 @@ -DIST sqlitestudio-3.2.1.tar.gz 9405867 BLAKE2B 53cd8465a6140cf17c602094cceef2fdf74f513f33257b22e1a3d7adcb9c78d8eb2cdaff047920836a9d98429ba0025924ce608f2eab97319feabf063de4c9ee SHA512 9c07f0dc50bf35ad04d0cb06cfc1a306d3f0aa9446e7d737c8187c63cb7dd2c44fb4b960693f2c30a15ece3aac0878701874a9ce3cebfe0c6bf48df10814a574 +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 -EBUILD sqlitestudio-3.2.1-r1.ebuild 3762 BLAKE2B 6b038547c7f69d44899912520343a6d46dffce0183f529dfa951f6278d08e4dcf39ad05335b208b6d04b5d0e7f31862ec2277d93a4743aaa5d0a15cbc1f936d4 SHA512 e932e3a5f103bfe52da6191f0600ecea41b170cb1d90864f21f2b165daaf707f23f930bdf5a83a479bdedd2b1bea13a1046273b532de564de0ec1d48a817b94a +DIST sqlitestudio-3.4.3.tar.gz 16115078 BLAKE2B ac083ea53276a87917a532359c5f3eae665140e04efe01c8172fbcb135df65f4128a6b09b96f781c411e3b105f47a2c30172e37ab1bd82be32a36027c75770d9 SHA512 5261bd9c5a7e5be3e140eefda45961dc1978b6d1f9f180a8db07671acc55d275c0f2755a580f57681b17fe233ef54b2680a633693c1ec62d3517e4f968e80549 EBUILD sqlitestudio-3.3.3.ebuild 3952 BLAKE2B fb3090ed69f3c53b5258f25a1f9c047fd1de9e1d53873a8ef3895d9ab31aeadb281965fea15ad893901984066835a70b7ddff5040ed32cda47a7e3e15ccab21d SHA512 cd38500033a8ad70d544ed57ceecfd4508f6112f8a40deb888e7c302c16cd427065ae3c67a596b8944d27a18459b50f078365fabf8c2bcec8026dc6f0471bb79 -MISC metadata.xml 229 BLAKE2B fe27055b0533ed8aa2030034787817133afeddf14881d199dbecfdd63be71a15bc35b147b06430f36e1840f9107dfc6f0efb746bb0b530b8f20bd10c9e16edd6 SHA512 2d89bec7784c7db0fcaae3a178095ebc2f20aa49c3f98b15072c77a27c32d714d2fad0eabda63a8395839163ac1c25f846c2fa5115cd54ef27881227e3efd960 +EBUILD sqlitestudio-3.4.3.ebuild 4666 BLAKE2B db64bb9caf66d1d6e0852b4b426217f7b3f8d29e97d6c3ed9823076c5ee35f55d755eff013062055a58467cca120e4b53d0c645ce528fb8db41d0062f2842cc9 SHA512 fe2af8cf6fe6ba29c9c51bac69ae6ebaa9f8abe2923c3efc2bb1aa19a60b2abe69c2910108d7e406835ee8cd3e11fe5495905307004a4022fa1285160376920f +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.3-fix-python.patch new file mode 100644 index 000000000000..856bb6e30c69 --- /dev/null +++ b/dev-db/sqlitestudio/files/sqlitestudio-3.4.3-fix-python.patch @@ -0,0 +1,13 @@ +diff --git a/Plugins/ScriptingPython/ScriptingPython.pro.orig b/Plugins/ScriptingPython/ScriptingPython.pro +index 02fb5d3..d928aaf 100644 +--- a/Plugins/ScriptingPython/ScriptingPython.pro.orig ++++ b/Plugins/ScriptingPython/ScriptingPython.pro +@@ -18,7 +18,7 @@ OTHER_FILES += \ + scriptingpython.json + + linux: { +- LIBS += -lpython3.9 ++ # LIBS += -lpython3.9 + } + + macx: { diff --git a/dev-db/sqlitestudio/metadata.xml b/dev-db/sqlitestudio/metadata.xml index 8d910856df4f..b42fb8ee3067 100644 --- a/dev-db/sqlitestudio/metadata.xml +++ b/dev-db/sqlitestudio/metadata.xml @@ -5,4 +5,7 @@ <use> <flag name="cli">Build CLI interface</flag> </use> + <upstream> + <remote-id type="github">pawelsalawa/sqlitestudio</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.4.3.ebuild index 6477a98ac404..9392b3336487 100644 --- a/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild +++ b/dev-db/sqlitestudio/sqlitestudio-3.4.3.ebuild @@ -1,33 +1,47 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PLOCALES="de es fr it pl pt_BR ro_RO ru sk zh_CN" -inherit desktop plocale qmake-utils xdg +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://sqlitestudio.pl/files/sqlitestudio3/complete/tar/${P}.tar.gz" +SRC_URI="https://github.com/pawelsalawa/sqlitestudio/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" LICENSE="GPL-3" SLOT="0" -IUSE="cli cups tcl test" +KEYWORDS="~amd64 ~x86" +IUSE="cli cups python tcl test" + +REQUIRED_USE=" + test? ( cli ) + python? ( ${PYTHON_REQUIRED_USE} ) +" -REQUIRED_USE="test? ( cli )" 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:0= ) + cli? ( + sys-libs/readline:= + sys-libs/ncurses:= + ) + python? ( ${PYTHON_DEPS} ) cups? ( dev-qt/qtprintsupport:5 ) tcl? ( dev-lang/tcl:0= ) " @@ -38,17 +52,22 @@ DEPEND="${RDEPEND} " BDEPEND=" dev-qt/linguist-tools:5 + virtual/pkgconfig " -S="${WORKDIR}" +PATCHES=( + "${FILESDIR}"/${P}-fix-python.patch +) + core_build_dir="${S}/output/build" plugins_build_dir="${core_build_dir}/Plugins" -src_prepare() { - xdg_src_prepare +pkg_setup() { + use python && python-single-r1_pkg_setup +} - sed -i -e 's/linux|portable/portable/' \ - SQLiteStudio3/sqlitestudio/sqlitestudio.pro || die +src_prepare() { + default disable_modules() { [[ $# -lt 2 ]] && die "not enough arguments" @@ -66,6 +85,7 @@ src_prepare() { 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 @@ -78,7 +98,7 @@ src_prepare() { rm "${ts_dir}"/*.qm || die done - prepare_locale() { + 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" @@ -99,24 +119,36 @@ src_prepare() { local ts_dir_main="SQLiteStudio3/sqlitestudio/translations" plocale_find_changes ${ts_dir_main} "sqlitestudio_" '.ts' - plocale_for_each_locale prepare_locale + plocale_for_each_locale lrelease_locale plocale_for_each_disabled_locale rm_locale - # prevent "multilib-strict check failed" with USE test - sed -i -e 's/\(target.*usr\/\)lib/\1'$(get_libdir)'/' \ + # 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)" - "QMAKE_CFLAGS_ISYSTEM=\"\"" + "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" @@ -135,6 +167,12 @@ 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=( |