Date: Sat, 10 Sep 2016 08:15:25 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421674 - head/editors/texstudio Message-ID: <201609100815.u8A8FP03025069@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sat Sep 10 08:15:25 2016 New Revision: 421674 URL: https://svnweb.freebsd.org/changeset/ports/421674 Log: Use system hunspell and quazip Stop building its own bundled copies of quazip and hunspell. Using bundled libraries is bad for several reasons [1], including breaking the build, which happens with Qt 5.6 that passes -std=gnu++11 by default when the compiler supports it: hunspell/affentry.hxx:30:94: error: cannot initialize a parameter of type 'unsigned short' with an rvalue of type 'nullptr_t' hunspell/affentry.hxx:93:103: error: cannot initialize a parameter of type 'unsigned short' with an rvalue of type 'nullptr_t' Switching to the system versions fixes everything. [1] https://www.freebsd.org/doc/en/books/porters-handbook/bundled-libs.html PR: 212349 Approved by: portmgr (mat) Modified: head/editors/texstudio/Makefile Modified: head/editors/texstudio/Makefile ============================================================================== --- head/editors/texstudio/Makefile Sat Sep 10 07:57:58 2016 (r421673) +++ head/editors/texstudio/Makefile Sat Sep 10 08:15:25 2016 (r421674) @@ -2,14 +2,15 @@ PORTNAME= texstudio PORTVERSION= 2.11.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION} MAINTAINER= abiliojr@gmail.com COMMENT= Integrated writing environment for LaTeX documents -LIB_DEPENDS= libpoppler.so:graphics/poppler +LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell \ + libpoppler.so:graphics/poppler USES= desktop-file-utils dos2unix execinfo ghostscript:run \ pkgconfig qmake @@ -30,11 +31,19 @@ OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT= QT4 QT5 OPTIONS_DEFAULT= QT5 +QMAKE_ARGS= USE_SYSTEM_HUNSPELL=true USE_SYSTEM_QUAZIP=true + TOOLKIT_DESC= Qt toolkit QT4_USE= ${_USE_QT4:S/^/QT4=/} -QT4_LIB_DEPENDS=libpoppler-qt4.so:graphics/poppler-qt4 +QT4_LIB_DEPENDS=libpoppler-qt4.so:graphics/poppler-qt4 \ + libquazip.so:archivers/quazip +QT4_QMAKE_ON= QUAZIP_INCLUDE="${LOCALBASE}/include/quazip" \ + QUAZIP_LIB="-lquazip" QT5_USE= ${_USE_QT5:S/^/QT5=/} -QT5_LIB_DEPENDS=libpoppler-qt5.so:graphics/poppler-qt5 +QT5_LIB_DEPENDS=libpoppler-qt5.so:graphics/poppler-qt5 \ + libquazip5.so:archivers/quazip-qt5 +QT5_QMAKE_ON= QUAZIP_INCLUDE="${LOCALBASE}/include/quazip5" \ + QUAZIP_LIB="-lquazip5" post-patch: @${REINPLACE_CMD} -e 's,^\(utilities.path =\).*,\1 ${DATADIR},' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609100815.u8A8FP03025069>