svn commit: r513862 - in head/graphics/xpdf4: . files

[Cy Schubert]

Author: cy
Date: Sun Oct  6 03:07:20 2019
New Revision: 513862
URL: https://svnweb.freebsd.org/changeset/ports/513862

Log:
  Fix build without GUI.
  
  PR:		241094
  Submitted by:	vvd at unislabs.com
  Reported by:	vvd at unislabs.com
  MFH:		2019Q4

Modified:
  head/graphics/xpdf4/Makefile   (contents, props changed)
  head/graphics/xpdf4/files/patch-cmake-config.txt   (contents, props changed)
  head/graphics/xpdf4/pkg-plist   (contents, props changed)

Modified: head/graphics/xpdf4/Makefile
==============================================================================
--- head/graphics/xpdf4/Makefile	Sun Oct  6 01:48:49 2019	(r513861)
+++ head/graphics/xpdf4/Makefile	Sun Oct  6 03:07:20 2019	(r513862)
@@ -21,8 +21,7 @@ CONFLICTS_INSTALL+=	xpdf3-* xpdf-*
 CONFLICTS_INSTALL+=	xpdf3-*	xpdf4-*
 .endif
 
-USES=		compiler:c++11-lang cmake localbase:ldflags \
-		desktop-file-utils
+USES=		compiler:c++11-lang cmake localbase:ldflags
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png
 BUILD_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/d050000l.pfb:print/gsfonts
@@ -53,7 +52,7 @@ LIBPAPER_LIB_DEPENDS=	libpaper.so:print/libpaper
 GUI_CMAKE_OFF=		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=1
 GUI_DESC=		QT5 interface
 GUI_CMAKE_ARGS+=	-DNO_TEXT_SELECT:BOOL=OFF
-GUI_USES=		qt:5
+GUI_USES=		qt:5 desktop-file-utils
 GUI_USE=		QT=buildtools_build,qmake_build,concurrent,core,gui,widgets,printsupport,svg,network,printsupport
 
 PRINT_CMAKE_ON=		-DXPDFWIDGET_PRINTING:BOOL=ON -DCUPS:BOOL=ON

Modified: head/graphics/xpdf4/files/patch-cmake-config.txt
==============================================================================
--- head/graphics/xpdf4/files/patch-cmake-config.txt	Sun Oct  6 01:48:49 2019	(r513861)
+++ head/graphics/xpdf4/files/patch-cmake-config.txt	Sun Oct  6 03:07:20 2019	(r513862)
@@ -8,6 +8,15 @@
  option(NO_FONTCONFIG "disable support for libfontconfig" OFF)
  option(SYSTEM_XPDFRC "full path for system-wide xpdfrc file" "")
  if (SYSTEM_XPDFRC)
+@@ -194,7 +195,7 @@
+   find_package(Qt5Network)
+   find_package(Qt5PrintSupport)
+ else ()
+-  find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED)
++  find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork)
+ endif ()
+ if(Qt5Widgets_FOUND)
+   message(STATUS "Qt5 found")
 @@ -212,7 +213,7 @@
        set(EXTRA_QT_LIBRARIES "-framework ApplicationServices")
      elseif (UNIX)

Modified: head/graphics/xpdf4/pkg-plist
==============================================================================
--- head/graphics/xpdf4/pkg-plist	Sun Oct  6 01:48:49 2019	(r513861)
+++ head/graphics/xpdf4/pkg-plist	Sun Oct  6 03:07:20 2019	(r513862)
@@ -9,7 +9,7 @@ libexec/xpdf/pdftops
 libexec/xpdf/pdftotext
 %%GUI%%libexec/xpdf/xpdf
 %%GUI%%bin/xpdf
-%%DESKTOPDIR%%/xpdf.desktop
+%%GUI%%%%DESKTOPDIR%%/xpdf.desktop
 etc/man.d/xpdf.conf
 %%DATADIR%%/man/man1/pdfdetach.1.gz
 %%DATADIR%%/man/man1/pdffonts.1.gz