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 04A3E139694 for ; Sun, 16 Apr 2017 22:27:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64C3CE0CB4; Sun, 16 Apr 2017 22:27:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 45B6FE0CB4 for ; Sun, 16 Apr 2017 22:27:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 43FB43412CB for ; Sun, 16 Apr 2017 22:27:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4D4E73C6 for ; Sun, 16 Apr 2017 22:27:29 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1492381641.fdfa8e286694ce2f4380ac8313a112174bdb35a8.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqliteman/, dev-db/sqliteman/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/sqliteman/files/sqliteman-1.2.2-qscintilla-2.10.patch dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild X-VCS-Directories: dev-db/sqliteman/files/ dev-db/sqliteman/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: fdfa8e286694ce2f4380ac8313a112174bdb35a8 X-VCS-Branch: master Date: Sun, 16 Apr 2017 22:27:29 +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-Archives-Salt: bdf9146b-4930-4e83-8fc9-e74a25cdc0ef X-Archives-Hash: e13efd79083f02598d54c4d269746e25 commit: fdfa8e286694ce2f4380ac8313a112174bdb35a8 Author: Jouni Kosonen tukesoft com> AuthorDate: Sun Apr 16 17:43:09 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 16 22:27:21 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdfa8e28 dev-db/sqliteman: Fix building with qscintilla-2.10 Closes: https://github.com/gentoo/gentoo/pull/4431 .../files/sqliteman-1.2.2-qscintilla-2.10.patch | 13 +++++++++ dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild | 34 ++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/dev-db/sqliteman/files/sqliteman-1.2.2-qscintilla-2.10.patch b/dev-db/sqliteman/files/sqliteman-1.2.2-qscintilla-2.10.patch new file mode 100644 index 00000000000..c197ad34211 --- /dev/null +++ b/dev-db/sqliteman/files/sqliteman-1.2.2-qscintilla-2.10.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/modules/FindQScintilla.cmake b/cmake/modules/FindQScintilla.cmake +index c4592d0..7700ec4 100644 +--- a/cmake/modules/FindQScintilla.cmake ++++ b/cmake/modules/FindQScintilla.cmake +@@ -21,7 +21,7 @@ IF(QT4_FOUND) + "${QT_INCLUDE_DIR}/Qsci" /usr/include /usr/include/Qsci + ) + +- SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2) ++ SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2 qscintilla2_qt4 libqscintilla2_qt4) + FIND_LIBRARY(QSCINTILLA_LIBRARY + NAMES ${QSCINTILLA_NAMES} + PATHS ${QT_LIBRARY_DIR} diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild b/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild new file mode 100644 index 00000000000..6b05f4741a6 --- /dev/null +++ b/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils + +DESCRIPTION="Powerful GUI manager for the Sqlite3 database" +HOMEPAGE="http://sqliteman.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtsql:4[sqlite] + x11-libs/qscintilla:=[qt4(-)]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-lpthread.patch" + "${FILESDIR}/${P}-qscintilla-2.10.patch" +) + +src_prepare() { + # remove bundled lib + rm -rf "${S}"/${PN}/qscintilla2 || die + + cmake-utils_src_prepare +}