diff options
| author | Michael Weber <xmw@gentoo.org> | 2017-12-11 10:05:08 +0100 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2017-12-11 10:05:08 +0100 |
| commit | 6d1f62107c04fdeacd0471e901cd60af99ffeac4 (patch) | |
| tree | de884dcae9d96f733de736b1640709ca7bd3d0ab /dev-db/sqlitebrowser/files | |
| parent | bcc4b7eb0a340d6d1fd86be90be6dce3c3f92532 (diff) | |
| download | gentoo-6d1f62107c04fdeacd0471e901cd60af99ffeac4.tar.gz gentoo-6d1f62107c04fdeacd0471e901cd60af99ffeac4.tar.bz2 gentoo-6d1f62107c04fdeacd0471e901cd60af99ffeac4.zip | |
dev-db/sqlitebrowser: Version bump, thanks @jok-ts, @a17r et al.
Reported-by: Anton Bolshakov <blshkv@pentoo.ch>
Suggested-by: Jouni Kosonen <jouni.kosonen@tukesoft.com>
Closes: https://bugs.gentoo.org/633412
Closes: https://github.com/gentoo/gentoo/pull/6322
Package-Manager: Portage-2.3.17, Repoman-2.3.6
Diffstat (limited to 'dev-db/sqlitebrowser/files')
| -rw-r--r-- | dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch new file mode 100644 index 000000000000..9e2ad3e910b7 --- /dev/null +++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch @@ -0,0 +1,59 @@ +diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake +index f469637..92c2d37 100644 +--- a/cmake/FindQScintilla.cmake ++++ b/cmake/FindQScintilla.cmake +@@ -43,9 +43,12 @@ + #============================================================================= + + ++SET (QT_MIN_VERSION "5.6.2") ++FIND_PACKAGE( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Network Widgets ) ++ + find_path ( QSCINTILLA_INCLUDE_DIR + NAMES qsciscintilla.h +- HINTS ${QT_INCLUDE_DIR} ++ HINTS ${Qt5Core_INCLUDE_DIRS} + PATH_SUFFIXES Qsci + ) + +@@ -81,6 +84,6 @@ endif () + + find_library ( QSCINTILLA_LIBRARY +- NAMES qscintilla qscintilla2 libqscintilla2 +- HINTS ${QT_LIBRARY_DIR} ++ NAMES qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5 ++ HINTS ${Qt5Core_LIBRARIES} + ) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fdf5b4c..ffba6d7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,26 +47,20 @@ if(WIN32 AND MSVC) + endif() + + if(NOT FORCE_INTERNAL_ANTLR) +- find_package(Antlr2) ++ find_package(Antlr2 REQUIRED) + endif() + if(NOT FORCE_INTERNAL_QSCINTILLA) + find_package(QScintilla) + endif() + + set(QHEXEDIT_DIR libs/qhexedit) +-set(QCUSTOMPLOT_DIR libs/qcustomplot-source) + +-if(NOT ANTLR2_FOUND) +- set(ANTLR_DIR libs/antlr-2.7.7) +- add_subdirectory(${ANTLR_DIR}) +-endif() + if(NOT QSCINTILLA_FOUND) + set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5) + add_subdirectory(${QSCINTILLA_DIR}) + endif() + add_subdirectory(${QHEXEDIT_DIR}) +-add_subdirectory(${QCUSTOMPLOT_DIR}) + + find_package(Qt5Widgets REQUIRED) + find_package(Qt5LinguistTools REQUIRED) + |