From owner-svn-ports-all@freebsd.org Sat Sep 10 08:20:28 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 651DDBD5A29; Sat, 10 Sep 2016 08:20:28 +0000 (UTC) (envelope-from rakuco@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 mx1.freebsd.org (Postfix) with ESMTPS id 42DF1C12; Sat, 10 Sep 2016 08:20:28 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8A8KR01025416; Sat, 10 Sep 2016 08:20:27 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8A8KRkK025414; Sat, 10 Sep 2016 08:20:27 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201609100820.u8A8KRkK025414@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sat, 10 Sep 2016 08:20:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421675 - in head/editors/texmaker: . files X-SVN-Group: ports-head 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.23 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: Sat, 10 Sep 2016 08:20:28 -0000 Author: rakuco Date: Sat Sep 10 08:20:27 2016 New Revision: 421675 URL: https://svnweb.freebsd.org/changeset/ports/421675 Log: Use system hunspell Stop building texmaker's own, utdated bundled copy of hunspell. In addition to the obvious reasons, this is necessary to get the port to build with the upcoming Qt 5.6, as it passes -std=gnu++11 to the compiler automatically when it's supported and building the bundled hunspell failed like this: hunspell/affentry.hxx:28:94: error: cannot initialize a parameter of type 'unsigned short' with an rvalue of type 'nullptr_t' hunspell/affentry.hxx:91:103: error: cannot initialize a parameter of type 'unsigned short' with an rvalue of type 'nullptr_t' See also: https://www.freebsd.org/doc/en/books/porters-handbook/bundled-libs.html PR: 212366 Approved by: portmgr (mat) Modified: head/editors/texmaker/Makefile head/editors/texmaker/files/patch-texmaker.pro Modified: head/editors/texmaker/Makefile ============================================================================== --- head/editors/texmaker/Makefile Sat Sep 10 08:15:25 2016 (r421674) +++ head/editors/texmaker/Makefile Sat Sep 10 08:20:27 2016 (r421675) @@ -3,7 +3,7 @@ PORTNAME= texmaker PORTVERSION= 4.5 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 3 CATEGORIES= editors MASTER_SITES= http://www.xm1math.net/texmaker/ @@ -11,7 +11,8 @@ MASTER_SITES= http://www.xm1math.net/tex MAINTAINER= makc@FreeBSD.org COMMENT= LaTeX Development Environment -LIB_DEPENDS= libpoppler.so:graphics/poppler +LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell \ + libpoppler.so:graphics/poppler USES= desktop-file-utils ghostscript:x11,run pkgconfig qmake tar:bzip2 _USE_QT4= gui network xml webkit \ Modified: head/editors/texmaker/files/patch-texmaker.pro ============================================================================== --- head/editors/texmaker/files/patch-texmaker.pro Sat Sep 10 08:15:25 2016 (r421674) +++ head/editors/texmaker/files/patch-texmaker.pro Sat Sep 10 08:20:27 2016 (r421675) @@ -1,6 +1,65 @@ ---- texmaker.pro.orig 2014-12-14 22:51:47 UTC +--- texmaker.pro.orig 2015-10-24 09:05:27 UTC +++ texmaker.pro -@@ -393,13 +393,6 @@ utilities.files = doc/doc1.png \ +@@ -19,11 +19,11 @@ DEFINES += HAVE_SPLASH + unix:!macx { + contains( QT_VERSION, "^5.*" ) { + CONFIG += link_pkgconfig +-PKGCONFIG = poppler-qt5 ++PKGCONFIG = hunspell poppler-qt5 + DEFINES += POPPLER24 + } else { + CONFIG += link_pkgconfig +-PKGCONFIG = poppler-qt4 ++PKGCONFIG = hunspell poppler-qt4 + DETECTEDPOPPLER=$$system(pkg-config --modversion poppler) + contains( DETECTEDPOPPLER, "^0.18.*" ){ + DEFINES += OLDPOPPLER +@@ -98,25 +98,6 @@ HEADERS += texmaker.h \ + unicodeview.h \ + quickbeamerdialog.h \ + svnhelper.h \ +- hunspell/affentry.hxx \ +- hunspell/affixmgr.hxx \ +- hunspell/atypes.hxx \ +- hunspell/baseaffix.hxx \ +- hunspell/csutil.hxx \ +- hunspell/dictmgr.hxx \ +- hunspell/hashmgr.hxx \ +- hunspell/htypes.hxx \ +- hunspell/hunspell.hxx \ +- hunspell/hunspell.h \ +- hunspell/langnum.hxx \ +- hunspell/license.hunspell \ +- hunspell/phonet.hxx \ +- hunspell/suggestmgr.hxx \ +- hunspell/license.myspell \ +- hunspell/filemgr.hxx \ +- hunspell/hunzip.hxx \ +- hunspell/replist.hxx \ +- hunspell/w_char.hxx \ + singleapp/qtlocalpeer.h \ + singleapp/qtlockedfile.h \ + singleapp/qtsingleapplication.h \ +@@ -210,18 +191,6 @@ SOURCES += main.cpp \ + unicodeview.cpp \ + quickbeamerdialog.cpp \ + svnhelper.cpp \ +- hunspell/affentry.cxx \ +- hunspell/affixmgr.cxx \ +- hunspell/csutil.cxx \ +- hunspell/dictmgr.cxx \ +- hunspell/hashmgr.cxx \ +- hunspell/hunspell.cxx \ +- hunspell/phonet.cxx \ +- hunspell/suggestmgr.cxx \ +- hunspell/utf_info.cxx \ +- hunspell/filemgr.cxx \ +- hunspell/replist.cxx \ +- hunspell/hunzip.cxx \ + singleapp/qtlocalpeer.cpp \ + singleapp/qtlockedfile.cpp \ + singleapp/qtsingleapplication.cpp \ +@@ -395,13 +364,6 @@ utilities.files = doc/doc1.png \ utilities/AUTHORS \ utilities/COPYING \ utilities/CHANGELOG.txt \ @@ -14,7 +73,7 @@ scripts/titlecase_selection.tms \ scripts/hardwordwrap_selection_80col.tms \ locale/qt_cs.qm \ -@@ -475,4 +468,20 @@ INSTALLS += desktop +@@ -477,4 +439,20 @@ INSTALLS += desktop icon.files = utilities/texmaker.png INSTALLS += icon