summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2017-12-18 12:33:45 +0100
committerMichael Weber <xmw@gentoo.org>2017-12-18 12:33:45 +0100
commitaaf313529ffdb9a96aa8a371804e29a3d16f4f1f (patch)
tree344b34f51acb34c7a71d55c5bd56ebc4e01bcdca /dev-db/sqlitebrowser
parentnet-dns/dnssec-lookup: Remove old. (diff)
downloadgentoo-aaf313529ffdb9a96aa8a371804e29a3d16f4f1f.tar.gz
gentoo-aaf313529ffdb9a96aa8a371804e29a3d16f4f1f.tar.bz2
gentoo-aaf313529ffdb9a96aa8a371804e29a3d16f4f1f.zip
dev-db/sqlitebrowser: Fix tests, thanks Jouni Kosonen.
Closes: https://bugs.gentoo.org/640862 Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'dev-db/sqlitebrowser')
-rw-r--r--dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch46
-rw-r--r--dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild3
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