From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 69731138334 for ; Wed, 20 Mar 2019 15:31:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5962EE0952; Wed, 20 Mar 2019 15:31:19 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 18D18E0952 for ; Wed, 20 Mar 2019 15:31:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5B076335D12 for ; Wed, 20 Mar 2019 15:31:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BACE1452 for ; Wed, 20 Mar 2019 15:31:15 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1553095851.420bd534b01e9f70683da54c4c1e409d3ecc9621.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/sqlitebrowser/Manifest dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch dev-db/sqlitebrowser/sqlitebrowser-3.11.1.ebuild X-VCS-Directories: dev-db/sqlitebrowser/files/ dev-db/sqlitebrowser/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 420bd534b01e9f70683da54c4c1e409d3ecc9621 X-VCS-Branch: master Date: Wed, 20 Mar 2019 15:31:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 305da376-704a-4a21-b25b-314c7d95f4a9 X-Archives-Hash: 26879132c82df59fa6f2879888253dbd commit: 420bd534b01e9f70683da54c4c1e409d3ecc9621 Author: Rick Farina gentoo org> AuthorDate: Wed Mar 20 15:30:37 2019 +0000 Commit: Rick Farina gentoo 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 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"##' 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 +}