dev-db/sqliteman: Fix building with qscintilla-2.10
authorJouni Kosonen <jouni.kosonen@tukesoft.com>
Sun, 16 Apr 2017 17:43:09 +0000 (20:43 +0300)
committerAndreas Sturmlechner <asturm@gentoo.org>
Sun, 16 Apr 2017 22:27:21 +0000 (00:27 +0200)
Closes: https://github.com/gentoo/gentoo/pull/4431

dev-db/sqliteman/files/sqliteman-1.2.2-qscintilla-2.10.patch [new file with mode: 0644]
dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild [new file with mode: 0644]

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 (file)
index 0000000..c197ad3
--- /dev/null
@@ -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 (file)
index 0000000..6b05f47
--- /dev/null
@@ -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
+}