gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-db/sqlitebrowser: Fix tests, thanks Jouni Kosonen.

Browse Source 
Closes: https://bugs.gentoo.org/640862
Package-Manager: Portage-2.3.19, Repoman-2.3.6
This commit is contained in:
Michael Weber
2017-12-18 12:33:45 +01:00
parent 1712f00549
commit aaf313529f
2 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch
View File

@@ -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

3
dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
View File

@@ -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