From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../files/sqlitebrowser-3.3.1-unbundle.patch | 46 +++++++++++++ .../files/sqlitebrowser-3.5.1-unbundle.patch | 70 ++++++++++++++++++++ ...itebrowser-3.6.0-unbundle-keep-qscintilla.patch | 62 ++++++++++++++++++ .../files/sqlitebrowser-3.6.0-unbundle.patch | 75 ++++++++++++++++++++++ 4 files changed, 253 insertions(+) create mode 100644 dev-db/sqlitebrowser/files/sqlitebrowser-3.3.1-unbundle.patch create mode 100644 dev-db/sqlitebrowser/files/sqlitebrowser-3.5.1-unbundle.patch create mode 100644 dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch create mode 100644 dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle.patch (limited to 'dev-db/sqlitebrowser/files') diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.3.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.3.1-unbundle.patch new file mode 100644 index 000000000000..263afaf2dea9 --- /dev/null +++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.3.1-unbundle.patch @@ -0,0 +1,46 @@ + CMakeLists.txt | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 68f049e..474e613 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) +@@ -165,9 +161,7 @@ endif(APPLE) + + include_directories( + "${CMAKE_CURRENT_BINARY_DIR}" +- ${ANTLR_DIR} + ${QHEXEDIT_DIR} +- ${QCUSTOMPLOT_DIR} + ${ADDITIONAL_INCLUDE_PATHS} + src) + +@@ -183,12 +177,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/dev-db/sqlitebrowser/files/sqlitebrowser-3.5.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.5.1-unbundle.patch new file mode 100644 index 000000000000..203ddfbeaa68 --- /dev/null +++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.5.1-unbundle.patch @@ -0,0 +1,70 @@ + 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 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}) + diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle.patch new file mode 100644 index 000000000000..d3b31bcbcbe4 --- /dev/null +++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle.patch @@ -0,0 +1,75 @@ +--- 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}) + -- cgit v1.2.3