1 |
commit: dc2ac9407a2f513b01a2d5728f3d34e9ff08b183 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 14 17:12:37 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 14 18:36:11 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2ac940 |
7 |
|
8 |
dev-db/sqlitestudio: Drop 3.1.1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/674586 |
11 |
Closes: https://bugs.gentoo.org/632406 |
12 |
Package-Manager: Portage-2.3.60, Repoman-2.3.12 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
dev-db/sqlitestudio/Manifest | 1 - |
16 |
.../files/sqlitestudio-3.1.1-qt-5.11.patch | 21 --- |
17 |
dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild | 141 --------------------- |
18 |
3 files changed, 163 deletions(-) |
19 |
|
20 |
diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest |
21 |
index 27b6da151b6..3f2d35cbdf6 100644 |
22 |
--- a/dev-db/sqlitestudio/Manifest |
23 |
+++ b/dev-db/sqlitestudio/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST sqlitestudio-3.1.1.tar.gz 8610037 BLAKE2B 7f0de65a31a8c25da305cb8d73a03f4215a1134c652e6fb68424ae2153afb1e3655ae3360b2c25b863f105a53cd5fb9909d3f8aa5674f25f0e19a080b15dfa97 SHA512 421247730660e8396f692fd8df9366e6ae834633823004ef3cb7c6f3064e66f420f0517df6a8542b800f7f88dacf2fc646b4224b423ab3994c7d8a083e82e143 |
26 |
DIST sqlitestudio-3.2.1.tar.gz 9405867 BLAKE2B 53cd8465a6140cf17c602094cceef2fdf74f513f33257b22e1a3d7adcb9c78d8eb2cdaff047920836a9d98429ba0025924ce608f2eab97319feabf063de4c9ee SHA512 9c07f0dc50bf35ad04d0cb06cfc1a306d3f0aa9446e7d737c8187c63cb7dd2c44fb4b960693f2c30a15ece3aac0878701874a9ce3cebfe0c6bf48df10814a574 |
27 |
|
28 |
diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.1.1-qt-5.11.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.1.1-qt-5.11.patch |
29 |
deleted file mode 100644 |
30 |
index 0de9f4a6115..00000000000 |
31 |
--- a/dev-db/sqlitestudio/files/sqlitestudio-3.1.1-qt-5.11.patch |
32 |
+++ /dev/null |
33 |
@@ -1,21 +0,0 @@ |
34 |
-From 5972e777aeb7e8e127114476c031a681862f8852 Mon Sep 17 00:00:00 2001 |
35 |
-From: =?UTF-8?q?Pawe=C5=82=20Salawa?= <pawelsalawa@×××××.com> |
36 |
-Date: Mon, 18 Jun 2018 23:12:18 +0200 |
37 |
-Subject: [PATCH] #3341 Fixed compilation with Qt 5.11. |
38 |
- |
39 |
---- |
40 |
- SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp | 1 + |
41 |
- 1 file changed, 1 insertion(+) |
42 |
- |
43 |
-diff --git a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp |
44 |
-index 643caa2d..4ca68bce 100644 |
45 |
---- a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp |
46 |
-+++ b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp |
47 |
-@@ -47,6 +47,7 @@ |
48 |
- #include <QInputDialog> |
49 |
- #include <QProgressBar> |
50 |
- #include <QLabel> |
51 |
-+#include <QStyle> |
52 |
- |
53 |
- CFG_KEYS_DEFINE(MainWindow) |
54 |
- MainWindow* MainWindow::instance = nullptr; |
55 |
|
56 |
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild |
57 |
deleted file mode 100644 |
58 |
index 529a1a6f5e4..00000000000 |
59 |
--- a/dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild |
60 |
+++ /dev/null |
61 |
@@ -1,141 +0,0 @@ |
62 |
-# Copyright 1999-2018 Gentoo Foundation |
63 |
-# Distributed under the terms of the GNU General Public License v2 |
64 |
- |
65 |
-EAPI=6 |
66 |
- |
67 |
-PLOCALES="de es fr it pl pt_BR ru sk zh_CN" |
68 |
- |
69 |
-inherit eutils l10n qmake-utils xdg |
70 |
- |
71 |
-DESCRIPTION="Powerful cross-platform SQLite database manager" |
72 |
-HOMEPAGE="https://sqlitestudio.pl" |
73 |
-SRC_URI="https://sqlitestudio.pl/files/sqlitestudio3/complete/tar/${P}.tar.gz" |
74 |
- |
75 |
-KEYWORDS="~amd64 ~x86" |
76 |
-LICENSE="GPL-3" |
77 |
-SLOT="0" |
78 |
-IUSE="cli cups tcl test" |
79 |
- |
80 |
-RDEPEND=" |
81 |
- dev-db/sqlite:3 |
82 |
- dev-qt/qtcore:5 |
83 |
- dev-qt/qtgui:5 |
84 |
- dev-qt/qtnetwork:5 |
85 |
- dev-qt/qtscript:5 |
86 |
- dev-qt/qtsvg:5 |
87 |
- dev-qt/qtwidgets:5 |
88 |
- dev-qt/qtxml:5 |
89 |
- cli? ( sys-libs/readline:* ) |
90 |
- cups? ( dev-qt/qtprintsupport:5 ) |
91 |
- tcl? ( dev-lang/tcl:* ) |
92 |
-" |
93 |
-DEPEND="${RDEPEND} |
94 |
- dev-qt/designer:5 |
95 |
- dev-qt/qtconcurrent:5 |
96 |
- test? ( dev-qt/qttest:5 ) |
97 |
-" |
98 |
- |
99 |
-S="${WORKDIR}" |
100 |
-core_build_dir="${S}/output/build" |
101 |
-plugins_build_dir="${core_build_dir}/Plugins" |
102 |
- |
103 |
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) |
104 |
- |
105 |
-src_prepare() { |
106 |
- xdg_src_prepare |
107 |
- |
108 |
- sed -i -e 's/linux|portable/portable/' \ |
109 |
- SQLiteStudio3/sqlitestudio/sqlitestudio.pro || die |
110 |
- |
111 |
- disable_modules() { |
112 |
- [[ $# -lt 2 ]] && die "not enough arguments" |
113 |
- |
114 |
- local pro="$1"; shift |
115 |
- local modules="${@}" |
116 |
- |
117 |
- sed -r -i \ |
118 |
- -e 's/('${modules// /|}')[[:space:]]*(\\?)/\2/' \ |
119 |
- ${pro} || die |
120 |
- } |
121 |
- |
122 |
- use cli || disable_modules SQLiteStudio3/SQLiteStudio3.pro cli |
123 |
- |
124 |
- local mod_lst=( DbSqlite2 ) |
125 |
- use cups || mod_lst+=( Printing ) |
126 |
- use tcl || mod_lst+=( ScriptingTcl ) |
127 |
- disable_modules Plugins/Plugins.pro ${mod_lst[@]} |
128 |
- |
129 |
- local mylrelease="$(qt5_get_bindir)"/lrelease |
130 |
- local ts_dir_lst=$(find * -type f -name "*.qm" -printf '%h\n' | sort -u) |
131 |
- local ts_pro_lst=$(find * -type f -name "*.pro" -exec grep -l 'TRANSLATIONS' {} \;) |
132 |
- local ts_qrc_lst=$(find * -type f -name "*.qrc" -exec grep -l '\.qm' {} \;) |
133 |
- |
134 |
- # delete all "*.qm" |
135 |
- for ts_dir in ${ts_dir_lst[@]}; do |
136 |
- rm "${ts_dir}"/*.qm || die |
137 |
- done |
138 |
- |
139 |
- prepare_locale() { |
140 |
- for ts_dir in ${ts_dir_lst[@]}; do |
141 |
- local ts=$(find "${ts_dir}" -type f -name "*${1}.ts" || continue) |
142 |
- "${mylrelease}" "${ts}" || die "preparing ${1} locale failed" |
143 |
- done |
144 |
- } |
145 |
- |
146 |
- rm_locale() { |
147 |
- for ts_pro in ${ts_pro_lst[@]}; do |
148 |
- sed -i -r -e 's/[^[:space:]]*'${1}'\.ts//' \ |
149 |
- ${ts_pro} || die |
150 |
- done |
151 |
- |
152 |
- for ts_qrc in ${ts_qrc_lst[@]}; do |
153 |
- sed -i -e '/'${1}'\.qm/d' \ |
154 |
- ${ts_qrc} || die |
155 |
- done |
156 |
- } |
157 |
- |
158 |
- local ts_dir_main="SQLiteStudio3/sqlitestudio/translations" |
159 |
- l10n_find_plocales_changes ${ts_dir_main} "sqlitestudio_" '.ts' |
160 |
- l10n_for_each_locale_do prepare_locale |
161 |
- l10n_for_each_disabled_locale_do rm_locale |
162 |
-} |
163 |
- |
164 |
-src_configure() { |
165 |
- # NOTE: QMAKE_CFLAGS_ISYSTEM option prevents |
166 |
- # build error with tcl use enabled (stdlib.h is missing) |
167 |
- local myqmakeargs=( |
168 |
- "BINDIR=${EPREFIX}/usr/bin" |
169 |
- "LIBDIR=${EPREFIX}/usr/$(get_libdir)" |
170 |
- "QMAKE_CFLAGS_ISYSTEM=\"\"" |
171 |
- $(usex test 'DEFINES+=tests' '') |
172 |
- ) |
173 |
- |
174 |
- ## Core |
175 |
- mkdir -p "${core_build_dir}" && cd "${core_build_dir}" || die |
176 |
- eqmake5 "${myqmakeargs[@]}" "${S}/SQLiteStudio3" |
177 |
- |
178 |
- ## Plugins |
179 |
- mkdir -p "${plugins_build_dir}" && cd "${plugins_build_dir}" || die |
180 |
- eqmake5 "${myqmakeargs[@]}" "${S}/Plugins" |
181 |
-} |
182 |
- |
183 |
-src_compile() { |
184 |
- emake -C "${core_build_dir}" |
185 |
- emake -C "${plugins_build_dir}" |
186 |
-} |
187 |
- |
188 |
-src_install() { |
189 |
- emake -C "${core_build_dir}" INSTALL_ROOT="${D}" install |
190 |
- emake -C "${plugins_build_dir}" INSTALL_ROOT="${D}" install |
191 |
- |
192 |
- doicon -s scalable "SQLiteStudio3/guiSQLiteStudio/img/${PN}.svg" |
193 |
- |
194 |
- local make_desktop_entry_args=( |
195 |
- "${PN} -- %F" |
196 |
- 'SQLiteStudio3' |
197 |
- "${PN}" |
198 |
- 'Development;Database;Utility' |
199 |
- ) |
200 |
- make_desktop_entry "${make_desktop_entry_args[@]}" \ |
201 |
- "$( printf '%s\n' "MimeType=application/x-sqlite3;" )" |
202 |
-} |