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

Closes: https://bugs.gentoo.org/640862
Package-Manager: Portage-2.3.19, Repoman-2.3.6

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 9e2ad3e910b762a2ea29e173175e68aa226e4ed2..b774e41ecd83b56fb8a7f8959840390d13965262 100644 (file)
--- 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 c661e29a9f2c89629d34f727978eb328e078e233..42732d6e3e70705213e8a09ae37b39670dc09ed0 100644 (file)
--- 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