Date: Mon, 24 Dec 2018 18:29:41 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488279 - in head/graphics/xpdf4: . files Message-ID: <201812241829.wBOITf1w032029@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Mon Dec 24 18:29:40 2018 New Revision: 488279 URL: https://svnweb.freebsd.org/changeset/ports/488279 Log: Fix GCC build. This commit is based (not entirely) on a patch submitted by Poitr Kubaj <pkubaj@anongoth.pl> in PR 234251. PR: 234251 Modified: head/graphics/xpdf4/Makefile (contents, props changed) head/graphics/xpdf4/files/patch-xpdf-qt_XpdfWidgetPrint.cc (contents, props changed) Modified: head/graphics/xpdf4/Makefile ============================================================================== --- head/graphics/xpdf4/Makefile Mon Dec 24 17:05:13 2018 (r488278) +++ head/graphics/xpdf4/Makefile Mon Dec 24 18:29:40 2018 (r488279) @@ -26,7 +26,7 @@ CONFLICTS_INSTALL= xpdf MANPREFIX= ${PREFIX}/share/xpdf SUB_FILES= xpdf-man.conf -USES= cmake:outsource localbase +USES= compiler:c++11-lang cmake:outsource localbase:ldflags CMAKE_ARGS+= -DOPI_SUPPORT:BOOL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt4:BOOL=ON \ -DUSE_LCMS:BOOL=OFF -DSYSTEM_XPDFRC=${PREFIX}/etc/xpdfrc Modified: head/graphics/xpdf4/files/patch-xpdf-qt_XpdfWidgetPrint.cc ============================================================================== --- head/graphics/xpdf4/files/patch-xpdf-qt_XpdfWidgetPrint.cc Mon Dec 24 17:05:13 2018 (r488278) +++ head/graphics/xpdf4/files/patch-xpdf-qt_XpdfWidgetPrint.cc Mon Dec 24 18:29:40 2018 (r488279) @@ -5,7 +5,7 @@ # include <CoreFoundation/CoreFoundation.h> # include <ApplicationServices/ApplicationServices.h> -#elif defined(__linux__) -+#elif defined(__linux__) || defined(__FreeBSD_cc_version) ++#elif defined(__linux__) || defined(__FreeBSD__) # include "PSOutputDev.h" # include <cups/cups.h> #endif @@ -14,7 +14,7 @@ //------------------------------------------------------------------------ -#elif defined(__linux__) -+#elif defined(__linux__) || defined(__FreeBSD_cc_version) ++#elif defined(__linux__) || defined(__FreeBSD__) static void fileOut(void *stream, const char *data, int len) { fwrite(data, 1, len, (FILE *)stream);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812241829.wBOITf1w032029>