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 +}
