1 |
commit: 0de2acd7622eadf7cbe67c80844c605a068bcdfb |
2 |
Author: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail <DOT> com> |
3 |
AuthorDate: Sun May 30 17:11:13 2021 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 17 06:49:16 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de2acd7 |
7 |
|
8 |
dev-db/sqlitebrowser: remove old |
9 |
|
10 |
Signed-off-by: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail.com> |
11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
12 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
13 |
|
14 |
dev-db/sqlitebrowser/Manifest | 1 - |
15 |
.../files/sqlitebrowser-3.11.1-unbundle.patch | 85 ---------------------- |
16 |
.../sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild | 67 ----------------- |
17 |
3 files changed, 153 deletions(-) |
18 |
|
19 |
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest |
20 |
index a73bd0f9983..2e80a33ddc7 100644 |
21 |
--- a/dev-db/sqlitebrowser/Manifest |
22 |
+++ b/dev-db/sqlitebrowser/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST sqlitebrowser-3.11.1.tar.gz 2523481 BLAKE2B c9a92b93795050605aa938cf5c73493b7d887b386da77b4cee206becd70779f00ab39c7a105772cdbe925ebedcfe0277b6ebe7898383db87454e19b050001253 SHA512 31f5315fd66d14fde16b58fe6522da937068c42e21f60aa15c3c04a1318ecac09f68143df108b83204cdc70ec8bac617a8ae196df9b5524690f837d7e7728916 |
25 |
DIST sqlitebrowser-3.12.1.tar.gz 3990525 BLAKE2B 9cccd48c83e1953091508f5760b3004c4690791cacc5784286e6ce5220a6e55e761d736d8fbbb135e419beba12def89f63a3d37d6c7e0281f50392f07bf25357 SHA512 f0a62958008693606d9ab04b0413fa10705c7b45fb970c218d8f1adfe8ca01895a6470f369ded6cb7a9338c27385838b8d57c89b5855b4050ce9bec0d69626d1 |
26 |
|
27 |
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch |
28 |
deleted file mode 100644 |
29 |
index f8668332328..00000000000 |
30 |
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch |
31 |
+++ /dev/null |
32 |
@@ -1,85 +0,0 @@ |
33 |
-diff -Naur sqlitebrowser-3.11.1-orig/cmake/FindQScintilla.cmake sqlitebrowser-3.11.1/cmake/FindQScintilla.cmake |
34 |
---- sqlitebrowser-3.11.1-orig/cmake/FindQScintilla.cmake 2019-03-20 11:12:47.452357850 -0400 |
35 |
-+++ sqlitebrowser-3.11.1/cmake/FindQScintilla.cmake 2019-03-20 11:17:49.611365342 -0400 |
36 |
-@@ -42,10 +42,12 @@ |
37 |
- # either expressed or implied, of the FreeBSD Project. |
38 |
- #============================================================================= |
39 |
- |
40 |
-+SET (QT_MIN_VERSION "5.6.2") |
41 |
-+FIND_PACKAGE( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Network Widgets ) |
42 |
- |
43 |
- find_path ( QSCINTILLA_INCLUDE_DIR |
44 |
- NAMES qsciscintilla.h |
45 |
-- HINTS ${QT_INCLUDE_DIR} |
46 |
-+ HINTS ${Qt5Core_INCLUDE_DIRS} |
47 |
- PATH_SUFFIXES Qsci |
48 |
- ) |
49 |
- |
50 |
-@@ -80,8 +82,8 @@ |
51 |
- |
52 |
- |
53 |
- find_library ( QSCINTILLA_LIBRARY |
54 |
-- NAMES qscintilla qscintilla2 libqscintilla2 |
55 |
-- HINTS ${QT_LIBRARY_DIR} |
56 |
-+ NAMES qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5 |
57 |
-+ HINTS ${Qt5Core_LIBRARIES} |
58 |
- ) |
59 |
- |
60 |
- set ( QSCINTILLA_LIBRARIES ${QSCINTILLA_LIBRARY} ) |
61 |
-diff -Naur sqlitebrowser-3.11.1-orig/CMakeLists.txt sqlitebrowser-3.11.1/CMakeLists.txt |
62 |
---- sqlitebrowser-3.11.1-orig/CMakeLists.txt 2019-03-20 11:12:47.452357850 -0400 |
63 |
-+++ sqlitebrowser-3.11.1/CMakeLists.txt 2019-03-20 11:19:07.740367280 -0400 |
64 |
-@@ -61,26 +61,12 @@ |
65 |
- endif() |
66 |
- |
67 |
- if(NOT FORCE_INTERNAL_ANTLR) |
68 |
-- find_package(Antlr2 QUIET) |
69 |
-+ find_package(Antlr2 REQUIRED) |
70 |
- endif() |
71 |
- if(NOT FORCE_INTERNAL_QSCINTILLA) |
72 |
-- find_package(QScintilla QUIET) |
73 |
-+ find_package(QScintilla REQUIRED) |
74 |
- endif() |
75 |
- |
76 |
--set(QHEXEDIT_DIR libs/qhexedit) |
77 |
--set(QCUSTOMPLOT_DIR libs/qcustomplot-source) |
78 |
-- |
79 |
--if(NOT ANTLR2_FOUND) |
80 |
-- set(ANTLR_DIR libs/antlr-2.7.7) |
81 |
-- add_subdirectory(${ANTLR_DIR}) |
82 |
--endif() |
83 |
--if(NOT QSCINTILLA_FOUND) |
84 |
-- set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5) |
85 |
-- add_subdirectory(${QSCINTILLA_DIR}) |
86 |
--endif() |
87 |
--add_subdirectory(${QHEXEDIT_DIR}) |
88 |
--add_subdirectory(${QCUSTOMPLOT_DIR}) |
89 |
-- |
90 |
- find_package(Qt5 REQUIRED COMPONENTS Concurrent Gui LinguistTools Network PrintSupport Test Widgets Xml) |
91 |
- |
92 |
- set(CMAKE_AUTOMOC ON) |
93 |
-diff -Naur sqlitebrowser-3.11.1-orig/src/src.pro sqlitebrowser-3.11.1/src/src.pro |
94 |
---- sqlitebrowser-3.11.1-orig/src/src.pro 2019-03-20 11:12:47.459357850 -0400 |
95 |
-+++ sqlitebrowser-3.11.1/src/src.pro 2019-03-20 11:22:02.891371623 -0400 |
96 |
-@@ -178,10 +178,6 @@ |
97 |
- } |
98 |
- } |
99 |
- |
100 |
--LIBPATH_QHEXEDIT=$$OUT_PWD/../libs/qhexedit |
101 |
--LIBPATH_ANTLR=$$OUT_PWD/../libs/antlr-2.7.7 |
102 |
--LIBPATH_QCUSTOMPLOT=$$OUT_PWD/../libs/qcustomplot-source |
103 |
--LIBPATH_QSCINTILLA=$$OUT_PWD/../libs/qscintilla/Qt4Qt5 |
104 |
- unix { |
105 |
- LIBS += -ldl |
106 |
- } |
107 |
-@@ -222,9 +218,7 @@ |
108 |
- } |
109 |
- |
110 |
- UI_DIR = .ui |
111 |
--INCLUDEPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5 $$PWD/.. |
112 |
--LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2 |
113 |
--DEPENDPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5 |
114 |
-+LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2_qt5 |
115 |
- |
116 |
- unix { |
117 |
- # Below, the user can specify where all generated file can be placed |
118 |
|
119 |
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild |
120 |
deleted file mode 100644 |
121 |
index 9264df0706c..00000000000 |
122 |
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild |
123 |
+++ /dev/null |
124 |
@@ -1,67 +0,0 @@ |
125 |
-# Copyright 1999-2020 Gentoo Authors |
126 |
-# Distributed under the terms of the GNU General Public License v2 |
127 |
- |
128 |
-EAPI=7 |
129 |
- |
130 |
-inherit cmake desktop xdg |
131 |
- |
132 |
-DESCRIPTION="SQLite Database Browser" |
133 |
-HOMEPAGE="https://sqlitebrowser.org" |
134 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
135 |
- |
136 |
-LICENSE="GPL-3 MPL-2.0" |
137 |
-SLOT="0" |
138 |
-KEYWORDS="~amd64 ~x86" |
139 |
-IUSE="test" |
140 |
-RESTRICT="!test? ( test )" |
141 |
- |
142 |
-BDEPEND=" |
143 |
- dev-qt/linguist-tools:5 |
144 |
- test? ( dev-qt/qttest:5 ) |
145 |
-" |
146 |
-DEPEND=" |
147 |
- app-editors/qhexedit2 |
148 |
- dev-cpp/antlr-cpp:2 |
149 |
- dev-db/sqlite:3 |
150 |
- >=dev-libs/qcustomplot-2.0.0[qt5(+)] |
151 |
- dev-qt/qtconcurrent:5 |
152 |
- dev-qt/qtcore:5 |
153 |
- dev-qt/qtgui:5 |
154 |
- dev-qt/qtnetwork:5[ssl] |
155 |
- dev-qt/qtwidgets:5 |
156 |
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)] |
157 |
- dev-qt/qtprintsupport:5 |
158 |
- dev-qt/qtxml:5 |
159 |
- |
160 |
-" |
161 |
-RDEPEND="${DEPEND} |
162 |
- dev-qt/qtsvg:5 |
163 |
-" |
164 |
- |
165 |
-PATCHES=( "${FILESDIR}"/${PN}-3.11.1-unbundle.patch ) |
166 |
- |
167 |
-src_prepare() { |
168 |
- cmake_src_prepare |
169 |
- rm -r libs || die |
170 |
- sed -i 's#"src/qhexedit.h"#<qhexedit.h>#' src/EditDialog.cpp || die |
171 |
- #find libs/{antlr-2.7.7,qcustomplot-source,qscintilla} -delete || die |
172 |
- |
173 |
- sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die |
174 |
- |
175 |
- if ! use test; then |
176 |
- sed -e "/find_package/ s/ Test//" -i CMakeLists.txt || die |
177 |
- sed -e "/set/ s/ Qt5::Test//" -i CMakeLists.txt || die |
178 |
- fi |
179 |
-} |
180 |
- |
181 |
-src_configure() { |
182 |
- local mycmakeargs=( |
183 |
- -DENABLE_TESTING=$(usex test) |
184 |
- ) |
185 |
- cmake_src_configure |
186 |
-} |
187 |
- |
188 |
-src_install() { |
189 |
- cmake_src_install |
190 |
- doicon images/sqlitebrowser.svg |
191 |
-} |