1 |
commit: 6d1f62107c04fdeacd0471e901cd60af99ffeac4 |
2 |
Author: Michael Weber <xmw <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 11 09:05:08 2017 +0000 |
4 |
Commit: Michael Weber <xmw <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 11 09:05:08 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d1f6210 |
7 |
|
8 |
dev-db/sqlitebrowser: Version bump, thanks @jok-ts, @a17r et al. |
9 |
|
10 |
Reported-by: Anton Bolshakov <blshkv <AT> pentoo.ch> |
11 |
Suggested-by: Jouni Kosonen <jouni.kosonen <AT> tukesoft.com> |
12 |
Closes: https://bugs.gentoo.org/633412 |
13 |
Closes: https://github.com/gentoo/gentoo/pull/6322 |
14 |
Package-Manager: Portage-2.3.17, Repoman-2.3.6 |
15 |
|
16 |
dev-db/sqlitebrowser/Manifest | 1 + |
17 |
.../files/sqlitebrowser-3.10.1-unbundle.patch | 59 ++++++++++++++++++++++ |
18 |
dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild | 59 ++++++++++++++++++++++ |
19 |
3 files changed, 119 insertions(+) |
20 |
|
21 |
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest |
22 |
index 3815a86c48c..9b89c8bd849 100644 |
23 |
--- a/dev-db/sqlitebrowser/Manifest |
24 |
+++ b/dev-db/sqlitebrowser/Manifest |
25 |
@@ -1 +1,2 @@ |
26 |
+DIST sqlitebrowser-3.10.1.tar.gz 1992186 BLAKE2B 105333118a404aab48abe5ecbe83b425109b60adf40d3a3b7766c7036954996539bd133da4b3e3b1e2d819223842d107710b6b24aada6bb298462e062296dabf SHA512 da9650fff6cd7984e8f438b254318b5da46209eb21a375569ec1b4dd898a41d99d61d6682f2979a56d5c39d552ed42f443215900c1cebe95350e4624415f69c4 |
27 |
DIST sqlitebrowser-3.9.1.tar.gz 1704713 BLAKE2B 447a9e20fe4236feea2684703ac7f38b1c03f0ded352653b41bbec7d6380691776177fee1428fd67ac96190ed6752cedd76a9883cfa12584fec464cbf98707d3 SHA512 c1e88063fac864f60a9802ae378e13d6f3a09e2f4e71e50c6abca4967a941c444a64617bad2dfc743cf9a6be554af9c73e4c61533300ed9a51652234ffdbd225 |
28 |
|
29 |
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..9e2ad3e910b |
32 |
--- /dev/null |
33 |
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch |
34 |
@@ -0,0 +1,59 @@ |
35 |
+diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake |
36 |
+index f469637..92c2d37 100644 |
37 |
+--- a/cmake/FindQScintilla.cmake |
38 |
++++ b/cmake/FindQScintilla.cmake |
39 |
+@@ -43,9 +43,12 @@ |
40 |
+ #============================================================================= |
41 |
+ |
42 |
+ |
43 |
++SET (QT_MIN_VERSION "5.6.2") |
44 |
++FIND_PACKAGE( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Network Widgets ) |
45 |
++ |
46 |
+ find_path ( QSCINTILLA_INCLUDE_DIR |
47 |
+ NAMES qsciscintilla.h |
48 |
+- HINTS ${QT_INCLUDE_DIR} |
49 |
++ HINTS ${Qt5Core_INCLUDE_DIRS} |
50 |
+ PATH_SUFFIXES Qsci |
51 |
+ ) |
52 |
+ |
53 |
+@@ -81,6 +84,6 @@ endif () |
54 |
+ |
55 |
+ find_library ( QSCINTILLA_LIBRARY |
56 |
+- NAMES qscintilla qscintilla2 libqscintilla2 |
57 |
+- HINTS ${QT_LIBRARY_DIR} |
58 |
++ NAMES qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5 |
59 |
++ HINTS ${Qt5Core_LIBRARIES} |
60 |
+ ) |
61 |
+ |
62 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
63 |
+index fdf5b4c..ffba6d7 100644 |
64 |
+--- a/CMakeLists.txt |
65 |
++++ b/CMakeLists.txt |
66 |
+@@ -47,26 +47,20 @@ if(WIN32 AND MSVC) |
67 |
+ endif() |
68 |
+ |
69 |
+ if(NOT FORCE_INTERNAL_ANTLR) |
70 |
+- find_package(Antlr2) |
71 |
++ find_package(Antlr2 REQUIRED) |
72 |
+ endif() |
73 |
+ if(NOT FORCE_INTERNAL_QSCINTILLA) |
74 |
+ find_package(QScintilla) |
75 |
+ endif() |
76 |
+ |
77 |
+ set(QHEXEDIT_DIR libs/qhexedit) |
78 |
+-set(QCUSTOMPLOT_DIR libs/qcustomplot-source) |
79 |
+ |
80 |
+-if(NOT ANTLR2_FOUND) |
81 |
+- set(ANTLR_DIR libs/antlr-2.7.7) |
82 |
+- add_subdirectory(${ANTLR_DIR}) |
83 |
+-endif() |
84 |
+ if(NOT QSCINTILLA_FOUND) |
85 |
+ set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5) |
86 |
+ add_subdirectory(${QSCINTILLA_DIR}) |
87 |
+ endif() |
88 |
+ add_subdirectory(${QHEXEDIT_DIR}) |
89 |
+-add_subdirectory(${QCUSTOMPLOT_DIR}) |
90 |
+ |
91 |
+ find_package(Qt5Widgets REQUIRED) |
92 |
+ find_package(Qt5LinguistTools REQUIRED) |
93 |
+ |
94 |
|
95 |
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild |
96 |
new file mode 100644 |
97 |
index 00000000000..9de05f943b1 |
98 |
--- /dev/null |
99 |
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild |
100 |
@@ -0,0 +1,59 @@ |
101 |
+# Copyright 1999-2017 Gentoo Foundation |
102 |
+# Distributed under the terms of the GNU General Public License v2 |
103 |
+ |
104 |
+EAPI=6 |
105 |
+ |
106 |
+inherit cmake-utils eutils |
107 |
+ |
108 |
+DESCRIPTION="SQLite Database Browser" |
109 |
+HOMEPAGE="http://sqlitebrowser.org" |
110 |
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
111 |
+ |
112 |
+LICENSE="GPL-3 MPL-2.0" |
113 |
+SLOT="0" |
114 |
+KEYWORDS="~amd64 ~x86" |
115 |
+IUSE="test" |
116 |
+ |
117 |
+RDEPEND=" |
118 |
+ dev-cpp/antlr-cpp:2 |
119 |
+ dev-db/sqlite:3 |
120 |
+ >=dev-libs/qcustomplot-2.0.0[qt5(+)] |
121 |
+ dev-qt/qtcore:5 |
122 |
+ dev-qt/qtgui:5 |
123 |
+ dev-qt/qtnetwork:5 |
124 |
+ dev-qt/qtwidgets:5 |
125 |
+ >=x11-libs/qscintilla-2.10.1:=[qt5(+)] |
126 |
+" |
127 |
+DEPEND="${RDEPEND} |
128 |
+ dev-qt/linguist-tools:5 |
129 |
+ test? ( dev-qt/qttest:5 ) |
130 |
+" |
131 |
+ |
132 |
+PATCHES=( |
133 |
+ "${FILESDIR}"/${PN}-3.10.1-unbundle.patch |
134 |
+) |
135 |
+ |
136 |
+src_prepare() { |
137 |
+ cmake-utils_src_prepare |
138 |
+ # https://github.com/qingfengxia/qhexedit still bundled |
139 |
+ # x11-libs/qscintilla[qt4?,qt5?] still bundled |
140 |
+ find libs/{antlr-2.7.7,qcustomplot-source} -delete || die |
141 |
+ |
142 |
+ sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die |
143 |
+ |
144 |
+ if ! use test; then |
145 |
+ sed -e "/qt5_use_modules/ s/ Test//" -i CMakeLists.txt || die |
146 |
+ fi |
147 |
+} |
148 |
+ |
149 |
+src_configure() { |
150 |
+ local mycmakeargs=( |
151 |
+ -DENABLE_TESTING=$(usex test) |
152 |
+ ) |
153 |
+ cmake-utils_src_configure |
154 |
+} |
155 |
+ |
156 |
+src_install() { |
157 |
+ cmake-utils_src_install |
158 |
+ doicon images/sqlitebrowser.svg |
159 |
+} |