summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>2016-07-19 19:29:57 +0200
committerPatrice Clement <monsieurp@gentoo.org>2016-07-30 08:46:41 +0200
commit3e85c8c4859384b2e7860512dee265c8d18ec370 (patch)
tree7651bef4ad238b7146bfcac02f06ae99e39c6046 /dev-db/sqlitebrowser
parentx11-terms/xfce4-terminal: Bump to 0.6.90, early GTK+3 release (diff)
downloadgentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.tar.gz
gentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.tar.bz2
gentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.zip
dev-db/*: remove unused patches.
Squash all commit messages into a single one. Closes: https://github.com/gentoo/gentoo/pull/1936 Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'dev-db/sqlitebrowser')
-rw-r--r--dev-db/sqlitebrowser/files/sqlitebrowser-3.5.1-unbundle.patch70
-rw-r--r--dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch62
2 files changed, 0 insertions, 132 deletions
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.5.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.5.1-unbundle.patch
deleted file mode 100644
index 203ddfbeaa6..00000000000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.5.1-unbundle.patch
+++ /dev/null
@@ -1,70 +0,0 @@
- CMakeLists.txt | 12 ++----------
- tests/CMakeLists.txt | 5 +----
- 2 files changed, 3 insertions(+), 14 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4a76947..a58510b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,13 +7,9 @@ if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE "Release")
- endif()
-
--set(ANTLR_DIR libs/antlr-2.7.7)
- set(QHEXEDIT_DIR libs/qhexedit)
--set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
-
--add_subdirectory(${ANTLR_DIR})
- add_subdirectory(${QHEXEDIT_DIR})
--add_subdirectory(${QCUSTOMPLOT_DIR})
-
- if(USE_QT5)
- find_package(Qt5Widgets REQUIRED)
-@@ -191,9 +187,7 @@ endif(EXTRAPATH)
-
- include_directories(
- "${CMAKE_CURRENT_BINARY_DIR}"
-- ${ANTLR_DIR}
- ${QHEXEDIT_DIR}
-- ${QCUSTOMPLOT_DIR}
- ${ADDITIONAL_INCLUDE_PATHS}
- src)
-
-@@ -210,12 +204,10 @@ if(USE_QT5)
- qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
- set(QT_LIBRARIES "")
- endif()
--add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot)
-+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}/${QHEXEDIT_DIR}")
-
- target_link_libraries(${PROJECT_NAME}
- antlr
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 75009dc..6fd7f48 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -7,9 +7,6 @@ if(NOT CMAKE_BUILD_TYPE)
- 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)
-@@ -56,7 +53,7 @@ if(NOT USE_QT5)
- QT4_WRAP_CPP(SQLB_MOC ${SQLB_MOC_HDR})
- endif()
-
--include_directories("${ANTLR_DIR}" ../src)
-+include_directories(../src)
-
- add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC})
-
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
deleted file mode 100644
index 6d47c258694..00000000000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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})
-