diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2018-02-18 09:55:10 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2018-02-18 09:55:10 +0000 |
| commit | 6699fae7a2bf742155c5f8c7be3d4fe07237626a (patch) | |
| tree | 4b1fc931365e58df5d682ecb7a950cc1fb1609e3 /databases/sqliteman | |
| parent | Update devel/qca and devel/qca-qt5 to 2.1.3. (diff) | |
Update QScintilla 2.10.2.
Upstream has renamed its libraries and we no longer need to patch
devel/qscintilla-qt5 to create a library whose name does not conflict with
devel/qscintilla's. However, the library names are different so we need to bump
PORTREVISION in several ports (the SOVERSION has changed too).
Thanks to antoine for the exp-run.
PR: 225928
Diffstat (limited to 'databases/sqliteman')
| -rw-r--r-- | databases/sqliteman/Makefile | 4 | ||||
| -rw-r--r-- | databases/sqliteman/files/patch-cmake_modules_FindQScintilla.cmake | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile index 09a8112958d8..4201bd085b2f 100644 --- a/databases/sqliteman/Makefile +++ b/databases/sqliteman/Makefile @@ -3,14 +3,14 @@ PORTNAME= sqliteman PORTVERSION= 1.2.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= databases MASTER_SITES= SF MAINTAINER= wen@FreeBSD.org COMMENT= Admin's GUI tool for Sqlite3 -LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2 +LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2 USES= cmake sqlite USE_QT4= qmake_build gui moc_build rcc_build uic_build xml sql diff --git a/databases/sqliteman/files/patch-cmake_modules_FindQScintilla.cmake b/databases/sqliteman/files/patch-cmake_modules_FindQScintilla.cmake new file mode 100644 index 000000000000..8e0adee9f6e9 --- /dev/null +++ b/databases/sqliteman/files/patch-cmake_modules_FindQScintilla.cmake @@ -0,0 +1,12 @@ +The library is called libqscintilla_qt4.so since 2.10.2. +--- cmake/modules/FindQScintilla.cmake.orig 2018-02-16 21:57:36 UTC ++++ cmake/modules/FindQScintilla.cmake +@@ -21,7 +21,7 @@ IF(QT4_FOUND) + "${QT_INCLUDE_DIR}/Qsci" /usr/include /usr/include/Qsci + ) + +- SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2) ++ SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2_qt4 qscintilla2 libqscintilla2) + FIND_LIBRARY(QSCINTILLA_LIBRARY + NAMES ${QSCINTILLA_NAMES} + PATHS ${QT_LIBRARY_DIR} |