* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/files/, dev-db/sqlitebrowser/
@ 2017-12-18 11:34 Michael Weber
0 siblings, 0 replies; 4+ messages in thread
From: Michael Weber @ 2017-12-18 11:34 UTC (permalink / raw
To: gentoo-commits
commit: aaf313529ffdb9a96aa8a371804e29a3d16f4f1f
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 11:33:45 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 11:33:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaf31352
dev-db/sqlitebrowser: Fix tests, thanks Jouni Kosonen.
Closes: https://bugs.gentoo.org/640862
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../files/sqlitebrowser-3.10.1-unbundle.patch | 46 ++++++++++++++++++++++
dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild | 3 +-
2 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch
index 9e2ad3e910b..b774e41ecd8 100644
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch
@@ -57,3 +57,49 @@ index fdf5b4c..ffba6d7 100644
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.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
index c661e29a9f2..42732d6e3e7 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
@@ -36,8 +36,7 @@ PATCHES=(
src_prepare() {
cmake-utils_src_prepare
# https://github.com/qingfengxia/qhexedit still bundled
- # x11-libs/qscintilla[qt4?,qt5?] still bundled
- find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
+ find libs/{antlr-2.7.7,qcustomplot-source,qscintilla} -delete || die
sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/files/, dev-db/sqlitebrowser/
@ 2021-06-17 6:49 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2021-06-17 6:49 UTC (permalink / raw
To: gentoo-commits
commit: 0de2acd7622eadf7cbe67c80844c605a068bcdfb
Author: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail <DOT> com>
AuthorDate: Sun May 30 17:11:13 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jun 17 06:49:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de2acd7
dev-db/sqlitebrowser: remove old
Signed-off-by: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail.com>
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-db/sqlitebrowser/Manifest | 1 -
.../files/sqlitebrowser-3.11.1-unbundle.patch | 85 ----------------------
.../sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild | 67 -----------------
3 files changed, 153 deletions(-)
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index a73bd0f9983..2e80a33ddc7 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,2 +1 @@
-DIST sqlitebrowser-3.11.1.tar.gz 2523481 BLAKE2B c9a92b93795050605aa938cf5c73493b7d887b386da77b4cee206becd70779f00ab39c7a105772cdbe925ebedcfe0277b6ebe7898383db87454e19b050001253 SHA512 31f5315fd66d14fde16b58fe6522da937068c42e21f60aa15c3c04a1318ecac09f68143df108b83204cdc70ec8bac617a8ae196df9b5524690f837d7e7728916
DIST sqlitebrowser-3.12.1.tar.gz 3990525 BLAKE2B 9cccd48c83e1953091508f5760b3004c4690791cacc5784286e6ce5220a6e55e761d736d8fbbb135e419beba12def89f63a3d37d6c7e0281f50392f07bf25357 SHA512 f0a62958008693606d9ab04b0413fa10705c7b45fb970c218d8f1adfe8ca01895a6470f369ded6cb7a9338c27385838b8d57c89b5855b4050ce9bec0d69626d1
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch
deleted file mode 100644
index f8668332328..00000000000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -Naur sqlitebrowser-3.11.1-orig/cmake/FindQScintilla.cmake sqlitebrowser-3.11.1/cmake/FindQScintilla.cmake
---- sqlitebrowser-3.11.1-orig/cmake/FindQScintilla.cmake 2019-03-20 11:12:47.452357850 -0400
-+++ sqlitebrowser-3.11.1/cmake/FindQScintilla.cmake 2019-03-20 11:17:49.611365342 -0400
-@@ -42,10 +42,12 @@
- # either expressed or implied, of the FreeBSD Project.
- #=============================================================================
-
-+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
- )
-
-@@ -80,8 +82,8 @@
-
-
- find_library ( QSCINTILLA_LIBRARY
-- NAMES qscintilla qscintilla2 libqscintilla2
-- HINTS ${QT_LIBRARY_DIR}
-+ NAMES qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5
-+ HINTS ${Qt5Core_LIBRARIES}
- )
-
- set ( QSCINTILLA_LIBRARIES ${QSCINTILLA_LIBRARY} )
-diff -Naur sqlitebrowser-3.11.1-orig/CMakeLists.txt sqlitebrowser-3.11.1/CMakeLists.txt
---- sqlitebrowser-3.11.1-orig/CMakeLists.txt 2019-03-20 11:12:47.452357850 -0400
-+++ sqlitebrowser-3.11.1/CMakeLists.txt 2019-03-20 11:19:07.740367280 -0400
-@@ -61,26 +61,12 @@
- endif()
-
- if(NOT FORCE_INTERNAL_ANTLR)
-- find_package(Antlr2 QUIET)
-+ find_package(Antlr2 REQUIRED)
- endif()
- if(NOT FORCE_INTERNAL_QSCINTILLA)
-- find_package(QScintilla QUIET)
-+ find_package(QScintilla REQUIRED)
- 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(Qt5 REQUIRED COMPONENTS Concurrent Gui LinguistTools Network PrintSupport Test Widgets Xml)
-
- set(CMAKE_AUTOMOC ON)
-diff -Naur sqlitebrowser-3.11.1-orig/src/src.pro sqlitebrowser-3.11.1/src/src.pro
---- sqlitebrowser-3.11.1-orig/src/src.pro 2019-03-20 11:12:47.459357850 -0400
-+++ sqlitebrowser-3.11.1/src/src.pro 2019-03-20 11:22:02.891371623 -0400
-@@ -178,10 +178,6 @@
- }
- }
-
--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
- }
-@@ -222,9 +218,7 @@
- }
-
- 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
-+LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2_qt5
-
- unix {
- # Below, the user can specify where all generated file can be placed
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
deleted file mode 100644
index 9264df0706c..00000000000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake 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"
-RESTRICT="!test? ( 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/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtwidgets:5
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- dev-qt/qtprintsupport:5
- dev-qt/qtxml:5
-
-"
-RDEPEND="${DEPEND}
- dev-qt/qtsvg:5
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.11.1-unbundle.patch )
-
-src_prepare() {
- cmake_src_prepare
- rm -r libs || die
- sed -i 's#"src/qhexedit.h"#<qhexedit.h>#' src/EditDialog.cpp || die
- #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 "/find_package/ s/ Test//" -i CMakeLists.txt || die
- sed -e "/set/ s/ Qt5::Test//" -i CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_TESTING=$(usex test)
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- doicon images/sqlitebrowser.svg
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/files/, dev-db/sqlitebrowser/
@ 2015-08-10 22:24 Michael Weber
0 siblings, 0 replies; 4+ messages in thread
From: Michael Weber @ 2015-08-10 22:24 UTC (permalink / raw
To: gentoo-commits
commit: 96be02580a30392352a2fa8e159234d7ea9062ce
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 22:23:46 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 22:23:46 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96be0258
dev-db/sqlitebrowser: drop old version.
Package-Manager: portage-2.2.20
dev-db/sqlitebrowser/Manifest | 1 -
.../files/sqlitebrowser-3.3.1-unbundle.patch | 46 ----------------------
dev-db/sqlitebrowser/sqlitebrowser-3.3.1.ebuild | 45 ---------------------
3 files changed, 92 deletions(-)
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index de294c2..f555aba 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,4 +1,3 @@
-DIST sqlitebrowser-3.3.1.tar.gz 818842 SHA256 5113d3b4c219585fe017047556363d4934b2b3e3f7c3f0968b87e9eac0156d22 SHA512 3cb44631f39b1c1a90b86502761826830054f440509faaece36052958af361185d41335f763499cec5fc005cc90eb7be403c4ac2a5cec655fe63d989434880bc WHIRLPOOL c4ab107ac97800c14ce788e4742beb528f40c74dc787217fdc9fe5dc1f0d8a67b97cd3fc9e6842b54e321d287fff925f050a20d22fbfe5e7491d4c2140c1f6de
DIST sqlitebrowser-3.5.1.tar.gz 874540 SHA256 d7f3d1e54882ebabab3b2f7764a6bb921d4fe319db84a092147c941ce19feb8d SHA512 815665002932a606c7e1da8738be0d94a0b2bf330042af30d5b4033ce27c548fec1a05b51f2a11a7620d4e123961ba63595b60aec7eac716e5d3747bb90886e2 WHIRLPOOL 1b8984eefe730ef468fc64bff1465de3a5b273e3e1594916f05cbe07bec315126001b42cc05d6a3c153aaaccab39bdafa29d31f83fceba6aa7697df7ff870462
DIST sqlitebrowser-3.6.0.tar.gz 1453029 SHA256 221a410a3ec8512a766ed8bc4cade1f3b1cde94e41e52743d5a6d2a33acb3a56 SHA512 ae4a0bb9ac8ff01ec965ae264a41fe7749672cd6562f0ce5e5b69007ea403fff5dcc4f90be3ffa4d9b7d1dc293767f2ca7757de55895f56efbe6b7be0e6721df WHIRLPOOL 93e053d8b6cf9e67f0294117995443865e29923c899a0263ce117979f982155e4020a88ba865a4b92d162fc8842f5b95c4b512575d153cb7f9fa9445880e1b5c
DIST sqlitebrowser-3.7.0.tar.gz 1509766 SHA256 3093a1dcf5b3138c1adf29857d62249ab2b068e70b001869a31151763e28cc3a SHA512 f4c2f517a0b04fb74d8ec656e34f93d467a233040b36fab8f6f172681eb213be5c08131ecdaaa542d833bf24ef564d8e6f800e861b9a20d53de7a585aa104533 WHIRLPOOL 3bbfaa99f179c10f542d344ce6fe55656aa750a52925b2de590e2ba24bcafa95604646e6b218bca4f461390268de2bc2fb29d0de1deaf06438b33cb660e614e8
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.3.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.3.1-unbundle.patch
deleted file mode 100644
index 263afaf..0000000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.3.1-unbundle.patch
+++ /dev/null
@@ -1,46 +0,0 @@
- CMakeLists.txt | 12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 68f049e..474e613 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,13 +7,9 @@ if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE "Release")
- endif()
-
--set(ANTLR_DIR libs/antlr-2.7.7)
- set(QHEXEDIT_DIR libs/qhexedit)
--set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
-
--add_subdirectory(${ANTLR_DIR})
- add_subdirectory(${QHEXEDIT_DIR})
--add_subdirectory(${QCUSTOMPLOT_DIR})
-
- if(USE_QT5)
- find_package(Qt5Widgets REQUIRED)
-@@ -165,9 +161,7 @@ endif(APPLE)
-
- include_directories(
- "${CMAKE_CURRENT_BINARY_DIR}"
-- ${ANTLR_DIR}
- ${QHEXEDIT_DIR}
-- ${QCUSTOMPLOT_DIR}
- ${ADDITIONAL_INCLUDE_PATHS}
- src)
-
-@@ -183,12 +177,10 @@ if(USE_QT5)
- qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
- set(QT_LIBRARIES "")
- endif()
--add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot)
-+add_dependencies(${PROJECT_NAME} qhexedit)
-
- link_directories(
-- "${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
-- "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
-- "${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}")
-+ "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}")
-
- target_link_libraries(${PROJECT_NAME}
- antlr
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.3.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.3.1.ebuild
deleted file mode 100644
index bf0890e..0000000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-DESCRIPTION="SQLite Database Browser"
-HOMEPAGE="http://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=""
-
-DEPEND="
- dev-java/antlr:0[cxx]
- dev-libs/qcustomplot[-qt5(-)]
- dev-qt/qtcore:4
- dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
-
-src_prepare() {
- # https://github.com/qingfengxia/qhexedit still bundled
- find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- # Wait for unmask
- local mycmakeargs=(
- -DUSE_QT5=OFF
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- doicon images/sqlitebrowser.svg
- domenu distri/sqlitebrowser.desktop
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/files/, dev-db/sqlitebrowser/
@ 2015-08-10 22:21 Michael Weber
0 siblings, 0 replies; 4+ messages in thread
From: Michael Weber @ 2015-08-10 22:21 UTC (permalink / raw
To: gentoo-commits
commit: 91763de7d6b5375befcd00ad33af11277c15b699
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 22:21:29 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 22:21:55 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91763de7
dev-db/sqlitebrowser: version bump (bug 554034).
Package-Manager: portage-2.2.20
dev-db/sqlitebrowser/Manifest | 1 +
.../files/sqlitebrowser-3.7.0-unbundle.patch | 18 +++++++
dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild | 60 ++++++++++++++++++++++
3 files changed, 79 insertions(+)
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 7c2b4ba..de294c2 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,3 +1,4 @@
DIST sqlitebrowser-3.3.1.tar.gz 818842 SHA256 5113d3b4c219585fe017047556363d4934b2b3e3f7c3f0968b87e9eac0156d22 SHA512 3cb44631f39b1c1a90b86502761826830054f440509faaece36052958af361185d41335f763499cec5fc005cc90eb7be403c4ac2a5cec655fe63d989434880bc WHIRLPOOL c4ab107ac97800c14ce788e4742beb528f40c74dc787217fdc9fe5dc1f0d8a67b97cd3fc9e6842b54e321d287fff925f050a20d22fbfe5e7491d4c2140c1f6de
DIST sqlitebrowser-3.5.1.tar.gz 874540 SHA256 d7f3d1e54882ebabab3b2f7764a6bb921d4fe319db84a092147c941ce19feb8d SHA512 815665002932a606c7e1da8738be0d94a0b2bf330042af30d5b4033ce27c548fec1a05b51f2a11a7620d4e123961ba63595b60aec7eac716e5d3747bb90886e2 WHIRLPOOL 1b8984eefe730ef468fc64bff1465de3a5b273e3e1594916f05cbe07bec315126001b42cc05d6a3c153aaaccab39bdafa29d31f83fceba6aa7697df7ff870462
DIST sqlitebrowser-3.6.0.tar.gz 1453029 SHA256 221a410a3ec8512a766ed8bc4cade1f3b1cde94e41e52743d5a6d2a33acb3a56 SHA512 ae4a0bb9ac8ff01ec965ae264a41fe7749672cd6562f0ce5e5b69007ea403fff5dcc4f90be3ffa4d9b7d1dc293767f2ca7757de55895f56efbe6b7be0e6721df WHIRLPOOL 93e053d8b6cf9e67f0294117995443865e29923c899a0263ce117979f982155e4020a88ba865a4b92d162fc8842f5b95c4b512575d153cb7f9fa9445880e1b5c
+DIST sqlitebrowser-3.7.0.tar.gz 1509766 SHA256 3093a1dcf5b3138c1adf29857d62249ab2b068e70b001869a31151763e28cc3a SHA512 f4c2f517a0b04fb74d8ec656e34f93d467a233040b36fab8f6f172681eb213be5c08131ecdaaa542d833bf24ef564d8e6f800e861b9a20d53de7a585aa104533 WHIRLPOOL 3bbfaa99f179c10f542d344ce6fe55656aa750a52925b2de590e2ba24bcafa95604646e6b218bca4f461390268de2bc2fb29d0de1deaf06438b33cb660e614e8
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch
new file mode 100644
index 0000000..8dbe870
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch
@@ -0,0 +1,18 @@
+--- sqlitebrowser-3.7.0/CMakeLists.txt
++++ sqlitebrowser-3.7.0/CMakeLists.txt
+@@ -29,15 +29,9 @@
+ find_package(Antlr2)
+
+ set(QHEXEDIT_DIR libs/qhexedit)
+-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
+ set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
+
+-if(NOT ANTLR2_FOUND)
+- set(ANTLR_DIR libs/antlr-2.7.7)
+- add_subdirectory(${ANTLR_DIR})
+-endif()
+ add_subdirectory(${QHEXEDIT_DIR})
+-add_subdirectory(${QCUSTOMPLOT_DIR})
+ add_subdirectory(${QSCINTILLA_DIR})
+
+ if(USE_QT5)
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild
new file mode 100644
index 0000000..041e204
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MAKEFILE_GENERATOR=ninja
+
+inherit eutils cmake-utils
+
+DESCRIPTION="SQLite Database Browser"
+HOMEPAGE="http://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="qt4 qt5 test"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+DEPEND="
+ dev-db/sqlite:3
+ dev-java/antlr:0[cxx]
+ dev-libs/qcustomplot[qt5=]
+ x11-libs/qscintilla
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ )
+ qt5? (
+ dev-qt/linguist:5
+ dev-qt/linguist-tools:5
+ dev-qt/qtnetwork:5
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
+
+src_prepare() {
+ # https://github.com/qingfengxia/qhexedit still bundled
+ # x11-libs/qscintilla[qt4?,qt5?] still bundled
+ find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_use qt5)
+ $(cmake-utils_use_enable test TESTING)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ doicon images/sqlitebrowser.svg
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-06-17 6:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-18 11:34 [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/files/, dev-db/sqlitebrowser/ Michael Weber
-- strict thread matches above, loose matches on Subject: below --
2021-06-17 6:49 Joonas Niilola
2015-08-10 22:24 Michael Weber
2015-08-10 22:21 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox