From 2168560c5ae69247cd1b55faf7973501b6d2b0d9 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 3 Feb 2019 16:43:59 +0100 Subject: dev-db/sqlitestudio: Drop 3.0.7 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner --- dev-db/sqlitestudio/Manifest | 1 - .../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 --------------------- 5 files changed, 194 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 diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest index 5162c98345f5..27b6da151b67 100644 --- a/dev-db/sqlitestudio/Manifest +++ b/dev-db/sqlitestudio/Manifest @@ -1,3 +1,2 @@ -DIST sqlitestudio-3.0.7.tar.gz 2551341 BLAKE2B b499aac9d251b9682c241e37c30f52d6fce65bc317ee39022e385d2535e2e62b9213bc72941236fcb355d0f8a56924f9d28d32db9937a0af6e7a0cfb05252763 SHA512 2171fe26754aed2abe24d73e9ccc2ee1abe5e87228096bc5643c5638ad578dc323b810535f41d0206b3d7a7aa75132bfb578972c7945b962dd593543c7da3270 DIST sqlitestudio-3.1.1.tar.gz 8610037 BLAKE2B 7f0de65a31a8c25da305cb8d73a03f4215a1134c652e6fb68424ae2153afb1e3655ae3360b2c25b863f105a53cd5fb9909d3f8aa5674f25f0e19a080b15dfa97 SHA512 421247730660e8396f692fd8df9366e6ae834633823004ef3cb7c6f3064e66f420f0517df6a8542b800f7f88dacf2fc646b4224b423ab3994c7d8a083e82e143 DIST sqlitestudio-3.2.1.tar.gz 9405867 BLAKE2B 53cd8465a6140cf17c602094cceef2fdf74f513f33257b22e1a3d7adcb9c78d8eb2cdaff047920836a9d98429ba0025924ce608f2eab97319feabf063de4c9ee SHA512 9c07f0dc50bf35ad04d0cb06cfc1a306d3f0aa9446e7d737c8187c63cb7dd2c44fb4b960693f2c30a15ece3aac0878701874a9ce3cebfe0c6bf48df10814a574 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 -} -- cgit v1.2.3-65-gdbad