From 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Feb 2019 15:40:27 +0000 Subject: gentoo resync : 10.02.2019 --- dev-db/sqlitestudio/Manifest | 7 +- .../files/sqlitestudio-3.0.6-portable.patch | 11 -- .../sqlitestudio-3.0.6-qt5_5-QDataStream.patch | 30 ----- .../files/sqlitestudio-3.0.7-paths.patch | 22 ---- dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild | 130 ------------------ dev-db/sqlitestudio/sqlitestudio-3.2.1.ebuild | 145 +++++++++++++++++++++ 6 files changed, 147 insertions(+), 198 deletions(-) delete mode 100644 dev-db/sqlitestudio/files/sqlitestudio-3.0.6-portable.patch delete mode 100644 dev-db/sqlitestudio/files/sqlitestudio-3.0.6-qt5_5-QDataStream.patch delete mode 100644 dev-db/sqlitestudio/files/sqlitestudio-3.0.7-paths.patch delete mode 100644 dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild create mode 100644 dev-db/sqlitestudio/sqlitestudio-3.2.1.ebuild (limited to 'dev-db/sqlitestudio') diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest index 81a29de9c9c2..9aeea8e02a6f 100644 --- a/dev-db/sqlitestudio/Manifest +++ b/dev-db/sqlitestudio/Manifest @@ -1,9 +1,6 @@ -AUX sqlitestudio-3.0.6-portable.patch 313 BLAKE2B abd43b5f413ea0a7dd5a1f72a70cb3c828f764ee8aad4ec787b7d5c6f12c42defb6b39bb542f515123be27ba6585eebf09c9cd5a663b48610db4fc5ed1222aa9 SHA512 85a6c67488196b182ea3dc4df065ab175c0da5140d892fd9cfc7c2a120a2dc91b89878f66d92d7e9f085676f0c0dfff6adbfe5742868e62b1b47332232447f07 -AUX sqlitestudio-3.0.6-qt5_5-QDataStream.patch 912 BLAKE2B d362ec9ca2171be5a137800ada97bae4fc6c184b97ca0566818f1f3e40096249d9bb44a84e97d34393b53babdcfd60aab80aa2c9e185b4e02c93c6bb84958a29 SHA512 217152e6a8cab0ef52de6f7704c1ed7db6f2b3134bd107d49c1c00405922afd0561046123dac53d91827856b6586c8946231643fe369b3775459cd247c46ceaf -AUX sqlitestudio-3.0.7-paths.patch 735 BLAKE2B 2c3fa18d679e6a214bcb27614f02abcc200e31cbee139709700642d7cfdabeea4eb3b589eccdb9197162a4b0266013dbbbbb27c15b4f6a41c4dfcc020e5d9df3 SHA512 cbe5e66483fa8fcfde80e62f2061d59af002aa3f616e5674f49049c21d0683b3b0668c1793186dc2757c870ce71566ca38283e4f1d34bdecb903ab2eaabeebe2 AUX sqlitestudio-3.1.1-qt-5.11.patch 737 BLAKE2B 04dcbdc017d483d4d3c9c8565afc6a2679d8f296d224287e882f666b7dfb3d71849efa1d9cb8bd0a471c2a241b851f4eb97c2f3d6a6920bee0ccb53f8b6f6218 SHA512 16697058c404a738d1fb43fe0c9e5f447334c408282b60fab1e097f831db5b83baee26f31ef4e9eeb8d22a20b3fad243e2304bdd2e6f0ed2f658e728570c82ec -DIST sqlitestudio-3.0.7.tar.gz 2551341 BLAKE2B b499aac9d251b9682c241e37c30f52d6fce65bc317ee39022e385d2535e2e62b9213bc72941236fcb355d0f8a56924f9d28d32db9937a0af6e7a0cfb05252763 SHA512 2171fe26754aed2abe24d73e9ccc2ee1abe5e87228096bc5643c5638ad578dc323b810535f41d0206b3d7a7aa75132bfb578972c7945b962dd593543c7da3270 DIST sqlitestudio-3.1.1.tar.gz 8610037 BLAKE2B 7f0de65a31a8c25da305cb8d73a03f4215a1134c652e6fb68424ae2153afb1e3655ae3360b2c25b863f105a53cd5fb9909d3f8aa5674f25f0e19a080b15dfa97 SHA512 421247730660e8396f692fd8df9366e6ae834633823004ef3cb7c6f3064e66f420f0517df6a8542b800f7f88dacf2fc646b4224b423ab3994c7d8a083e82e143 -EBUILD sqlitestudio-3.0.7.ebuild 3332 BLAKE2B fa184dd1694a0034c9d34827ba257da9097a0fa8b7f1d552718d328cef7ed0ea05b3e7adf7ce9887b20d6753063f196f96e228076e758615772cb1543db57e55 SHA512 d4560ef7865d0c5356ae23cecec834669e4ad17ab96e020bdd9a5d6dcd493fa038793296376538e5460c22a79df579a6ea90eeb3f1afa1d8cd2550de9d291547 +DIST sqlitestudio-3.2.1.tar.gz 9405867 BLAKE2B 53cd8465a6140cf17c602094cceef2fdf74f513f33257b22e1a3d7adcb9c78d8eb2cdaff047920836a9d98429ba0025924ce608f2eab97319feabf063de4c9ee SHA512 9c07f0dc50bf35ad04d0cb06cfc1a306d3f0aa9446e7d737c8187c63cb7dd2c44fb4b960693f2c30a15ece3aac0878701874a9ce3cebfe0c6bf48df10814a574 EBUILD sqlitestudio-3.1.1.ebuild 3545 BLAKE2B 1a1d5d15fadf26d2c54f9c3d53d13e67dbe111ef10e195b6f5ecc2bea566527340efbeb85e34e16278bf8e65ebc30c88c0ffee818e3ce0a6d9e75508e4138a64 SHA512 b2cda1f8321266bd63a8dd4ff92420be7d99eea670c9eeaadcf425df7b9e70f90ed589fdaf3f15bc7448f5bc09218a967963bdebc6888efefc7e118e7eaa3360 +EBUILD sqlitestudio-3.2.1.ebuild 3702 BLAKE2B 0c948401a7134af8d8db54ff53689e7d13df1481ca47983c4ceecf0b7e47f69d0ce55df44da1a5dd57dad9cb6823b15287ef29ae72ba13a3eba657b92fedc2f9 SHA512 194b248204b5ffafbc05db47fe161b0177204b40030314e1e720a4163d9002ad1f64bd87d41191a413392bdd1cd833e48651158968bf4b06f9df5e48a4281120 MISC metadata.xml 427 BLAKE2B 937831b3acf561038a945599a81766c4fd1712d889b8bb0ba2c7b8c0d2414c547e270363b6ece7fd7956b66f1eec2e12bb4b83a2adf2718c14d0271d3c0f0155 SHA512 a6948ce576abceb4df085f103e097a720ef5f959c6f4bb79cc1f1d858e43cea625d5af3c5edf47f5e61c0a537368e60abd77ed3fcf39a9526543de315ef125b2 diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-portable.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-portable.patch deleted file mode 100644 index 558a84231b81..000000000000 --- a/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-portable.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/SQLiteStudio3/sqlitestudio/sqlitestudio.pro 2015-11-24 20:09:29.000000000 +0100 -+++ b/SQLiteStudio3/sqlitestudio/sqlitestudio.pro 2016-01-20 15:04:46.700926391 +0100 -@@ -25,7 +25,7 @@ - - CONFIG += c++11 - QMAKE_CXXFLAGS += -pedantic --linux|portable { -+portable { - QMAKE_LFLAGS += -Wl,-rpath,./lib - } - diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-qt5_5-QDataStream.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-qt5_5-QDataStream.patch deleted file mode 100644 index c42160c52f07..000000000000 --- a/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-qt5_5-QDataStream.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/SQLiteStudio3/coreSQLiteStudio/db/db.cpp 2015-05-11 23:22:41.000000000 +0200 -+++ b/SQLiteStudio3/coreSQLiteStudio/db/db.cpp 2016-01-20 02:21:00.350160645 +0100 -@@ -1,6 +1,7 @@ - #include "db.h" - #include - #include -+#include - - Db::Db() - { ---- a/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp 2015-05-11 23:22:41.000000000 +0200 -+++ b/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp 2016-01-20 01:46:22.113263710 +0100 -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - - #ifdef Q_OS_LINUX - #include ---- a/SQLiteStudio3/sqlitestudiocli/cli_config.h 2015-05-11 23:22:40.000000000 +0200 -+++ b/SQLiteStudio3/sqlitestudiocli/cli_config.h 2016-01-20 02:45:11.393819294 +0100 -@@ -2,6 +2,7 @@ - #define CLI_CONFIG_H - - #include "config_builder.h" -+#include - - namespace CliResultsDisplay - { diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.0.7-paths.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.0.7-paths.patch deleted file mode 100644 index 59d8c0f187aa..000000000000 --- a/dev-db/sqlitestudio/files/sqlitestudio-3.0.7-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Plugins/DbAndroid/DbAndroid.pro 2015-11-24 20:09:41.000000000 +0100 -+++ a/Plugins/DbAndroid/DbAndroid.pro 2016-01-20 13:39:02.436869035 +0100 -@@ -6,7 +6,7 @@ - - QT += widgets network - --include($$PWD/../../../sqlitestudio/SQLiteStudio3/plugins.pri) -+include($$PWD/../../SQLiteStudio3/plugins.pri) - - TARGET = DbAndroid - TEMPLATE = lib ---- a/Plugins/ScriptingTcl/ScriptingTcl.pro -+++ b/Plugins/ScriptingTcl/ScriptingTcl.pro -@@ -35,7 +35,7 @@ linux: { - - # Find tclConfig.sh - TCL_CONFIG_DIR = $$system(echo "puts [info library]" | tclsh) -- TCL_CONFIG = $$TCL_CONFIG_DIR/tclConfig.sh -+ TCL_CONFIG = $$TCL_CONFIG_DIR/../tclConfig.sh - message("Looking for $$TCL_CONFIG") - !exists($$TCL_CONFIG) { - # Debian case diff --git a/dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild deleted file mode 100644 index 21747b2426f6..000000000000 --- a/dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Upstream guide: http://wiki.sqlitestudio.pl/index.php/Compiling_application_from_sources - -EAPI=6 - -inherit qmake-utils fdo-mime kde5-functions - -DESCRIPTION="SQLiteStudio3 is a powerful cross-platform SQLite database manager" -HOMEPAGE="http://sqlitestudio.pl" -LICENSE="GPL-3" -SRC_URI="${HOMEPAGE}/files/sqlitestudio3/complete/tar/${P}.tar.gz" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cli cups tcl test" - -RDEPEND=" - dev-db/sqlite:3 - $(add_qt_dep qtcore) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtscript) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - $(add_qt_dep designer) - cups? ( $(add_qt_dep qtprintsupport) ) - cli? ( sys-libs/readline:= ) - tcl? ( dev-lang/tcl:= ) -" -DEPEND="${RDEPEND} - $(add_qt_dep qtconcurrent) - >=sys-devel/gcc-4.8:* - test? ( $(add_qt_dep qttest) ) -" - -S="${WORKDIR}" -core_build_dir="${S}/output/build" -core_src_dir="${S}/SQLiteStudio3" -plugins_build_dir="${core_build_dir}/Plugins" -plugins_src_dir="${S}/Plugins" - -src_prepare() { - PATCHES=( - "${FILESDIR}"/${PN}-3.0.6-qt5_5-QDataStream.patch - "${FILESDIR}"/${PN}-3.0.6-portable.patch - "${FILESDIR}"/${PN}-3.0.7-paths.patch - ) - default - - disable_modules() { - [ $# -lt 2 ] && return 0 - local file="$1"; shift - - edos2unix "${file}" - - local regex="" - for m in "$@"; do - regex+="\b${m}\b( \\\\|\$)|" - done - regex="${regex:0:-1}" # last pipe - - elog "Disabling modules: '$*' in '${file#${S}/}'" - sed -i -r -e "/${regex}/d" -- "${file}" || return 1 - } - - ## Core - local disabled_modules=( - $(usex cli '' 'cli') - ) - disable_modules "${core_src_dir}/SQLiteStudio3.pro" "${disabled_modules[@]}" || die - - ## Plugins - local disabled_plugins=( - 'DbSqlite2' - $(usex tcl '' 'ScriptingTcl') - $(usex cups '' 'Printing') - ) - disable_modules "${plugins_src_dir}/Plugins.pro" "${disabled_plugins[@]}" || die -} - -src_configure() { - local qmake_args=( - "LIBDIR=${EROOT}usr/$(get_libdir)" - "BINDIR=${EROOT}usr/bin" - "DEFINES+=PLUGINS_DIR=${EROOT}usr/$(get_libdir)/${PN}" - "DEFINES+=ICONS_DIR=${EROOT}usr/share/${PN}/icons" - "DEFINES+=FORMS_DIR=${EROOT}usr/share/${PN}/forms" - - 'DEFINES+=NO_AUTO_UPDATES' # not strictly needed since 3.0.6, but nevermind - $(usex test 'DEFINES+=tests' '') - ) - - ## Core - mkdir -p "${core_build_dir}" && cd "${core_build_dir}" || die - eqmake5 "${qmake_args[@]}" "${core_src_dir}" - - ## Plugins - mkdir -p "${plugins_build_dir}" && cd "${plugins_build_dir}" || die - eqmake5 "${qmake_args[@]}" "${plugins_src_dir}" -} - -src_compile() { - cd "${core_build_dir}" || die && emake - cd "${plugins_build_dir}" || die && emake -} - -src_install() { - cd "${core_build_dir}" || die && emake INSTALL_ROOT="${ED}" install - cd "${plugins_build_dir}" || die && emake INSTALL_ROOT="${ED}" install - - dodoc "${core_src_dir}/docs/sqlitestudio3_docs.cfg" - doicon -s scalable "${core_src_dir}/guiSQLiteStudio/img/${PN}.svg" - - make_desktop_entry_args=( - "${EROOT}usr/bin/${PN} %F" # exec - 'SQLiteStudio3' # name - "${PN}" # icon - 'Development;Utility' # categories - ) - make_desktop_entry_extras=( 'MimeType=application/x-sqlite3;' ) - make_desktop_entry "${make_desktop_entry_args[@]}" \ - "$( printf '%s\n' "${make_desktop_entry_extras[@]}" )" -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} diff --git a/dev-db/sqlitestudio/sqlitestudio-3.2.1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.2.1.ebuild new file mode 100644 index 000000000000..bd8f78a3763d --- /dev/null +++ b/dev-db/sqlitestudio/sqlitestudio-3.2.1.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PLOCALES="de es fr it pl pt_BR ro_RO ru sk zh_CN" + +inherit desktop l10n 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" + +KEYWORDS="~amd64 ~x86" +LICENSE="GPL-3" +SLOT="0" +IUSE="cli cups tcl test" + +REQUIRED_USE="test? ( cli )" + +RDEPEND=" + dev-db/sqlite:3 + dev-qt/qtcore: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= ) + 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 ) +" + +S="${WORKDIR}" +core_build_dir="${S}/output/build" +plugins_build_dir="${core_build_dir}/Plugins" + +src_prepare() { + xdg_src_prepare + + sed -i -e 's/linux|portable/portable/' \ + SQLiteStudio3/sqlitestudio/sqlitestudio.pro || die + + 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 ) + 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 + + prepare_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" + l10n_find_plocales_changes ${ts_dir_main} "sqlitestudio_" '.ts' + l10n_for_each_locale_do prepare_locale + l10n_for_each_disabled_locale_do rm_locale + + # prevent "multilib-strict check failed" with USE test + sed -i -e 's/\(target.*usr\/\)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) + local myqmakeargs=( + "BINDIR=${EPREFIX}/usr/bin" + "LIBDIR=${EPREFIX}/usr/$(get_libdir)" + "QMAKE_CFLAGS_ISYSTEM=\"\"" + $(usex test 'DEFINES+=tests' '') + ) + + ## 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 + + 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;" )" +} -- cgit v1.2.3