CVS commit: pkgsrc/print

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/print
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Tue, 22 Oct 2019 22:21:26 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Oct 22 22:21:26 UTC 2019

Modified Files:
        pkgsrc/print: Makefile
        pkgsrc/print/xpdf: Makefile
Added Files:
        pkgsrc/print/xpdf4: DESCR Makefile PLIST distinfo options.mk
        pkgsrc/print/xpdf4/files: xpdf.desktop
        pkgsrc/print/xpdf4/patches: patch-cmake-config.txt
            patch-xpdf-qt_XpdfWidgetPrint.cc

Log Message:
Add print/xpdf4.

Xpdf is a viewer for Portable Document Format (PDF) files using the Qt toolkit.

Note: this version does not include the command line tools because they
conflict with poppler-utils.


To generate a diff of this commit:
cvs rdiff -u -r1.749 -r1.750 pkgsrc/print/Makefile
cvs rdiff -u -r1.87 -r1.88 pkgsrc/print/xpdf/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/print/xpdf4/DESCR pkgsrc/print/xpdf4/Makefile \
    pkgsrc/print/xpdf4/PLIST pkgsrc/print/xpdf4/distinfo \
    pkgsrc/print/xpdf4/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/print/xpdf4/files/xpdf.desktop
cvs rdiff -u -r0 -r1.1 pkgsrc/print/xpdf4/patches/patch-cmake-config.txt \
    pkgsrc/print/xpdf4/patches/patch-xpdf-qt_XpdfWidgetPrint.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/Makefile
diff -u pkgsrc/print/Makefile:1.749 pkgsrc/print/Makefile:1.750
--- pkgsrc/print/Makefile:1.749 Thu Oct 17 06:12:53 2019
+++ pkgsrc/print/Makefile       Tue Oct 22 22:21:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.749 2019/10/17 06:12:53 wiz Exp $
+# $NetBSD: Makefile,v 1.750 2019/10/22 22:21:26 nia Exp $
 #
 
 COMMENT=       Desktop publishing
@@ -1447,6 +1447,7 @@ SUBDIR+=  web2c
 SUBDIR+=       xdvik
 SUBDIR+=       xetex
 SUBDIR+=       xpdf
+SUBDIR+=       xpdf4
 SUBDIR+=       xpdf-arabic
 SUBDIR+=       xpdf-chinese-simplified
 SUBDIR+=       xpdf-chinese-traditional

Index: pkgsrc/print/xpdf/Makefile
diff -u pkgsrc/print/xpdf/Makefile:1.87 pkgsrc/print/xpdf/Makefile:1.88
--- pkgsrc/print/xpdf/Makefile:1.87     Thu May 23 19:23:14 2019
+++ pkgsrc/print/xpdf/Makefile  Tue Oct 22 22:21:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2019/05/23 19:23:14 rillig Exp $
+# $NetBSD: Makefile,v 1.88 2019/10/22 22:21:26 nia Exp $
 
 DISTNAME=      xpdf-3.04
 CATEGORIES=    print
@@ -8,7 +8,7 @@ PKGREVISION=    1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.xpdfreader.com/
-COMMENT=       Display tool for PDF files
+COMMENT=       Display tool for PDF files (Motif version)
 LICENSE=       gnu-gpl-v2
 
 MAKE_JOBS_SAFE=        no

Added files:

Index: pkgsrc/print/xpdf4/DESCR
diff -u /dev/null pkgsrc/print/xpdf4/DESCR:1.1
--- /dev/null   Tue Oct 22 22:21:26 2019
+++ pkgsrc/print/xpdf4/DESCR    Tue Oct 22 22:21:26 2019
@@ -0,0 +1,4 @@
+Xpdf is a viewer for Portable Document Format (PDF) files using the Qt toolkit.
+
+Note: this version does not include the command line tools because they
+conflict with poppler-utils.
Index: pkgsrc/print/xpdf4/Makefile
diff -u /dev/null pkgsrc/print/xpdf4/Makefile:1.1
--- /dev/null   Tue Oct 22 22:21:26 2019
+++ pkgsrc/print/xpdf4/Makefile Tue Oct 22 22:21:26 2019
@@ -0,0 +1,43 @@
+# $NetBSD: Makefile,v 1.1 2019/10/22 22:21:26 nia Exp $
+
+DISTNAME=      xpdf-4.02
+CATEGORIES=    print
+MASTER_SITES=  https://xpdfreader-dl.s3.amazonaws.com/
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://www.xpdfreader.com/
+COMMENT=       Display tool for PDF files (Qt version)
+LICENSE=       gnu-gpl-v2
+
+USE_CMAKE=     yes
+USE_TOOLS+=    pkg-config
+USE_LANGUAGES= c c++
+
+TOOL_DEPENDS+= icoutils-[0-9]*:../../graphics/icoutils
+
+INSTALLATION_DIRS+=    share/applications
+INSTALLATION_DIRS+=    share/icons/hicolor/scalable/apps
+INSTALLATION_DIRS+=    share/icons/hicolor/256x256/apps
+
+post-build:
+       cd ${WRKSRC} && ${PREFIX}/bin/icotool -w 256 -h 256 -x -o xpdf-icon.png xpdf-qt/xpdf-icon.ico
+
+post-install:
+       # Avoid conflicting with poppler-utils
+       ${RM} ${DESTDIR}${PREFIX}/bin/pdf*
+       ${RM} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/pdf*
+       ${INSTALL_DATA} ${FILESDIR}/xpdf.desktop ${DESTDIR}${PREFIX}/share/applications
+       ${INSTALL_DATA} ${WRKSRC}/xpdf-qt/xpdf-icon.svg \
+           ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/xpdf.svg
+       ${INSTALL_DATA} ${WRKSRC}/xpdf-icon.png \
+           ${DESTDIR}${PREFIX}/share/icons/hicolor/256x256/apps/xpdf.png
+
+.include "options.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../print/libpaper/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/print/xpdf4/PLIST
diff -u /dev/null pkgsrc/print/xpdf4/PLIST:1.1
--- /dev/null   Tue Oct 22 22:21:26 2019
+++ pkgsrc/print/xpdf4/PLIST    Tue Oct 22 22:21:26 2019
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.1 2019/10/22 22:21:26 nia Exp $
+bin/xpdf
+man/man1/xpdf.1
+man/man5/xpdfrc.5
+share/applications/xpdf.desktop
+share/icons/hicolor/256x256/apps/xpdf.png
+share/icons/hicolor/scalable/apps/xpdf.svg
Index: pkgsrc/print/xpdf4/distinfo
diff -u /dev/null pkgsrc/print/xpdf4/distinfo:1.1
--- /dev/null   Tue Oct 22 22:21:26 2019
+++ pkgsrc/print/xpdf4/distinfo Tue Oct 22 22:21:26 2019
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2019/10/22 22:21:26 nia Exp $
+
+SHA1 (xpdf-4.02.tar.gz) = 2b22ad40749e151a095d28a6cf4c9e5727f8d643
+RMD160 (xpdf-4.02.tar.gz) = ac78da37112bb05ab7a22da93dc628cf901dbfdb
+SHA512 (xpdf-4.02.tar.gz) = 72c9413fc7241dde5288137ca8a68c837d2a68e95e909dbe2afe8f374b5a7c92af4edf82918963d1c6388c947057fcf5f0ae1e6fbb2b31c3d5eb9a07d3c74ddc
+Size (xpdf-4.02.tar.gz) = 912885 bytes
+SHA1 (patch-cmake-config.txt) = a2c25a258c8c72494c3b53854cabf2e51db0c32d
+SHA1 (patch-xpdf-qt_XpdfWidgetPrint.cc) = 8d05b6e95228f07cc571b176ec821f5b535424e8
Index: pkgsrc/print/xpdf4/options.mk
diff -u /dev/null pkgsrc/print/xpdf4/options.mk:1.1
--- /dev/null   Tue Oct 22 22:21:26 2019
+++ pkgsrc/print/xpdf4/options.mk       Tue Oct 22 22:21:26 2019
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2019/10/22 22:21:26 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.xpdf4
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
+PKG_SUPPORTED_OPTIONS=         cups
+PKG_SUGGESTED_OPTIONS=         cups
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mcups)
+CMAKE_ARGS+=   -DXPDFWIDGET_PRINTING=ON
+.include "../../print/cups-base/buildlink3.mk"
+.elif ${OPSYS} != "Darwin"
+CMAKE_ARGS+=   -DXPDFWIDGET_PRINTING=OFF
+.endif

Index: pkgsrc/print/xpdf4/files/xpdf.desktop
diff -u /dev/null pkgsrc/print/xpdf4/files/xpdf.desktop:1.1
--- /dev/null   Tue Oct 22 22:21:26 2019
+++ pkgsrc/print/xpdf4/files/xpdf.desktop       Tue Oct 22 22:21:26 2019
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=xpdf
+GenericName=PDF viewer
+Comment=View Portable Document Format files
+Exec=xpdf %f
+Terminal=false
+Type=Application
+Icon=xpdf
+Categories=Office;
+MimeType=application/pdf;
+

Index: pkgsrc/print/xpdf4/patches/patch-cmake-config.txt
diff -u /dev/null pkgsrc/print/xpdf4/patches/patch-cmake-config.txt:1.1
--- /dev/null   Tue Oct 22 22:21:26 2019
+++ pkgsrc/print/xpdf4/patches/patch-cmake-config.txt   Tue Oct 22 22:21:26 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-cmake-config.txt,v 1.1 2019/10/22 22:21:26 nia Exp $
+
+CMake Error at xpdf/cmake_install.cmake:45 (file):
+  file RPATH_CHANGE could not write new RPATH
+
+--- cmake-config.txt.orig      2019-09-25 19:54:33.000000000 +0000
++++ cmake-config.txt
+@@ -70,9 +70,6 @@ if (WIN32)
+   endforeach ()
+ endif ()
+ 
+-#--- don't set an rpath
+-set(CMAKE_SKIP_RPATH FALSE)
+-
+ #--- miscellaneous options
+ option(A4_PAPER "use A4 (instead of Letter) paper size by default for PostScript output" OFF)
+ option(NO_TEXT_SELECT "do not allow text selection" OFF)
Index: pkgsrc/print/xpdf4/patches/patch-xpdf-qt_XpdfWidgetPrint.cc
diff -u /dev/null pkgsrc/print/xpdf4/patches/patch-xpdf-qt_XpdfWidgetPrint.cc:1.1
--- /dev/null   Tue Oct 22 22:21:26 2019
+++ pkgsrc/print/xpdf4/patches/patch-xpdf-qt_XpdfWidgetPrint.cc Tue Oct 22 22:21:26 2019
@@ -0,0 +1,24 @@
+$NetBSD: patch-xpdf-qt_XpdfWidgetPrint.cc,v 1.1 2019/10/22 22:21:26 nia Exp $
+
+Use CUPS on !Linux.
+
+--- xpdf-qt/XpdfWidgetPrint.cc.orig    2019-09-25 19:54:33.000000000 +0000
++++ xpdf-qt/XpdfWidgetPrint.cc
+@@ -21,7 +21,7 @@
+ #elif defined(__APPLE__)
+ #  include <CoreFoundation/CoreFoundation.h>
+ #  include <ApplicationServices/ApplicationServices.h>
+-#elif defined(__linux__)
++#else
+ #  include "PSOutputDev.h"
+ #  include <cups/cups.h>
+ #endif
+@@ -315,7 +315,7 @@ XpdfWidget::ErrorCode printPDF(PDFDoc *d
+ // Linux
+ //------------------------------------------------------------------------
+ 
+-#elif defined(__linux__)
++#else
+ 
+ static void fileOut(void *stream, const char *data, int len) {
+   fwrite(data, 1, len, (FILE *)stream);

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index