* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitestudio/files/, dev-db/sqlitestudio/
@ 2016-03-19 23:01 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2016-03-19 23:01 UTC (permalink / raw
To: gentoo-commits
commit: 803b02d956be4bb28d1a27465e86ab9a0ef09eef
Author: Jan Chren <dev.rindeal <AT> gmail <DOT> com>
AuthorDate: Sat Mar 19 18:41:10 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 22:47:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=803b02d9
dev-db/sqlitestudio: new package
Closes: https://github.com/gentoo/gentoo/pull/1088
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/metadata.xml | 16 +++
dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild | 132 +++++++++++++++++++++
6 files changed, 212 insertions(+)
diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest
new file mode 100644
index 0000000..b2ec9bd
--- /dev/null
+++ b/dev-db/sqlitestudio/Manifest
@@ -0,0 +1 @@
+DIST sqlitestudio-3.0.7.tar.gz 2551341 SHA256 b5ad7ac22a88eacb9404637ca6257934d0b1b59e16a182099bbdb158a7af55aa SHA512 2171fe26754aed2abe24d73e9ccc2ee1abe5e87228096bc5643c5638ad578dc323b810535f41d0206b3d7a7aa75132bfb578972c7945b962dd593543c7da3270 WHIRLPOOL 6078575b9bf6576d76965b2cf0c7a47a3b56488be8a75dd2df00b58cfab9d29e98ca30d21ac0dd47fe9a6fb0243052107b74686d90b12b9b2fbff05bc205736f
diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-portable.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-portable.patch
new file mode 100644
index 0000000..558a842
--- /dev/null
+++ b/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-portable.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 0000000..c42160c
--- /dev/null
+++ b/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-qt5_5-QDataStream.patch
@@ -0,0 +1,30 @@
+--- 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 <QMetaEnum>
+ #include <QDebug>
++#include <QDataStream>
+
+ 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 <QDebug>
+ #include <QRegularExpression>
+ #include <QDir>
++#include <QDataStream>
+
+ #ifdef Q_OS_LINUX
+ #include <sys/utsname.h>
+--- 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 <QDataStream>
+
+ 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
new file mode 100644
index 0000000..59d8c0f
--- /dev/null
+++ b/dev-db/sqlitestudio/files/sqlitestudio-3.0.7-paths.patch
@@ -0,0 +1,22 @@
+--- 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/metadata.xml b/dev-db/sqlitestudio/metadata.xml
new file mode 100644
index 0000000..1ae1175
--- /dev/null
+++ b/dev-db/sqlitestudio/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>dev.rindeal+bugs.gentoo.org@gmail.com</email>
+ <name>Jan Chren (rindeal)</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
+<use>
+ <flag name="cli">Build CLI interface</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild
new file mode 100644
index 0000000..d8d788a
--- /dev/null
+++ b/dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# 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"
+
+QT_MINIMAL=5.3
+
+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}
+ >=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}" && emake
+ cd "${plugins_build_dir}" && emake
+}
+
+src_install() {
+ cd "${core_build_dir}" && emake INSTALL_ROOT="${ED}" install
+ cd "${plugins_build_dir}" && 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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitestudio/files/, dev-db/sqlitestudio/
@ 2018-09-15 14:22 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-09-15 14:22 UTC (permalink / raw
To: gentoo-commits
commit: ef9b4a902a7f556b5eb72e47ffce109bf75f9253
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 14:10:00 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 14:21:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef9b4a90
dev-db/sqlitestudio: Fix build with Qt 5.11
Doing it myself then.
Closes: https://bugs.gentoo.org/662968
Package-Manager: Portage-2.3.49, Repoman-2.3.10
.../files/sqlitestudio-3.1.1-qt-5.11.patch | 21 +++++++++++++++++++++
dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild | 4 +++-
2 files changed, 24 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000000..0de9f4a6115
--- /dev/null
+++ b/dev-db/sqlitestudio/files/sqlitestudio-3.1.1-qt-5.11.patch
@@ -0,0 +1,21 @@
+From 5972e777aeb7e8e127114476c031a681862f8852 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pawe=C5=82=20Salawa?= <pawelsalawa@gmail.com>
+Date: Mon, 18 Jun 2018 23:12:18 +0200
+Subject: [PATCH] #3341 Fixed compilation with Qt 5.11.
+
+---
+ SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
+index 643caa2d..4ca68bce 100644
+--- a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
++++ b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
+@@ -47,6 +47,7 @@
+ #include <QInputDialog>
+ #include <QProgressBar>
+ #include <QLabel>
++#include <QStyle>
+
+ CFG_KEYS_DEFINE(MainWindow)
+ MainWindow* MainWindow::instance = nullptr;
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild
index 5c183c9c63d..529a1a6f5e4 100644
--- a/dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild
+++ b/dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -39,6 +39,8 @@ S="${WORKDIR}"
core_build_dir="${S}/output/build"
plugins_build_dir="${core_build_dir}/Plugins"
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
src_prepare() {
xdg_src_prepare
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitestudio/files/, dev-db/sqlitestudio/
@ 2019-02-03 16:14 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-02-03 16:14 UTC (permalink / raw
To: gentoo-commits
commit: 2168560c5ae69247cd1b55faf7973501b6d2b0d9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 3 15:43:59 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 3 16:14:14 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2168560c
dev-db/sqlitestudio: Drop 3.0.7
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
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(-)
diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest
index 5162c98345f..27b6da151b6 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 558a84231b8..00000000000
--- 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 c42160c52f0..00000000000
--- 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 <QMetaEnum>
- #include <QDebug>
-+#include <QDataStream>
-
- 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 <QDebug>
- #include <QRegularExpression>
- #include <QDir>
-+#include <QDataStream>
-
- #ifdef Q_OS_LINUX
- #include <sys/utsname.h>
---- 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 <QDataStream>
-
- 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 59d8c0f187a..00000000000
--- 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 21747b2426f..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitestudio/files/, dev-db/sqlitestudio/
@ 2019-02-14 18:37 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-02-14 18:37 UTC (permalink / raw
To: gentoo-commits
commit: dc2ac9407a2f513b01a2d5728f3d34e9ff08b183
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 17:12:37 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 18:36:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2ac940
dev-db/sqlitestudio: Drop 3.1.1
Closes: https://bugs.gentoo.org/674586
Closes: https://bugs.gentoo.org/632406
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-db/sqlitestudio/Manifest | 1 -
.../files/sqlitestudio-3.1.1-qt-5.11.patch | 21 ---
dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild | 141 ---------------------
3 files changed, 163 deletions(-)
diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest
index 27b6da151b6..3f2d35cbdf6 100644
--- a/dev-db/sqlitestudio/Manifest
+++ b/dev-db/sqlitestudio/Manifest
@@ -1,2 +1 @@
-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.1.1-qt-5.11.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.1.1-qt-5.11.patch
deleted file mode 100644
index 0de9f4a6115..00000000000
--- a/dev-db/sqlitestudio/files/sqlitestudio-3.1.1-qt-5.11.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 5972e777aeb7e8e127114476c031a681862f8852 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Pawe=C5=82=20Salawa?= <pawelsalawa@gmail.com>
-Date: Mon, 18 Jun 2018 23:12:18 +0200
-Subject: [PATCH] #3341 Fixed compilation with Qt 5.11.
-
----
- SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
-index 643caa2d..4ca68bce 100644
---- a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
-+++ b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
-@@ -47,6 +47,7 @@
- #include <QInputDialog>
- #include <QProgressBar>
- #include <QLabel>
-+#include <QStyle>
-
- CFG_KEYS_DEFINE(MainWindow)
- MainWindow* MainWindow::instance = nullptr;
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild
deleted file mode 100644
index 529a1a6f5e4..00000000000
--- a/dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="de es fr it pl pt_BR ru sk zh_CN"
-
-inherit eutils 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"
-
-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:* )
- cups? ( dev-qt/qtprintsupport:5 )
- tcl? ( dev-lang/tcl:* )
-"
-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"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-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
-}
-
-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;" )"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitestudio/files/, dev-db/sqlitestudio/
@ 2023-02-17 9:45 Viorel Munteanu
0 siblings, 0 replies; 5+ messages in thread
From: Viorel Munteanu @ 2023-02-17 9:45 UTC (permalink / raw
To: gentoo-commits
commit: 1cdd81378ca0682a6dd00dd9181bba818d7b39bc
Author: Onkobu Tanaake <onkobu <AT> onkobutanaake <DOT> de>
AuthorDate: Sun Jan 1 20:35:52 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 09:44:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cdd8137
dev-db/sqlitestudio: bump 3.4.3
- drop unnecessary sed invocation
- introduce USE python
- ncurses fix is not necessary anymore, dependency was removed/ unnecessary
- drop 3.2.1, source could not be downloaded anymore
- add patch to fix linking of python
- update manifest
- Copyright
- sed expression must fix all paths
- delete test artifacts/ avoid installation
Signed-off-by: Onkobu Tanaake <onkobu <AT> onkobutanaake.de>
Reported-by: Onkobu Tanaake <onkobu <AT> onkobutanaake.de>
Closes: https://github.com/gentoo/gentoo/pull/28930
Closes: https://bugs.gentoo.org/889314
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
dev-db/sqlitestudio/Manifest | 2 +-
.../files/sqlitestudio-3.4.3-fix-python.patch | 13 ++++
...o-3.2.1-r1.ebuild => sqlitestudio-3.4.3.ebuild} | 76 ++++++++++++++++------
3 files changed, 71 insertions(+), 20 deletions(-)
diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest
index 7c5ddd701a4e..7430f3aa492c 100644
--- a/dev-db/sqlitestudio/Manifest
+++ b/dev-db/sqlitestudio/Manifest
@@ -1,2 +1,2 @@
-DIST sqlitestudio-3.2.1.tar.gz 9405867 BLAKE2B 53cd8465a6140cf17c602094cceef2fdf74f513f33257b22e1a3d7adcb9c78d8eb2cdaff047920836a9d98429ba0025924ce608f2eab97319feabf063de4c9ee SHA512 9c07f0dc50bf35ad04d0cb06cfc1a306d3f0aa9446e7d737c8187c63cb7dd2c44fb4b960693f2c30a15ece3aac0878701874a9ce3cebfe0c6bf48df10814a574
DIST sqlitestudio-3.3.3.tar.gz 8863232 BLAKE2B 1dfa74ab405ec057090f87726c3562470de4c1fd7b97c0fbc3e3fb4b3c8413825ec1884ac8bc9cb86e0d3d64b42af323a46ae4aa324de98c1dc8e967a4eb0d35 SHA512 1b92b06dbca3b5ee051d2582345c0e9a0a3cbd2cbbde0c6b9b18f75ca30140c777746fc9d35a3c314c13d99300dbe8d9bbd313b2ae4cb069b8e81446b27e982f
+DIST sqlitestudio-3.4.3.tar.gz 16115078 BLAKE2B ac083ea53276a87917a532359c5f3eae665140e04efe01c8172fbcb135df65f4128a6b09b96f781c411e3b105f47a2c30172e37ab1bd82be32a36027c75770d9 SHA512 5261bd9c5a7e5be3e140eefda45961dc1978b6d1f9f180a8db07671acc55d275c0f2755a580f57681b17fe233ef54b2680a633693c1ec62d3517e4f968e80549
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/sqlitestudio-3.2.1-r1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.4.3.ebuild
similarity index 67%
rename from dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
rename to dev-db/sqlitestudio/sqlitestudio-3.4.3.ebuild
index 6477a98ac404..1e3253c24a3a 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"
@@ -132,6 +164,12 @@ src_compile() {
}
src_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
+
emake -C "${core_build_dir}" INSTALL_ROOT="${D}" install
emake -C "${plugins_build_dir}" INSTALL_ROOT="${D}" install
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-02-17 9:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-15 14:22 [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitestudio/files/, dev-db/sqlitestudio/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-02-17 9:45 Viorel Munteanu
2019-02-14 18:37 Andreas Sturmlechner
2019-02-03 16:14 Andreas Sturmlechner
2016-03-19 23:01 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox