mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-08 18:27:07 -08:00
dev-db/sqlitebrowser: Drop old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
@@ -1,2 +1 @@
|
||||
DIST sqlitebrowser-3.10.1.tar.gz 1992186 BLAKE2B 105333118a404aab48abe5ecbe83b425109b60adf40d3a3b7766c7036954996539bd133da4b3e3b1e2d819223842d107710b6b24aada6bb298462e062296dabf SHA512 da9650fff6cd7984e8f438b254318b5da46209eb21a375569ec1b4dd898a41d99d61d6682f2979a56d5c39d552ed42f443215900c1cebe95350e4624415f69c4
|
||||
DIST sqlitebrowser-3.11.1.tar.gz 2523481 BLAKE2B c9a92b93795050605aa938cf5c73493b7d887b386da77b4cee206becd70779f00ab39c7a105772cdbe925ebedcfe0277b6ebe7898383db87454e19b050001253 SHA512 31f5315fd66d14fde16b58fe6522da937068c42e21f60aa15c3c04a1318ecac09f68143df108b83204cdc70ec8bac617a8ae196df9b5524690f837d7e7728916
|
||||
|
||||
@@ -1,105 +0,0 @@
|
||||
diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake
|
||||
index f469637..92c2d37 100644
|
||||
--- a/cmake/FindQScintilla.cmake
|
||||
+++ b/cmake/FindQScintilla.cmake
|
||||
@@ -43,9 +43,12 @@
|
||||
#=============================================================================
|
||||
|
||||
|
||||
+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
|
||||
)
|
||||
|
||||
@@ -81,6 +84,6 @@ endif ()
|
||||
|
||||
find_library ( QSCINTILLA_LIBRARY
|
||||
- NAMES qscintilla qscintilla2 libqscintilla2
|
||||
- HINTS ${QT_LIBRARY_DIR}
|
||||
+ NAMES qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5
|
||||
+ HINTS ${Qt5Core_LIBRARIES}
|
||||
)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index fdf5b4c..ffba6d7 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -47,26 +47,20 @@ if(WIN32 AND MSVC)
|
||||
endif()
|
||||
|
||||
if(NOT FORCE_INTERNAL_ANTLR)
|
||||
- find_package(Antlr2)
|
||||
+ find_package(Antlr2 REQUIRED)
|
||||
endif()
|
||||
if(NOT FORCE_INTERNAL_QSCINTILLA)
|
||||
find_package(QScintilla)
|
||||
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(Qt5Widgets REQUIRED)
|
||||
find_package(Qt5LinguistTools REQUIRED)
|
||||
|
||||
--- sqlitebrowser-3.10.1/src/tests/CMakeLists.txt
|
||||
+++ sqlitebrowser-3.10.1/src/tests/CMakeLists.txt
|
||||
@@ -49,9 +49,6 @@
|
||||
else()
|
||||
target_link_libraries(test-sqlobjects antlr)
|
||||
endif()
|
||||
-link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
|
||||
-add_dependencies(test-sqlobjects qscintilla2)
|
||||
-target_link_libraries(test-sqlobjects qscintilla2)
|
||||
add_test(test-sqlobjects test-sqlobjects)
|
||||
|
||||
# test-import
|
||||
@@ -118,7 +118,4 @@
|
||||
else()
|
||||
target_link_libraries(test-regex antlr)
|
||||
endif()
|
||||
-link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
|
||||
-add_dependencies(test-regex qscintilla2)
|
||||
-target_link_libraries(test-regex qscintilla2)
|
||||
add_test(test-regex test-regex)
|
||||
--- sqlitebrowser-3.10.1/src/src.pro
|
||||
+++ sqlitebrowser-3.10.1/src/src.pro
|
||||
@@ -153,10 +150,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
@@ -197,9 +193,9 @@
|
||||
}
|
||||
|
||||
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
|
||||
+INCLUDEPATH += $$PWD/../libs/qhexedit $$PWD/..
|
||||
+LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2_qt5
|
||||
+DEPENDPATH += $$PWD/../libs/qhexedit
|
||||
|
||||
unix {
|
||||
# The executable
|
||||
@@ -1,59 +0,0 @@
|
||||
# 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(+)]
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
dev-qt/qtsvg:5
|
||||
"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${PN}-3.10.1-unbundle.patch )
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
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
|
||||
}
|
||||
Reference in New Issue
Block a user