diff options
Diffstat (limited to 'dev-db/sqlitebrowser')
| -rw-r--r-- | dev-db/sqlitebrowser/Manifest | 3 | ||||
| -rw-r--r-- | dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch | 105 | ||||
| -rw-r--r-- | dev-db/sqlitebrowser/sqlitebrowser-3.10.1-r1.ebuild | 59 |
3 files changed, 0 insertions, 167 deletions
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest index 844c13c31eab..befb52637dac 100644 --- a/dev-db/sqlitebrowser/Manifest +++ b/dev-db/sqlitebrowser/Manifest @@ -1,7 +1,4 @@ -AUX sqlitebrowser-3.10.1-unbundle.patch 3313 BLAKE2B 91dda803cb2eed55a56568f4d2cc0519b33b59447fcdfee49705aa0bfce84009092b0e73ab0ae79b03fc30f20220b1ca8cebbd83b66d1f8fdd36c47669403019 SHA512 71b758dc1f412b1ed5d778e8ca5fc65eb99276acf5c81fc4812bf31251a0380b8e4fbc84a00718e5959ae7cb504cda06339e24cf070b8a2de1b0fce46cfb595f AUX sqlitebrowser-3.11.1-unbundle.patch 3194 BLAKE2B b2015e90e7f79409fb16d0490081634c47208956a53f4c24aeec3fa217dd165b1fec2bc51b818b82f39fae55a3ca7bb9a79dc58746781e1622707e0b051e845c SHA512 b0082e6373d54a2aee87b84f0194a91139f535da0c7d741e68458e05a6c7e6a46c1b027e8cf0dff455de0cf2c484d2be51bc829bdbedb2169c8fa44d553afd95 -DIST sqlitebrowser-3.10.1.tar.gz 1992186 BLAKE2B 105333118a404aab48abe5ecbe83b425109b60adf40d3a3b7766c7036954996539bd133da4b3e3b1e2d819223842d107710b6b24aada6bb298462e062296dabf SHA512 da9650fff6cd7984e8f438b254318b5da46209eb21a375569ec1b4dd898a41d99d61d6682f2979a56d5c39d552ed42f443215900c1cebe95350e4624415f69c4 DIST sqlitebrowser-3.11.1.tar.gz 2523481 BLAKE2B c9a92b93795050605aa938cf5c73493b7d887b386da77b4cee206becd70779f00ab39c7a105772cdbe925ebedcfe0277b6ebe7898383db87454e19b050001253 SHA512 31f5315fd66d14fde16b58fe6522da937068c42e21f60aa15c3c04a1318ecac09f68143df108b83204cdc70ec8bac617a8ae196df9b5524690f837d7e7728916 -EBUILD sqlitebrowser-3.10.1-r1.ebuild 1209 BLAKE2B adc80a02c5628ccd6b31b9125639a51a1c3cc07b4f00ab96e02a644d1d0a5327fcdcfdbedb06233b96def7c357928d962ddb4dce0e5076551e687a851210f4f9 SHA512 3069b2174fbe27b7fe313b832d970d2d3633906e46bbdcecc588b5f79c058c28030d5343fb2f0925b6ce22a3ee92c7e28947e1e53af9dbb9d2e746694a45193c EBUILD sqlitebrowser-3.11.1-r1.ebuild 1363 BLAKE2B 5d773b3181600829e6746740deb37a0f9885eebc9f79a0ca6ce4e0a3f19907dc3f235f2a311b0f54e1b729159fc123e0c2a810e38de16cd7f0cc30d1d7f02209 SHA512 ffa03523d2b79218f1e82958c4624e6f36418dd1e6567264ade56600af450b9f0a290873ddb1846007ff0cdeae4e31c44a59ea760e0361ff347611e56313ea6e MISC metadata.xml 659 BLAKE2B bf5f352f0227c1408cd9c0720fea6b7bf35e6f843f4e1f6fb3e340d3e7e5ddc09843484da6c54254345cde615993acaeba50027f44f33e0134ac05414e80e8ca SHA512 defe9a90cbcdee9750f9a5dffb8620445efd4d855fa789bad01d80151f4e64676245c2a51670c7418d2e19faa72bf26f4322c3953d610933a5b479985acedca2 diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch deleted file mode 100644 index b774e41ecd83..000000000000 --- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch +++ /dev/null @@ -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 diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1-r1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1-r1.ebuild deleted file mode 100644 index 259f09b86cb3..000000000000 --- a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1-r1.ebuild +++ /dev/null @@ -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 -} |