xmw 15/06/02 08:24:05
Added: sqlitebrowser-3.6.0-unbundle.patch
sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch
Log:
Version bump (bug 550292 by Tomáš Chaloupka).
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
62EEF090)
Revision Changes Path
1.1
dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle.patch?rev=1.1&content-type=text/plain
Index: sqlitebrowser-3.6.0-unbundle.patch
===================================================================
--- sqlitebrowser-3.6.0/CMakeLists.txt
+++ sqlitebrowser-3.6.0/CMakeLists.txt
@@ -21,15 +21,9 @@
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)
find_package(Qt5Widgets REQUIRED)
@@ -31,7 +31,7 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
else()
- find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED)
+ find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork qscintilla2 REQUIRED)
include("${QT_USE_FILE}")
add_definitions(${QT_DEFINITIONS})
endif()
@@ -207,10 +201,7 @@
include_directories(
"${CMAKE_CURRENT_BINARY_DIR}"
- ${ANTLR_DIR}
${QHEXEDIT_DIR}
- ${QCUSTOMPLOT_DIR}
- ${QSCINTILLA_DIR}
${ADDITIONAL_INCLUDE_PATHS}
src)
@@ -227,13 +218,10 @@
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)
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}")
+ "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}")
target_link_libraries(${PROJECT_NAME}
antlr
--- 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})
1.1
dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch?rev=1.1&content-type=text/plain
Index: sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch
===================================================================
--- 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})
