Index: head/print/lyx/Makefile =================================================================== --- head/print/lyx/Makefile (revision 418406) +++ head/print/lyx/Makefile (revision 418407) @@ -1,51 +1,57 @@ # Created by: Klemm # $FreeBSD$ PORTNAME= lyx PORTVERSION= ${MAJOR_VERSION}.${MINOR_VERSION} CATEGORIES= print editors MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \ http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \ ftp://ftp.ntua.gr/pub/X11/LyX/stable/${MAJOR_VERSION}.x/ \ http://sunsite.icm.edu.pl/pub/unix/editors/lyx/stable/${MAJOR_VERSION}.x/ MAINTAINER= rakuco@FreeBSD.org COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) LICENSE= GPLv2 LIB_DEPENDS= libboost_regex.so:devel/boost-libs \ libmythes-1.2.so:textproc/mythes MAJOR_VERSION= 2.2 MINOR_VERSION= 0 USES= desktop-file-utils execinfo gmake iconv pkgconfig perl5 \ python:2 tar:xz USE_QT4= corelib gui svg moc_build uic_build rcc_build GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-included-boost \ --without-included-mythes \ --disable-qt5 \ ${ICONV_CONFIGURE_ARG} \ --with-extra-prefix=${LOCALBASE} CPPFLAGS+= ${EXECINFO_CPPFLAGS} LDFLAGS+= ${EXECINFO_LDFLAGS} LIBS+= -lexecinfo OPTIONS_DEFINE= ASPELL ENCHANT HUNSPELL NLS OPTIONS_DEFAULT= HUNSPELL OPTIONS_SUB= yes ENCHANT_DESC= Spell checking using Enchant ASPELL_CONFIGURE_OFF= --without-aspell ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell ENCHANT_CONFIGURE_OFF= --without-enchant ENCHANT_LIB_DEPENDS= libenchant.so:textproc/enchant HUNSPELL_CONFIGURE_OFF= --without-hunspell HUNSPELL_LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell NLS_CONFIGURE_OFF= --disable-nls NLS_USES= gettext -.include +.include + +.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1000000 && ${OSVERSION} < 1002000) +EXTRA_PATCHES= ${FILESDIR}/extrapatch-src_frontends_qt4_GuiWorkArea.cpp +.endif + +.include Index: head/print/lyx/files/extrapatch-src_frontends_qt4_GuiWorkArea.cpp =================================================================== --- head/print/lyx/files/extrapatch-src_frontends_qt4_GuiWorkArea.cpp (nonexistent) +++ head/print/lyx/files/extrapatch-src_frontends_qt4_GuiWorkArea.cpp (revision 418407) @@ -0,0 +1,28 @@ +This patch is necessary for FreeBSD 10.0 and 10.1, whose libc++ does not work +with boost and std::bind() and leads to the following failure: + +frontends/qt4/liblyxqt4.a(GuiWorkArea.o): In function `_ZN5boost6detail8function26void_function_obj_invoker0INSt3__16__bindIMN3lyx8frontend11GuiWorkAreaEFvvEJPS7_EEEvE6invokeERNS1_15function_bufferE': +GuiWorkArea.cpp:(.text._ZN5boost6detail8function26void_function_obj_invoker0INSt3__16__bindIMN3lyx8frontend11GuiWorkAreaEFvvEJPS7_EEEvE6invokeERNS1_15function_bufferE[_ZN5boost6detail8function26void_function_obj_invoker0INSt3__16__bindIMN3lyx8frontend11GuiWorkAreaEFvvEJPS7_EEEvE6invokeERNS1_15function_bufferE]+0xa): undefined reference to `_ZNSt3__18__invokeIRMN3lyx8frontend11GuiWorkAreaEFvvERPS3_JEvEEDTcldsdeclsr3std3__1E7forwardIT0_Efp0_Efp_spclsr3std3__1E7forwardIT1_Efp1_EEEOT_OS9_DpOSA_' +/usr/bin/ld: lyx: hidden symbol `_ZNSt3__18__invokeIRMN3lyx8frontend11GuiWorkAreaEFvvERPS3_JEvEEDTcldsdeclsr3std3__1E7forwardIT0_Efp0_Efp_spclsr3std3__1E7forwardIT1_Efp1_EEEOT_OS9_DpOSA_' isn't defined +/usr/bin/ld: final link failed: Nonrepresentable section on output + +--- src/frontends/qt4/GuiWorkArea.cpp.orig 2016-05-23 23:47:31 UTC ++++ src/frontends/qt4/GuiWorkArea.cpp +@@ -55,6 +55,8 @@ + #include "frontends/FontMetrics.h" + #include "frontends/WorkAreaManager.h" + ++#include ++ + #include + #if (QT_VERSION < 0x050000) + #include +@@ -320,7 +322,7 @@ void GuiWorkArea::init() + d->setCursorShape(Qt::IBeamCursor); + + d->synthetic_mouse_event_.timeout.timeout.connect( +- bind(&GuiWorkArea::generateSyntheticMouseEvent, ++ boost::bind(&GuiWorkArea::generateSyntheticMouseEvent, + this)); + + // Initialize the vertical Scroll Bar Property changes on: head/print/lyx/files/extrapatch-src_frontends_qt4_GuiWorkArea.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property