| 1 |
commit: 2168560c5ae69247cd1b55faf7973501b6d2b0d9 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 3 15:43:59 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 3 16:14:14 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2168560c |
| 7 |
|
| 8 |
dev-db/sqlitestudio: Drop 3.0.7 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-db/sqlitestudio/Manifest | 1 - |
| 14 |
.../files/sqlitestudio-3.0.6-portable.patch | 11 -- |
| 15 |
.../sqlitestudio-3.0.6-qt5_5-QDataStream.patch | 30 ----- |
| 16 |
.../files/sqlitestudio-3.0.7-paths.patch | 22 ---- |
| 17 |
dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild | 130 --------------------- |
| 18 |
5 files changed, 194 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest |
| 21 |
index 5162c98345f..27b6da151b6 100644 |
| 22 |
--- a/dev-db/sqlitestudio/Manifest |
| 23 |
+++ b/dev-db/sqlitestudio/Manifest |
| 24 |
@@ -1,3 +1,2 @@ |
| 25 |
-DIST sqlitestudio-3.0.7.tar.gz 2551341 BLAKE2B b499aac9d251b9682c241e37c30f52d6fce65bc317ee39022e385d2535e2e62b9213bc72941236fcb355d0f8a56924f9d28d32db9937a0af6e7a0cfb05252763 SHA512 2171fe26754aed2abe24d73e9ccc2ee1abe5e87228096bc5643c5638ad578dc323b810535f41d0206b3d7a7aa75132bfb578972c7945b962dd593543c7da3270 |
| 26 |
DIST sqlitestudio-3.1.1.tar.gz 8610037 BLAKE2B 7f0de65a31a8c25da305cb8d73a03f4215a1134c652e6fb68424ae2153afb1e3655ae3360b2c25b863f105a53cd5fb9909d3f8aa5674f25f0e19a080b15dfa97 SHA512 421247730660e8396f692fd8df9366e6ae834633823004ef3cb7c6f3064e66f420f0517df6a8542b800f7f88dacf2fc646b4224b423ab3994c7d8a083e82e143 |
| 27 |
DIST sqlitestudio-3.2.1.tar.gz 9405867 BLAKE2B 53cd8465a6140cf17c602094cceef2fdf74f513f33257b22e1a3d7adcb9c78d8eb2cdaff047920836a9d98429ba0025924ce608f2eab97319feabf063de4c9ee SHA512 9c07f0dc50bf35ad04d0cb06cfc1a306d3f0aa9446e7d737c8187c63cb7dd2c44fb4b960693f2c30a15ece3aac0878701874a9ce3cebfe0c6bf48df10814a574 |
| 28 |
|
| 29 |
diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-portable.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-portable.patch |
| 30 |
deleted file mode 100644 |
| 31 |
index 558a84231b8..00000000000 |
| 32 |
--- a/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-portable.patch |
| 33 |
+++ /dev/null |
| 34 |
@@ -1,11 +0,0 @@ |
| 35 |
---- a/SQLiteStudio3/sqlitestudio/sqlitestudio.pro 2015-11-24 20:09:29.000000000 +0100 |
| 36 |
-+++ b/SQLiteStudio3/sqlitestudio/sqlitestudio.pro 2016-01-20 15:04:46.700926391 +0100 |
| 37 |
-@@ -25,7 +25,7 @@ |
| 38 |
- |
| 39 |
- CONFIG += c++11 |
| 40 |
- QMAKE_CXXFLAGS += -pedantic |
| 41 |
--linux|portable { |
| 42 |
-+portable { |
| 43 |
- QMAKE_LFLAGS += -Wl,-rpath,./lib |
| 44 |
- } |
| 45 |
- |
| 46 |
|
| 47 |
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 |
| 48 |
deleted file mode 100644 |
| 49 |
index c42160c52f0..00000000000 |
| 50 |
--- a/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-qt5_5-QDataStream.patch |
| 51 |
+++ /dev/null |
| 52 |
@@ -1,30 +0,0 @@ |
| 53 |
---- a/SQLiteStudio3/coreSQLiteStudio/db/db.cpp 2015-05-11 23:22:41.000000000 +0200 |
| 54 |
-+++ b/SQLiteStudio3/coreSQLiteStudio/db/db.cpp 2016-01-20 02:21:00.350160645 +0100 |
| 55 |
-@@ -1,6 +1,7 @@ |
| 56 |
- #include "db.h" |
| 57 |
- #include <QMetaEnum> |
| 58 |
- #include <QDebug> |
| 59 |
-+#include <QDataStream> |
| 60 |
- |
| 61 |
- Db::Db() |
| 62 |
- { |
| 63 |
---- a/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp 2015-05-11 23:22:41.000000000 +0200 |
| 64 |
-+++ b/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp 2016-01-20 01:46:22.113263710 +0100 |
| 65 |
-@@ -11,6 +11,7 @@ |
| 66 |
- #include <QDebug> |
| 67 |
- #include <QRegularExpression> |
| 68 |
- #include <QDir> |
| 69 |
-+#include <QDataStream> |
| 70 |
- |
| 71 |
- #ifdef Q_OS_LINUX |
| 72 |
- #include <sys/utsname.h> |
| 73 |
---- a/SQLiteStudio3/sqlitestudiocli/cli_config.h 2015-05-11 23:22:40.000000000 +0200 |
| 74 |
-+++ b/SQLiteStudio3/sqlitestudiocli/cli_config.h 2016-01-20 02:45:11.393819294 +0100 |
| 75 |
-@@ -2,6 +2,7 @@ |
| 76 |
- #define CLI_CONFIG_H |
| 77 |
- |
| 78 |
- #include "config_builder.h" |
| 79 |
-+#include <QDataStream> |
| 80 |
- |
| 81 |
- namespace CliResultsDisplay |
| 82 |
- { |
| 83 |
|
| 84 |
diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.0.7-paths.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.0.7-paths.patch |
| 85 |
deleted file mode 100644 |
| 86 |
index 59d8c0f187a..00000000000 |
| 87 |
--- a/dev-db/sqlitestudio/files/sqlitestudio-3.0.7-paths.patch |
| 88 |
+++ /dev/null |
| 89 |
@@ -1,22 +0,0 @@ |
| 90 |
---- a/Plugins/DbAndroid/DbAndroid.pro 2015-11-24 20:09:41.000000000 +0100 |
| 91 |
-+++ a/Plugins/DbAndroid/DbAndroid.pro 2016-01-20 13:39:02.436869035 +0100 |
| 92 |
-@@ -6,7 +6,7 @@ |
| 93 |
- |
| 94 |
- QT += widgets network |
| 95 |
- |
| 96 |
--include($$PWD/../../../sqlitestudio/SQLiteStudio3/plugins.pri) |
| 97 |
-+include($$PWD/../../SQLiteStudio3/plugins.pri) |
| 98 |
- |
| 99 |
- TARGET = DbAndroid |
| 100 |
- TEMPLATE = lib |
| 101 |
---- a/Plugins/ScriptingTcl/ScriptingTcl.pro |
| 102 |
-+++ b/Plugins/ScriptingTcl/ScriptingTcl.pro |
| 103 |
-@@ -35,7 +35,7 @@ linux: { |
| 104 |
- |
| 105 |
- # Find tclConfig.sh |
| 106 |
- TCL_CONFIG_DIR = $$system(echo "puts [info library]" | tclsh) |
| 107 |
-- TCL_CONFIG = $$TCL_CONFIG_DIR/tclConfig.sh |
| 108 |
-+ TCL_CONFIG = $$TCL_CONFIG_DIR/../tclConfig.sh |
| 109 |
- message("Looking for $$TCL_CONFIG") |
| 110 |
- !exists($$TCL_CONFIG) { |
| 111 |
- # Debian case |
| 112 |
|
| 113 |
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild |
| 114 |
deleted file mode 100644 |
| 115 |
index 21747b2426f..00000000000 |
| 116 |
--- a/dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild |
| 117 |
+++ /dev/null |
| 118 |
@@ -1,130 +0,0 @@ |
| 119 |
-# Copyright 1999-2016 Gentoo Foundation |
| 120 |
-# Distributed under the terms of the GNU General Public License v2 |
| 121 |
- |
| 122 |
-# Upstream guide: http://wiki.sqlitestudio.pl/index.php/Compiling_application_from_sources |
| 123 |
- |
| 124 |
-EAPI=6 |
| 125 |
- |
| 126 |
-inherit qmake-utils fdo-mime kde5-functions |
| 127 |
- |
| 128 |
-DESCRIPTION="SQLiteStudio3 is a powerful cross-platform SQLite database manager" |
| 129 |
-HOMEPAGE="http://sqlitestudio.pl" |
| 130 |
-LICENSE="GPL-3" |
| 131 |
-SRC_URI="${HOMEPAGE}/files/sqlitestudio3/complete/tar/${P}.tar.gz" |
| 132 |
- |
| 133 |
-SLOT="0" |
| 134 |
-KEYWORDS="~amd64 ~x86" |
| 135 |
-IUSE="cli cups tcl test" |
| 136 |
- |
| 137 |
-RDEPEND=" |
| 138 |
- dev-db/sqlite:3 |
| 139 |
- $(add_qt_dep qtcore) |
| 140 |
- $(add_qt_dep qtgui) |
| 141 |
- $(add_qt_dep qtnetwork) |
| 142 |
- $(add_qt_dep qtscript) |
| 143 |
- $(add_qt_dep qtsvg) |
| 144 |
- $(add_qt_dep qtwidgets) |
| 145 |
- $(add_qt_dep qtxml) |
| 146 |
- $(add_qt_dep designer) |
| 147 |
- cups? ( $(add_qt_dep qtprintsupport) ) |
| 148 |
- cli? ( sys-libs/readline:= ) |
| 149 |
- tcl? ( dev-lang/tcl:= ) |
| 150 |
-" |
| 151 |
-DEPEND="${RDEPEND} |
| 152 |
- $(add_qt_dep qtconcurrent) |
| 153 |
- >=sys-devel/gcc-4.8:* |
| 154 |
- test? ( $(add_qt_dep qttest) ) |
| 155 |
-" |
| 156 |
- |
| 157 |
-S="${WORKDIR}" |
| 158 |
-core_build_dir="${S}/output/build" |
| 159 |
-core_src_dir="${S}/SQLiteStudio3" |
| 160 |
-plugins_build_dir="${core_build_dir}/Plugins" |
| 161 |
-plugins_src_dir="${S}/Plugins" |
| 162 |
- |
| 163 |
-src_prepare() { |
| 164 |
- PATCHES=( |
| 165 |
- "${FILESDIR}"/${PN}-3.0.6-qt5_5-QDataStream.patch |
| 166 |
- "${FILESDIR}"/${PN}-3.0.6-portable.patch |
| 167 |
- "${FILESDIR}"/${PN}-3.0.7-paths.patch |
| 168 |
- ) |
| 169 |
- default |
| 170 |
- |
| 171 |
- disable_modules() { |
| 172 |
- [ $# -lt 2 ] && return 0 |
| 173 |
- local file="$1"; shift |
| 174 |
- |
| 175 |
- edos2unix "${file}" |
| 176 |
- |
| 177 |
- local regex="" |
| 178 |
- for m in "$@"; do |
| 179 |
- regex+="\b${m}\b( \\\\|\$)|" |
| 180 |
- done |
| 181 |
- regex="${regex:0:-1}" # last pipe |
| 182 |
- |
| 183 |
- elog "Disabling modules: '$*' in '${file#${S}/}'" |
| 184 |
- sed -i -r -e "/${regex}/d" -- "${file}" || return 1 |
| 185 |
- } |
| 186 |
- |
| 187 |
- ## Core |
| 188 |
- local disabled_modules=( |
| 189 |
- $(usex cli '' 'cli') |
| 190 |
- ) |
| 191 |
- disable_modules "${core_src_dir}/SQLiteStudio3.pro" "${disabled_modules[@]}" || die |
| 192 |
- |
| 193 |
- ## Plugins |
| 194 |
- local disabled_plugins=( |
| 195 |
- 'DbSqlite2' |
| 196 |
- $(usex tcl '' 'ScriptingTcl') |
| 197 |
- $(usex cups '' 'Printing') |
| 198 |
- ) |
| 199 |
- disable_modules "${plugins_src_dir}/Plugins.pro" "${disabled_plugins[@]}" || die |
| 200 |
-} |
| 201 |
- |
| 202 |
-src_configure() { |
| 203 |
- local qmake_args=( |
| 204 |
- "LIBDIR=${EROOT}usr/$(get_libdir)" |
| 205 |
- "BINDIR=${EROOT}usr/bin" |
| 206 |
- "DEFINES+=PLUGINS_DIR=${EROOT}usr/$(get_libdir)/${PN}" |
| 207 |
- "DEFINES+=ICONS_DIR=${EROOT}usr/share/${PN}/icons" |
| 208 |
- "DEFINES+=FORMS_DIR=${EROOT}usr/share/${PN}/forms" |
| 209 |
- |
| 210 |
- 'DEFINES+=NO_AUTO_UPDATES' # not strictly needed since 3.0.6, but nevermind |
| 211 |
- $(usex test 'DEFINES+=tests' '') |
| 212 |
- ) |
| 213 |
- |
| 214 |
- ## Core |
| 215 |
- mkdir -p "${core_build_dir}" && cd "${core_build_dir}" || die |
| 216 |
- eqmake5 "${qmake_args[@]}" "${core_src_dir}" |
| 217 |
- |
| 218 |
- ## Plugins |
| 219 |
- mkdir -p "${plugins_build_dir}" && cd "${plugins_build_dir}" || die |
| 220 |
- eqmake5 "${qmake_args[@]}" "${plugins_src_dir}" |
| 221 |
-} |
| 222 |
- |
| 223 |
-src_compile() { |
| 224 |
- cd "${core_build_dir}" || die && emake |
| 225 |
- cd "${plugins_build_dir}" || die && emake |
| 226 |
-} |
| 227 |
- |
| 228 |
-src_install() { |
| 229 |
- cd "${core_build_dir}" || die && emake INSTALL_ROOT="${ED}" install |
| 230 |
- cd "${plugins_build_dir}" || die && emake INSTALL_ROOT="${ED}" install |
| 231 |
- |
| 232 |
- dodoc "${core_src_dir}/docs/sqlitestudio3_docs.cfg" |
| 233 |
- doicon -s scalable "${core_src_dir}/guiSQLiteStudio/img/${PN}.svg" |
| 234 |
- |
| 235 |
- make_desktop_entry_args=( |
| 236 |
- "${EROOT}usr/bin/${PN} %F" # exec |
| 237 |
- 'SQLiteStudio3' # name |
| 238 |
- "${PN}" # icon |
| 239 |
- 'Development;Utility' # categories |
| 240 |
- ) |
| 241 |
- make_desktop_entry_extras=( 'MimeType=application/x-sqlite3;' ) |
| 242 |
- make_desktop_entry "${make_desktop_entry_args[@]}" \ |
| 243 |
- "$( printf '%s\n' "${make_desktop_entry_extras[@]}" )" |
| 244 |
-} |
| 245 |
- |
| 246 |
-pkg_postinst() { |
| 247 |
- fdo-mime_desktop_database_update |
| 248 |
-} |
Archives