* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/
@ 2016-11-15 22:29 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2016-11-15 22:29 UTC (permalink / raw
To: gentoo-commits
commit: 58c9ff528235a3b483358f53f31e9cb75df0cf62
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Oct 22 18:52:26 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 22:28:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58c9ff52
dev-db/sqlitebrowser: 3.9.1 version bump
Gentoo-bug: 596884
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2793
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-db/sqlitebrowser/Manifest | 1 +
.../files/sqlitebrowser-3.9.1-cmake.patch | 24 +++++++++
dev-db/sqlitebrowser/sqlitebrowser-3.9.1.ebuild | 61 ++++++++++++++++++++++
3 files changed, 86 insertions(+)
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 62d26f5..8b97346 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,2 +1,3 @@
DIST sqlitebrowser-3.7.0.tar.gz 1509766 SHA256 3093a1dcf5b3138c1adf29857d62249ab2b068e70b001869a31151763e28cc3a SHA512 f4c2f517a0b04fb74d8ec656e34f93d467a233040b36fab8f6f172681eb213be5c08131ecdaaa542d833bf24ef564d8e6f800e861b9a20d53de7a585aa104533 WHIRLPOOL 3bbfaa99f179c10f542d344ce6fe55656aa750a52925b2de590e2ba24bcafa95604646e6b218bca4f461390268de2bc2fb29d0de1deaf06438b33cb660e614e8
DIST sqlitebrowser-3.8.0.tar.gz 1538043 SHA256 f638a751bccde4bf0305a75685e2a72d26fc3e3a69d7e15fd84573f88c1a4d92 SHA512 6e262e3bd3b26a1574a69cc9f306774cc9fe69f87c3253aba6b40c35f2491bc0636b6d5e705526e039ee9d8ed27d21a4529a624d62e8879a3917cfb502a65589 WHIRLPOOL 35d3594643a65e6b69bec816430dab3017c3ba197a12ab56ed9f027525db02a635789fda723bbd823d2f66b3933ee2381181ea7e95151be515cf1ddceeb9c8f9
+DIST sqlitebrowser-3.9.1.tar.gz 1704713 SHA256 d0d2e06a69927ba1d0b955f3261ce70c61befc5bd5ddaa06752dae8bb4219ed8 SHA512 c1e88063fac864f60a9802ae378e13d6f3a09e2f4e71e50c6abca4967a941c444a64617bad2dfc743cf9a6be554af9c73e4c61533300ed9a51652234ffdbd225 WHIRLPOOL 50c27ef3405573806e3c8939b69652f25896b9281b59d609cd3210faeb793d707d11ecdea4dada045eb4aa4da375327669566f71ecdbd151f669be1c2419a197
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch
new file mode 100644
index 00000000..cf1cde6
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch
@@ -0,0 +1,24 @@
+From 2563d678681fa6972674b47617015cb2515bd414 Mon Sep 17 00:00:00 2001
+From: Martin Kleusberg <mkleusberg@gmail.com>
+Date: Wed, 12 Oct 2016 23:26:56 +0200
+Subject: [PATCH] Fix cmake file
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 998c2f4..4c5debd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.7)
+
+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
+
+-OPTION(USE_QT5 FALSE "Build with qt5")
+-OPTION(ENABLE_TESTING FALSE "Enable the unit tests")
++OPTION(USE_QT5 "Build with qt5" OFF)
++OPTION(ENABLE_TESTING "Enable the unit tests" OFF)
+
+ if(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE "Release")
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.9.1.ebuild
new file mode 100644
index 00000000..c8415a6
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.9.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils eutils
+
+DESCRIPTION="SQLite Database Browser"
+HOMEPAGE="http://sqlitebrowser.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-cpp/antlr-cpp:2
+ dev-db/sqlite:3
+ dev-libs/qcustomplot[qt5]
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ x11-libs/qscintilla
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+ test? ( dev-qt/qttest:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.7.0-unbundle.patch
+ "${FILESDIR}"/${PN}-3.9.1-cmake.patch
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+ # https://github.com/qingfengxia/qhexedit still bundled
+ # x11-libs/qscintilla[qt4?,qt5?] still bundled
+ find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
+
+ sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
+
+ if ! use test; then
+ sed -e "/qt5_use_modules/ s/ Test//" -i CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_QT5=ON
+ -DENABLE_TESTING=$(usex test)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ doicon images/sqlitebrowser.svg
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/
@ 2017-12-11 9:05 Michael Weber
0 siblings, 0 replies; 7+ messages in thread
From: Michael Weber @ 2017-12-11 9:05 UTC (permalink / raw
To: gentoo-commits
commit: 6d1f62107c04fdeacd0471e901cd60af99ffeac4
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 11 09:05:08 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 09:05:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d1f6210
dev-db/sqlitebrowser: Version bump, thanks @jok-ts, @a17r et al.
Reported-by: Anton Bolshakov <blshkv <AT> pentoo.ch>
Suggested-by: Jouni Kosonen <jouni.kosonen <AT> tukesoft.com>
Closes: https://bugs.gentoo.org/633412
Closes: https://github.com/gentoo/gentoo/pull/6322
Package-Manager: Portage-2.3.17, Repoman-2.3.6
dev-db/sqlitebrowser/Manifest | 1 +
.../files/sqlitebrowser-3.10.1-unbundle.patch | 59 ++++++++++++++++++++++
dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild | 59 ++++++++++++++++++++++
3 files changed, 119 insertions(+)
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 3815a86c48c..9b89c8bd849 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1 +1,2 @@
+DIST sqlitebrowser-3.10.1.tar.gz 1992186 BLAKE2B 105333118a404aab48abe5ecbe83b425109b60adf40d3a3b7766c7036954996539bd133da4b3e3b1e2d819223842d107710b6b24aada6bb298462e062296dabf SHA512 da9650fff6cd7984e8f438b254318b5da46209eb21a375569ec1b4dd898a41d99d61d6682f2979a56d5c39d552ed42f443215900c1cebe95350e4624415f69c4
DIST sqlitebrowser-3.9.1.tar.gz 1704713 BLAKE2B 447a9e20fe4236feea2684703ac7f38b1c03f0ded352653b41bbec7d6380691776177fee1428fd67ac96190ed6752cedd76a9883cfa12584fec464cbf98707d3 SHA512 c1e88063fac864f60a9802ae378e13d6f3a09e2f4e71e50c6abca4967a941c444a64617bad2dfc743cf9a6be554af9c73e4c61533300ed9a51652234ffdbd225
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch
new file mode 100644
index 00000000000..9e2ad3e910b
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch
@@ -0,0 +1,59 @@
+diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake
+index f469637..92c2d37 100644
+--- a/cmake/FindQScintilla.cmake
++++ b/cmake/FindQScintilla.cmake
+@@ -43,9 +43,12 @@
+ #=============================================================================
+
+
++SET (QT_MIN_VERSION "5.6.2")
++FIND_PACKAGE( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Network Widgets )
++
+ find_path ( QSCINTILLA_INCLUDE_DIR
+ NAMES qsciscintilla.h
+- HINTS ${QT_INCLUDE_DIR}
++ HINTS ${Qt5Core_INCLUDE_DIRS}
+ PATH_SUFFIXES Qsci
+ )
+
+@@ -81,6 +84,6 @@ endif ()
+
+ find_library ( QSCINTILLA_LIBRARY
+- NAMES qscintilla qscintilla2 libqscintilla2
+- HINTS ${QT_LIBRARY_DIR}
++ NAMES qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5
++ HINTS ${Qt5Core_LIBRARIES}
+ )
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fdf5b4c..ffba6d7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,26 +47,20 @@ if(WIN32 AND MSVC)
+ endif()
+
+ if(NOT FORCE_INTERNAL_ANTLR)
+- find_package(Antlr2)
++ find_package(Antlr2 REQUIRED)
+ endif()
+ if(NOT FORCE_INTERNAL_QSCINTILLA)
+ find_package(QScintilla)
+ endif()
+
+ set(QHEXEDIT_DIR libs/qhexedit)
+-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
+
+-if(NOT ANTLR2_FOUND)
+- set(ANTLR_DIR libs/antlr-2.7.7)
+- add_subdirectory(${ANTLR_DIR})
+-endif()
+ if(NOT QSCINTILLA_FOUND)
+ set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
+ add_subdirectory(${QSCINTILLA_DIR})
+ endif()
+ add_subdirectory(${QHEXEDIT_DIR})
+-add_subdirectory(${QCUSTOMPLOT_DIR})
+
+ find_package(Qt5Widgets REQUIRED)
+ find_package(Qt5LinguistTools REQUIRED)
+
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
new file mode 100644
index 00000000000..9de05f943b1
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils
+
+DESCRIPTION="SQLite Database Browser"
+HOMEPAGE="http://sqlitebrowser.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-cpp/antlr-cpp:2
+ dev-db/sqlite:3
+ >=dev-libs/qcustomplot-2.0.0[qt5(+)]
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+ test? ( dev-qt/qttest:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.10.1-unbundle.patch
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+ # https://github.com/qingfengxia/qhexedit still bundled
+ # x11-libs/qscintilla[qt4?,qt5?] still bundled
+ find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
+
+ sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
+
+ if ! use test; then
+ sed -e "/qt5_use_modules/ s/ Test//" -i CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_TESTING=$(usex test)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ doicon images/sqlitebrowser.svg
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/
@ 2019-01-27 11:05 Pacho Ramos
0 siblings, 0 replies; 7+ messages in thread
From: Pacho Ramos @ 2019-01-27 11:05 UTC (permalink / raw
To: gentoo-commits
commit: b65bd41c91329de75a67a15aee65044768280624
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 10:37:36 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 11:05:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b65bd41c
dev-db/sqlitebrowser: Drop old
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
dev-db/sqlitebrowser/Manifest | 1 -
.../files/sqlitebrowser-3.7.0-unbundle.patch | 18 ------
.../files/sqlitebrowser-3.9.1-cmake.patch | 24 --------
dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild | 71 ----------------------
4 files changed, 114 deletions(-)
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 9b89c8bd849..861e19002a8 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,2 +1 @@
DIST sqlitebrowser-3.10.1.tar.gz 1992186 BLAKE2B 105333118a404aab48abe5ecbe83b425109b60adf40d3a3b7766c7036954996539bd133da4b3e3b1e2d819223842d107710b6b24aada6bb298462e062296dabf SHA512 da9650fff6cd7984e8f438b254318b5da46209eb21a375569ec1b4dd898a41d99d61d6682f2979a56d5c39d552ed42f443215900c1cebe95350e4624415f69c4
-DIST sqlitebrowser-3.9.1.tar.gz 1704713 BLAKE2B 447a9e20fe4236feea2684703ac7f38b1c03f0ded352653b41bbec7d6380691776177fee1428fd67ac96190ed6752cedd76a9883cfa12584fec464cbf98707d3 SHA512 c1e88063fac864f60a9802ae378e13d6f3a09e2f4e71e50c6abca4967a941c444a64617bad2dfc743cf9a6be554af9c73e4c61533300ed9a51652234ffdbd225
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch
deleted file mode 100644
index 8dbe870f2e8..00000000000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- sqlitebrowser-3.7.0/CMakeLists.txt
-+++ sqlitebrowser-3.7.0/CMakeLists.txt
-@@ -29,15 +29,9 @@
- find_package(Antlr2)
-
- set(QHEXEDIT_DIR libs/qhexedit)
--set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
- set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
-
--if(NOT ANTLR2_FOUND)
-- set(ANTLR_DIR libs/antlr-2.7.7)
-- add_subdirectory(${ANTLR_DIR})
--endif()
- add_subdirectory(${QHEXEDIT_DIR})
--add_subdirectory(${QCUSTOMPLOT_DIR})
- add_subdirectory(${QSCINTILLA_DIR})
-
- if(USE_QT5)
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch
deleted file mode 100644
index cf1cde6c919..00000000000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2563d678681fa6972674b47617015cb2515bd414 Mon Sep 17 00:00:00 2001
-From: Martin Kleusberg <mkleusberg@gmail.com>
-Date: Wed, 12 Oct 2016 23:26:56 +0200
-Subject: [PATCH] Fix cmake file
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 998c2f4..4c5debd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.7)
-
- set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
-
--OPTION(USE_QT5 FALSE "Build with qt5")
--OPTION(ENABLE_TESTING FALSE "Enable the unit tests")
-+OPTION(USE_QT5 "Build with qt5" OFF)
-+OPTION(ENABLE_TESTING "Enable the unit tests" OFF)
-
- if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE "Release")
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
deleted file mode 100644
index 9e91c60df05..00000000000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils
-
-DESCRIPTION="SQLite Database Browser"
-HOMEPAGE="http://sqlitebrowser.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
- dev-cpp/antlr-cpp:2
- dev-db/sqlite:3
- dev-libs/qcustomplot[qt5(+)]
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)]
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- test? ( dev-qt/qttest:5 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.7.0-unbundle.patch
- "${FILESDIR}"/${PN}-3.9.1-cmake.patch
-)
-
-src_prepare() {
- cmake-utils_src_prepare
- # https://github.com/qingfengxia/qhexedit still bundled
- # x11-libs/qscintilla[qt4?,qt5?] still bundled
- find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
-
- sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
-
- if ! use test; then
- sed -e "/qt5_use_modules/ s/ Test//" -i CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_QT5=ON
- -DENABLE_TESTING=$(usex test)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- doicon images/sqlitebrowser.svg
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/
@ 2019-03-20 15:31 Rick Farina
0 siblings, 0 replies; 7+ messages in thread
From: Rick Farina @ 2019-03-20 15:31 UTC (permalink / raw
To: gentoo-commits
commit: 420bd534b01e9f70683da54c4c1e409d3ecc9621
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 15:30:37 2019 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 15:30:51 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=420bd534
dev-db/sqlitebrowser: bump and unbundle
previous patch did most of the unbundling, but left qhexedit2 bundled
which caused revdep-rebuild to want to rebuild all the time.
semi related to bug #678628
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
dev-db/sqlitebrowser/Manifest | 1 +
.../files/sqlitebrowser-3.11.1-unbundle.patch | 85 ++++++++++++++++++++++
dev-db/sqlitebrowser/sqlitebrowser-3.11.1.ebuild | 64 ++++++++++++++++
3 files changed, 150 insertions(+)
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 861e19002a8..214850f0684 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1 +1,2 @@
DIST sqlitebrowser-3.10.1.tar.gz 1992186 BLAKE2B 105333118a404aab48abe5ecbe83b425109b60adf40d3a3b7766c7036954996539bd133da4b3e3b1e2d819223842d107710b6b24aada6bb298462e062296dabf SHA512 da9650fff6cd7984e8f438b254318b5da46209eb21a375569ec1b4dd898a41d99d61d6682f2979a56d5c39d552ed42f443215900c1cebe95350e4624415f69c4
+DIST sqlitebrowser-3.11.1.tar.gz 2523481 BLAKE2B c9a92b93795050605aa938cf5c73493b7d887b386da77b4cee206becd70779f00ab39c7a105772cdbe925ebedcfe0277b6ebe7898383db87454e19b050001253 SHA512 31f5315fd66d14fde16b58fe6522da937068c42e21f60aa15c3c04a1318ecac09f68143df108b83204cdc70ec8bac617a8ae196df9b5524690f837d7e7728916
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch
new file mode 100644
index 00000000000..f8668332328
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch
@@ -0,0 +1,85 @@
+diff -Naur sqlitebrowser-3.11.1-orig/cmake/FindQScintilla.cmake sqlitebrowser-3.11.1/cmake/FindQScintilla.cmake
+--- sqlitebrowser-3.11.1-orig/cmake/FindQScintilla.cmake 2019-03-20 11:12:47.452357850 -0400
++++ sqlitebrowser-3.11.1/cmake/FindQScintilla.cmake 2019-03-20 11:17:49.611365342 -0400
+@@ -42,10 +42,12 @@
+ # either expressed or implied, of the FreeBSD Project.
+ #=============================================================================
+
++SET (QT_MIN_VERSION "5.6.2")
++FIND_PACKAGE( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Network Widgets )
+
+ find_path ( QSCINTILLA_INCLUDE_DIR
+ NAMES qsciscintilla.h
+- HINTS ${QT_INCLUDE_DIR}
++ HINTS ${Qt5Core_INCLUDE_DIRS}
+ PATH_SUFFIXES Qsci
+ )
+
+@@ -80,8 +82,8 @@
+
+
+ find_library ( QSCINTILLA_LIBRARY
+- NAMES qscintilla qscintilla2 libqscintilla2
+- HINTS ${QT_LIBRARY_DIR}
++ NAMES qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5
++ HINTS ${Qt5Core_LIBRARIES}
+ )
+
+ set ( QSCINTILLA_LIBRARIES ${QSCINTILLA_LIBRARY} )
+diff -Naur sqlitebrowser-3.11.1-orig/CMakeLists.txt sqlitebrowser-3.11.1/CMakeLists.txt
+--- sqlitebrowser-3.11.1-orig/CMakeLists.txt 2019-03-20 11:12:47.452357850 -0400
++++ sqlitebrowser-3.11.1/CMakeLists.txt 2019-03-20 11:19:07.740367280 -0400
+@@ -61,26 +61,12 @@
+ endif()
+
+ if(NOT FORCE_INTERNAL_ANTLR)
+- find_package(Antlr2 QUIET)
++ find_package(Antlr2 REQUIRED)
+ endif()
+ if(NOT FORCE_INTERNAL_QSCINTILLA)
+- find_package(QScintilla QUIET)
++ find_package(QScintilla REQUIRED)
+ endif()
+
+-set(QHEXEDIT_DIR libs/qhexedit)
+-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
+-
+-if(NOT ANTLR2_FOUND)
+- set(ANTLR_DIR libs/antlr-2.7.7)
+- add_subdirectory(${ANTLR_DIR})
+-endif()
+-if(NOT QSCINTILLA_FOUND)
+- set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
+- add_subdirectory(${QSCINTILLA_DIR})
+-endif()
+-add_subdirectory(${QHEXEDIT_DIR})
+-add_subdirectory(${QCUSTOMPLOT_DIR})
+-
+ find_package(Qt5 REQUIRED COMPONENTS Concurrent Gui LinguistTools Network PrintSupport Test Widgets Xml)
+
+ set(CMAKE_AUTOMOC ON)
+diff -Naur sqlitebrowser-3.11.1-orig/src/src.pro sqlitebrowser-3.11.1/src/src.pro
+--- sqlitebrowser-3.11.1-orig/src/src.pro 2019-03-20 11:12:47.459357850 -0400
++++ sqlitebrowser-3.11.1/src/src.pro 2019-03-20 11:22:02.891371623 -0400
+@@ -178,10 +178,6 @@
+ }
+ }
+
+-LIBPATH_QHEXEDIT=$$OUT_PWD/../libs/qhexedit
+-LIBPATH_ANTLR=$$OUT_PWD/../libs/antlr-2.7.7
+-LIBPATH_QCUSTOMPLOT=$$OUT_PWD/../libs/qcustomplot-source
+-LIBPATH_QSCINTILLA=$$OUT_PWD/../libs/qscintilla/Qt4Qt5
+ unix {
+ LIBS += -ldl
+ }
+@@ -222,9 +218,7 @@
+ }
+
+ UI_DIR = .ui
+-INCLUDEPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5 $$PWD/..
+-LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2
+-DEPENDPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5
++LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2_qt5
+
+ unix {
+ # Below, the user can specify where all generated file can be placed
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1.ebuild
new file mode 100644
index 00000000000..5de9f44aac0
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop xdg
+
+DESCRIPTION="SQLite Database Browser"
+HOMEPAGE="https://sqlitebrowser.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+ test? ( dev-qt/qttest:5 )
+"
+DEPEND="
+ app-editors/qhexedit2
+ dev-cpp/antlr-cpp:2
+ dev-db/sqlite:3
+ >=dev-libs/qcustomplot-2.0.0[qt5(+)]
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtwidgets:5
+ >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+ dev-qt/qtprintsupport:5
+ dev-qt/qtxml:5
+
+"
+RDEPEND="${DEPEND}
+ dev-qt/qtsvg:5
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.11.1-unbundle.patch )
+
+src_prepare() {
+ cmake-utils_src_prepare
+ rm -r libs || die
+ sed -i 's#"src/qhexedit.h"#<qhexedit.h>#' src/EditDialog.cpp || die
+ #find libs/{antlr-2.7.7,qcustomplot-source,qscintilla} -delete || die
+
+ sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
+
+ if ! use test; then
+ sed -e "/qt5_use_modules/ s/ Test//" -i CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_TESTING=$(usex test)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ doicon images/sqlitebrowser.svg
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/
@ 2024-05-28 1:59 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-05-28 1:59 UTC (permalink / raw
To: gentoo-commits
commit: b61461426061051c12558ac0b7ddf0e95094cc4c
Author: Denis Pronin <dannftk <AT> yandex <DOT> ru>
AuthorDate: Mon Mar 25 11:15:30 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 28 01:57:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6146142
dev-db/sqlitebrowser: add patch to fix conflict that str macro brings in
sometimes expanding str() gives an error because it conflicts with str()
method of, for example, std::ostringstream::str()
This patch is dedicated to fixing this circumstance
Closes https://bugs.gentoo.org/932577
Signed-off-by: Denis Pronin <dannftk <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/35909
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/sqlitebrowser-3.12.2-str-conflict-fix.patch | 13 +++++++++++++
dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild | 4 ++++
2 files changed, 17 insertions(+)
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch
new file mode 100644
index 000000000000..07284ca8ba0c
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch
@@ -0,0 +1,13 @@
+--- a/src/version.h
++++ b/src/version.h
+@@ -4,8 +4,8 @@
+ #define MINOR_VERSION 12
+ #define PATCH_VERSION 2
+
+-#define str(s) #s
+-#define xstr(s) str(s)
++#define stringize(s) #s
++#define xstr(s) stringize(s)
+ #define APP_VERSION xstr(MAJOR_VERSION) "." xstr(MINOR_VERSION) "." xstr(PATCH_VERSION)
+
+ // If it is defined by the compiler, then it is a nightly build, and in the YYYYMMDD format.
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild
index 47ce7cb6cacc..0b6665b1dd80 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild
@@ -46,6 +46,10 @@ RDEPEND="
>=dev-qt/qtsvg-5.5:5
"
+PATCHES=(
+ "${FILESDIR}/${P}-str-conflict-fix.patch"
+)
+
src_prepare() {
cmake_src_prepare
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/
@ 2024-10-07 3:27 Eli Schwartz
0 siblings, 0 replies; 7+ messages in thread
From: Eli Schwartz @ 2024-10-07 3:27 UTC (permalink / raw
To: gentoo-commits
commit: c15c11e6b83c6e140047c1647510370099be70f7
Author: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail <DOT> com>
AuthorDate: Wed Oct 2 09:02:52 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Mon Oct 7 03:23:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c15c11e6
dev-db/sqlitebrowser: drop 3.12.2-r2
Signed-off-by: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38848
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
dev-db/sqlitebrowser/Manifest | 1 -
.../sqlitebrowser-3.12.2-str-conflict-fix.patch | 13 ----
.../sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild | 77 ----------------------
3 files changed, 91 deletions(-)
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 11db8af4f79c..1cbffb5b668d 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,2 +1 @@
-DIST sqlitebrowser-3.12.2.tar.gz 3990817 BLAKE2B a0c1495814a814638428fa50e55d5afeb2d3f5c80c9aafbdea3cc444e8c681c48acd1f24126945a89d7284c3f0a23979f2b3541fae7c7a70803f7e7ad69be6f4 SHA512 a6afc0a4286f07adb7038f3a010c93e14204b477bde27b1599c9bfe3390422d3edfaa2a9381b1f13e63a7aaf90e931ee85358eb8b2c15b6ea55818d29c59395f
DIST sqlitebrowser-3.13.0.tar.gz 4901507 BLAKE2B 4430944fb6f02a3e33aa6d3e5720faa8e43351314a0c21803fe8bed6d2241ca92830de7be33deb18294f0cad808c96d6c913bd9ddcd64d41a34db32349d44d88 SHA512 6261043cee7bc5c525b162e0b5d1ac38d380228ffd752e086fecb49c7f50b463a993a6128547d99addb0480ba71e4f6dd3a0c1e412a692ae86b0b183b7379610
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch
deleted file mode 100644
index 07284ca8ba0c..000000000000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/version.h
-+++ b/src/version.h
-@@ -4,8 +4,8 @@
- #define MINOR_VERSION 12
- #define PATCH_VERSION 2
-
--#define str(s) #s
--#define xstr(s) str(s)
-+#define stringize(s) #s
-+#define xstr(s) stringize(s)
- #define APP_VERSION xstr(MAJOR_VERSION) "." xstr(MINOR_VERSION) "." xstr(PATCH_VERSION)
-
- // If it is defined by the compiler, then it is a nightly build, and in the YYYYMMDD format.
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild
deleted file mode 100644
index 0b6665b1dd80..000000000000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="A light GUI editor for SQLite databases"
-HOMEPAGE="https://sqlitebrowser.org/"
-
-if [[ "${PV}" = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3+ MPL-2.0"
-SLOT="0"
-IUSE="sqlcipher test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- app-editors/qhexedit2
- dev-db/sqlite:3
- dev-libs/qcustomplot
- >=dev-qt/qtconcurrent-5.5:5
- >=dev-qt/qtcore-5.5:5
- >=dev-qt/qtgui-5.5:5
- >=dev-qt/qtnetwork-5.5:5[ssl]
- >=dev-qt/qtprintsupport-5.5:5
- >=dev-qt/qtwidgets-5.5:5
- >=dev-qt/qtxml-5.5:5
- >=x11-libs/qscintilla-2.8.10:=[qt5(+)]
- sqlcipher? ( dev-db/sqlcipher )
-"
-
-BDEPEND="
- >=dev-qt/linguist-tools-5.5:5
- test? ( >=dev-qt/qttest-5.5:5 )
-"
-
-RDEPEND="
- ${DEPEND}
- >=dev-qt/qtsvg-5.5:5
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-str-conflict-fix.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
-
- if ! use test; then
- sed -i CMakeLists.txt \
- -e "/find_package/ s/ Test//" \
- -e "/set/ s/ Qt5::Test//" \
- || die "Cannot remove Qt Test from CMake dependencies"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_TESTING=$(usex test)
- -DFORCE_INTERNAL_QCUSTOMPLOT=OFF
- -DFORCE_INTERNAL_QHEXEDIT=OFF
- -Dsqlcipher=$(usex sqlcipher)
- )
-
- # https://bugs.gentoo.org/855254
- append-flags -fno-strict-aliasing
- filter-lto
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/
@ 2025-01-01 19:17 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2025-01-01 19:17 UTC (permalink / raw
To: gentoo-commits
commit: 851c96ce14baa853f681d424612c0ca1332fe5b2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 1 19:03:49 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 1 19:16:54 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=851c96ce
dev-db/sqlitebrowser: Re-add missing dev-qt/qtconcurrent:5 DEPEND
Add missing include patch as well, just upstreamed.
Closes: https://bugs.gentoo.org/945694
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../sqlitebrowser-3.13.1-missing-include.patch | 25 ++++++++++++++++++++++
dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild | 20 +++++++----------
dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild | 20 ++++++-----------
3 files changed, 40 insertions(+), 25 deletions(-)
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.13.1-missing-include.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.13.1-missing-include.patch
new file mode 100644
index 000000000000..a0b2dfb284e4
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.13.1-missing-include.patch
@@ -0,0 +1,25 @@
+From 8f68c57177a9b120fe7d1f7b2b4f9b317d85f7e5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 30 Dec 2024 21:59:36 +0100
+Subject: [PATCH] Add missing QActionGroup include
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/MainWindow.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index 4b1d4aa5..89546255 100644
+--- a/src/MainWindow.cpp
++++ b/src/MainWindow.cpp
+@@ -53,6 +53,7 @@
+ #include <QTemporaryFile>
+ #include <QToolButton>
+ #include <QUrl>
++#include <QActionGroup>
+
+ #ifdef Q_OS_MACX //Needed only on macOS
+ #include <QOpenGLWidget>
+--
+2.47.1
+
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild
index 2570150a6735..f8729348579f 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,7 +21,7 @@ SLOT="0"
IUSE="sqlcipher test"
RESTRICT="!test? ( test )"
-DEPEND="
+RDEPEND="
app-editors/qhexedit2
dev-db/sqlite:3
dev-libs/qcustomplot
@@ -34,20 +34,17 @@ DEPEND="
>=x11-libs/qscintilla-2.8.10:=[qt5(+)]
sqlcipher? ( dev-db/sqlcipher )
"
-
+DEPEND="${RDEPEND}
+ >=dev-qt/qtconcurrent-5.15.9:5
+"
BDEPEND="
>=dev-qt/linguist-tools-5.15.9:5
test? ( >=dev-qt/qttest-5.15.9:5 )
"
-RDEPEND="${DEPEND}"
+DOCS=( images/ {BUILDING,CHANGELOG,README}.md )
-DOCS=(
- images/
- BUILDING.md
- CHANGELOG.md
- README.md
-)
+PATCHES=( "${FILESDIR}/${P}-missing-include.patch" )
src_prepare() {
cmake_src_prepare
@@ -77,7 +74,6 @@ src_configure() {
}
src_install() {
+ [[ ${PV} == *9999* ]] && DOCS+=( SECURITY.md )
cmake_src_install
-
- [[ "${PV}" = 9999 ]] && dodoc SECURITY.md
}
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild
index 2570150a6735..a423fd763348 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,7 +21,7 @@ SLOT="0"
IUSE="sqlcipher test"
RESTRICT="!test? ( test )"
-DEPEND="
+RDEPEND="
app-editors/qhexedit2
dev-db/sqlite:3
dev-libs/qcustomplot
@@ -34,20 +34,15 @@ DEPEND="
>=x11-libs/qscintilla-2.8.10:=[qt5(+)]
sqlcipher? ( dev-db/sqlcipher )
"
-
+DEPEND="${RDEPEND}
+ >=dev-qt/qtconcurrent-5.15.9:5
+"
BDEPEND="
>=dev-qt/linguist-tools-5.15.9:5
test? ( >=dev-qt/qttest-5.15.9:5 )
"
-RDEPEND="${DEPEND}"
-
-DOCS=(
- images/
- BUILDING.md
- CHANGELOG.md
- README.md
-)
+DOCS=( images/ {BUILDING,CHANGELOG,README}.md )
src_prepare() {
cmake_src_prepare
@@ -77,7 +72,6 @@ src_configure() {
}
src_install() {
+ [[ ${PV} == *9999* ]] && DOCS+=( SECURITY.md )
cmake_src_install
-
- [[ "${PV}" = 9999 ]] && dodoc SECURITY.md
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-01-01 19:17 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-07 3:27 [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/ Eli Schwartz
-- strict thread matches above, loose matches on Subject: below --
2025-01-01 19:17 Andreas Sturmlechner
2024-05-28 1:59 Sam James
2019-03-20 15:31 Rick Farina
2019-01-27 11:05 Pacho Ramos
2017-12-11 9:05 Michael Weber
2016-11-15 22:29 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox