From owner-svn-ports-all@freebsd.org Fri Apr 6 12:09:22 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 39474FA1491; Fri, 6 Apr 2018 12:09:22 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C5923772E4; Fri, 6 Apr 2018 12:09:21 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A81BB11893; Fri, 6 Apr 2018 12:09:21 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w36C9LWd099507; Fri, 6 Apr 2018 12:09:21 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w36C9L3R099505; Fri, 6 Apr 2018 12:09:21 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201804061209.w36C9L3R099505@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Fri, 6 Apr 2018 12:09:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466639 - in head/databases/sqlitebrowser: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/databases/sqlitebrowser: . files X-SVN-Commit-Revision: 466639 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Apr 2018 12:09:22 -0000 Author: adridg Date: Fri Apr 6 12:09:21 2018 New Revision: 466639 URL: https://svnweb.freebsd.org/changeset/ports/466639 Log: The find module for QScintilla included with sqlitebrowser has never worked (well) on FreeBSD. Then the port used en embedded copy of QScintilla. Switch to using the system QScintilla. This change is triggered by CMake 3.11, which tried to build the embedded QScintilla slightly differently. That fails because there are header files declaring enum { SCI_CANREDO = 2016 } *and also* header files that #define SCI_CANREDO 2016; the include order is very fragile. Also reported upstream. Reviewed by: lbartoletti_tuxfamily (maintainer) Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D14930 Added: head/databases/sqlitebrowser/files/patch-cmake_FindQScintilla.cmake (contents, props changed) Modified: head/databases/sqlitebrowser/Makefile Modified: head/databases/sqlitebrowser/Makefile ============================================================================== --- head/databases/sqlitebrowser/Makefile Fri Apr 6 10:56:30 2018 (r466638) +++ head/databases/sqlitebrowser/Makefile Fri Apr 6 12:09:21 2018 (r466639) @@ -3,6 +3,7 @@ PORTNAME= sqlitebrowser PORTVERSION= 3.10.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= databases @@ -14,9 +15,10 @@ LICENSE_COMB= dual 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 Added: head/databases/sqlitebrowser/files/patch-cmake_FindQScintilla.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/sqlitebrowser/files/patch-cmake_FindQScintilla.cmake Fri Apr 6 12:09:21 2018 (r466639) @@ -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} + ) +