diff options
Diffstat (limited to 'dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch')
| -rw-r--r-- | dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch new file mode 100644 index 000000000000..6d47c2586942 --- /dev/null +++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch @@ -0,0 +1,62 @@ +--- sqlitebrowser-3.6.0/CMakeLists.txt ++++ sqlitebrowser-3.6.0/CMakeLists.txt +@@ -21,14 +21,10 @@ + set(CMAKE_PREFIX_PATH "${QT5_PATH};${SQLITE3_PATH}") + endif() + +-set(ANTLR_DIR libs/antlr-2.7.7) + set(QHEXEDIT_DIR libs/qhexedit) +-set(QCUSTOMPLOT_DIR libs/qcustomplot-source) + set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5) + +-add_subdirectory(${ANTLR_DIR}) + add_subdirectory(${QHEXEDIT_DIR}) +-add_subdirectory(${QCUSTOMPLOT_DIR}) + add_subdirectory(${QSCINTILLA_DIR}) + + if(USE_QT5) +@@ -207,9 +201,7 @@ + + include_directories( + "${CMAKE_CURRENT_BINARY_DIR}" +- ${ANTLR_DIR} + ${QHEXEDIT_DIR} +- ${QCUSTOMPLOT_DIR} + ${QSCINTILLA_DIR} + ${ADDITIONAL_INCLUDE_PATHS} + src) +@@ -227,12 +218,9 @@ + qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport) + set(QT_LIBRARIES "") + endif() +-add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot qscintilla2) ++add_dependencies(${PROJECT_NAME} qhexedit qscintilla2) + + link_directories( +- "${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}" +- "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}" +- "${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}" + "${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}") + + target_link_libraries(${PROJECT_NAME} +--- sqlitebrowser-3.6.0/tests/CMakeLists.txt ++++ sqlitebrowser-3.6.0/tests/CMakeLists.txt +@@ -7,9 +7,6 @@ + set(CMAKE_BUILD_TYPE "Release") + endif() + +-set(ANTLR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libs/antlr-2.7.7") +-add_subdirectory("${ANTLR_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/antlr") +- + if(USE_QT5) + find_package(Qt5Widgets REQUIRED) + set(CMAKE_AUTOMOC ON) +@@ -65,7 +62,7 @@ + QT4_WRAP_UI(SQLB_FORM_HDR ${SQLB_FORMS}) + endif() + +-include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${ANTLR_DIR}" ../src) ++include_directories("${CMAKE_CURRENT_BINARY_DIR}" ../src) + + add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC} ${SQLB_FORM_HDR}) + |