Page MenuHomeFreeBSD
Files F153540457

D14930.diff
No OneTemporary
Actions

D14930.diff
View Options

Index: head/databases/sqlitebrowser/Makefile
===================================================================
--- head/databases/sqlitebrowser/Makefile
+++ head/databases/sqlitebrowser/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sqlitebrowser
PORTVERSION= 3.10.1
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= databases
@@ -14,9 +15,10 @@
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${LOCALBASE}/lib/libantlr.a:devel/antlr
+LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
USES= cmake desktop-file-utils sqlite
-CMAKE_ARGS+= -DUSE_QT5:BOOL=TRUE
+CMAKE_ARGS+= -DQT_INCLUDE_DIR=${QT_INCDIR} -DQT_LIBRARY_DIR=${QT_LIBDIR}
USE_QT5= core gui network printsupport testlib widgets \
buildtools_build linguisttools_build qmake_build
USE_GITHUB= yes
Index: head/databases/sqlitebrowser/files/patch-cmake_FindQScintilla.cmake
===================================================================
--- head/databases/sqlitebrowser/files/patch-cmake_FindQScintilla.cmake
+++ head/databases/sqlitebrowser/files/patch-cmake_FindQScintilla.cmake
@@ -0,0 +1,27 @@
+The find module sets QSCINTILLA_INCLUDE_DIR to the directory containing
+qsciscintilla.h, which in our case is already in the subdirectory Qsci/,
+so (also) try another path for the version file. Accept only the Qt5
+versions of the library.
+
+--- cmake/FindQScintilla.cmake.orig 2017-09-20 13:59:51 UTC
++++ cmake/FindQScintilla.cmake
+@@ -53,6 +53,10 @@ set ( QSCINTILLA_INCLUDE_DIRS ${QSCINTIL
+
+ # version
+ set ( _VERSION_FILE ${QSCINTILLA_INCLUDE_DIR}/Qsci/qsciglobal.h )
++if ( NOT EXISTS ${_VERSION_FILE} )
++ set ( _VERSION_FILE ${QSCINTILLA_INCLUDE_DIR}/qsciglobal.h )
++endif()
++
+ if ( EXISTS ${_VERSION_FILE} )
+ file ( STRINGS ${_VERSION_FILE} _VERSION_LINE REGEX "define[ ]+QSCINTILLA_VERSION_STR" )
+ if ( _VERSION_LINE )
+@@ -80,7 +84,7 @@ endif ()
+
+
+ find_library ( QSCINTILLA_LIBRARY
+- NAMES qscintilla qscintilla2 libqscintilla2
++ NAMES qscintilla2_qt5 libqscintilla2_qt5
+ HINTS ${QT_LIBRARY_DIR}
+ )
+

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 22, 6:38 PM (16 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31993848
Default Alt Text
D14930.diff (1 KB)

Event Timeline