Attachment 185996 Details for Bug 222002 – xpdf-4.00.patch

[patch] xpdf-4.00.patch

xpdf-4.00.patch (text/plain), 18.15 KB, created by Andrew Romanenko on 2017-09-02 17:27:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Romanenko

Created: 2017-09-02 17:27:32 UTC

Size: 18.15 KB

patch

obsolete

>Index: graphics/xpdf/Makefile
>===================================================================
>--- graphics/xpdf/Makefile	(revision 449046)
>+++ graphics/xpdf/Makefile	(working copy)
>@@ -1,13 +1,9 @@
> # $FreeBSD$
> 
> PORTNAME=	xpdf
>-PORTVERSION=	3.04
>-PORTREVISION=	7
>+PORTVERSION=	4.00
> CATEGORIES=	graphics print
>-MASTER_SITES=	http://mirrors.rit.edu/zi/ \
>-		ftp://ftp.foolabs.com/pub/xpdf/ \
>-		TEX_CTAN/support/xpdf \
>-		http://komquats.com/distfiles/
>+MASTER_SITES=	http://www.xpdfreader.com/dl/
> 
> MAINTAINER=	cy@FreeBSD.org
> COMMENT=	Display PDF files and convert them to other formats
>@@ -15,52 +11,34 @@
> LICENSE=	GPLv2
> 
> LIB_DEPENDS=	libfreetype.so:print/freetype2 \
>-		libpng.so:graphics/png
>+		libpng.so:graphics/png \
>+		liblcms2.so:graphics/lcms2
> 
>-GNU_CONFIGURE=	yes
>-USES=		gmake cpe localbase
>-CPE_VENDOR=	foolabs
>-CONFIGURE_ARGS=	--enable-opi \
>-		--with-freetype2-library="${LOCALBASE}/lib" \
>-		--with-freetype2-includes="${LOCALBASE}/include/freetype2" \
>-		--bindir="${PREFIX}/libexec/xpdf" \
>-		--mandir="${PREFIX}/share/xpdf/man"
>-
> MANPREFIX=	${PREFIX}/share/xpdf
>-
>-OPTIONS_DEFINE=	LIBPAPER TYPE1 X11 DOCS
>-LIBPAPER_DESC=	Enable libpaper
>-TYPE1_DESC=	Ghostscript type1 fonts
>-OPTIONS_DEFAULT=	TYPE1 X11
>-OPTIONS_SUB=		yes
>-
> SUB_FILES=	xpdf-man.conf
> 
>-TYPE1_RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:print/gsfonts
>+USES=		cmake:outsource localbase
>+CMAKE_ARGS+=	-DOPI_SUPPORT:BOOL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt4:BOOL=ON \
>+		-DSYSTEM_XPDFRC=${PREFIX}/etc/xpdfrc
> 
>-LIBPAPER_LIB_DEPENDS=	libpaper.so:print/libpaper
>-LIBPAPER_CONFIGURE_ON=--with-libpaper-library="${LOCALBASE}/lib" \
>-		--with-libpaper-includes="${LOCALBASE}/include"
>-LIBPAPER_CONFIGURE_OFF=--without-libpaper-library
>+OPTIONS_DEFINE=		TYPE1 GUI
>+OPTIONS_DEFAULT=	TYPE1 GUI
>+OPTIONS_SUB=		yes
> 
>-.if defined(A4)
>-CONFIGURE_ARGS+=	--enable-a4-paper
>-.endif
>+TYPE1_CMAKE_BOOL=	TYPE1
>+TYPE1_DESC=		Ghostscript type1 fonts
>+TYPE1_RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/d050000l.pfb:print/gsfonts
> 
>-X11_CONFIGURE_WITH=	x
>-X11_USES=		motif
>+GUI_CMAKE_ON=		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=FALSE
>+GUI_CMAKE_OFF=		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=TRUE
>+GUI_DESC=		QT5 interface
>+GUI_CMAKE_ARGS+=	-DNO_TEXT_SELECT:BOOL=OFF
>+GUI_USE=		QT5=buildtools_build,qmake_build,concurrent,core,gui,widgets,printsupport
> 
>-post-patch:
>-	${REINPLACE_CMD} -e 's|undef USE_COMBO_BOX|define USE_COMBO_BOX 1|' \
>-		${WRKSRC}/xpdf/XPDFViewer.h
>-
> post-install:
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-.for file in ANNOUNCE CHANGES README misc/hello.pdf
>-	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
>-.endfor
>-	${LN} -sf ${PREFIX}/libexec/xpdf/xpdf ${STAGEDIR}${PREFIX}/bin/xpdf
>-	${INSTALL_DATA} ${WRKDIR}/xpdf-man.conf \
>-		${STAGEDIR}${PREFIX}/etc/man.d/xpdf.conf
>+		${LN} -sf ${PREFIX}/libexec/xpdf/xpdf ${STAGEDIR}${PREFIX}/bin/xpdf
>+		${INSTALL_DATA} ${WRKSRC}/doc/sample-xpdfrc ${STAGEDIR}${PREFIX}/etc/xpdfrc.sample
>+		${INSTALL_DATA} ${WRKDIR}/xpdf-man.conf \
>+			${STAGEDIR}${PREFIX}/etc/man.d/xpdf.conf
> 
> .include <bsd.port.mk>
>Index: graphics/xpdf/distinfo
>===================================================================
>--- graphics/xpdf/distinfo	(revision 449046)
>+++ graphics/xpdf/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (xpdf-3.04.tar.gz) = 11390c74733abcb262aaca4db68710f13ffffd42bfe2a0861a5dfc912b2977e5
>-SIZE (xpdf-3.04.tar.gz) = 825519
>+TIMESTAMP = 1502485405
>+SHA256 (xpdf-4.00.tar.gz) = ff3d92c42166e35b1ba6aec9b5f0adffb5fc05a3eb95dc49505b6e344e4216d6
>+SIZE (xpdf-4.00.tar.gz) = 854175
>Index: graphics/xpdf/files/patch-Makefile.in
>===================================================================
>--- graphics/xpdf/files/patch-Makefile.in	(revision 449046)
>+++ graphics/xpdf/files/patch-Makefile.in	(nonexistent)
>@@ -1,32 +0,0 @@
>---- Makefile.in.orig	2014-05-28 11:50:50.000000000 -0700
>-+++ Makefile.in	2015-09-17 22:04:25.442510655 -0700
>-@@ -89,7 +89,9 @@
>- 	$(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE)
>- 	$(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE)
>- 	$(INSTALL_PROGRAM) xpdf/pdfdetach$(EXE) $(DESTDIR)@bindir@/pdfdetach$(EXE)
>--@X@	$(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)
>-+	$(INSTALL_PROGRAM) xpdf/pdftohtml$(EXE) $(DESTDIR)@bindir@/pdftohtml$(EXE)
>-+	$(INSTALL_PROGRAM) xpdf/pdftopng$(EXE) $(DESTDIR)@bindir@/pdftopng$(EXE)
>-+	$(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)
>- 	$(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE)
>- 	-mkdir -p $(DESTDIR)@mandir@/man1
>- @X@	$(INSTALL_DATA) $(srcdir)/doc/xpdf.1 $(DESTDIR)@mandir@/man1/xpdf.1
>-@@ -98,14 +100,16 @@
>- 	$(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1
>- 	$(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1
>- 	$(INSTALL_DATA) $(srcdir)/doc/pdfdetach.1 $(DESTDIR)@mandir@/man1/pdfdetach.1
>--@X@	$(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1
>-+	$(INSTALL_DATA) $(srcdir)/doc/pdftohtml.1 $(DESTDIR)@mandir@/man1/pdftohtml.1
>-+	$(INSTALL_DATA) $(srcdir)/doc/pdftopng.1 $(DESTDIR)@mandir@/man1/pdftopng.1
>-+	$(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1
>- 	$(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1
>- 	-mkdir -p $(DESTDIR)@mandir@/man5
>- 	$(INSTALL_DATA) $(srcdir)/doc/xpdfrc.5 $(DESTDIR)@mandir@/man5/xpdfrc.5
>- 	-mkdir -p $(DESTDIR)@sysconfdir@
>- 	@if test ! -f $(DESTDIR)@sysconfdir@/xpdfrc; then \
>- 		echo "$(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)@sysconfdir@/xpdfrc"; \
>--		$(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)@sysconfdir@/xpdfrc; \
>-+		$(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)@sysconfdir@/xpdfrc.sample; \
>- 	else \
>- 		echo "# not overwriting the existing $(DESTDIR)@sysconfdir@/xpdfrc"; \
>- 	fi
>Index: graphics/xpdf/files/patch-splash_Makefile.in
>===================================================================
>--- graphics/xpdf/files/patch-splash_Makefile.in	(revision 449046)
>+++ graphics/xpdf/files/patch-splash_Makefile.in	(nonexistent)
>@@ -1,11 +0,0 @@
>---- splash/Makefile.in.orig	2014-05-28 11:50:50.000000000 -0700
>-+++ splash/Makefile.in	2014-12-20 18:20:37.776117864 -0800
>-@@ -16,7 +16,7 @@
>- FOFISRCDIR = $(srcdir)/../fofi
>- FOFILIBDIR = ../fofi
>- 
>--CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(srcdir)/.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(srcdir) @freetype2_CFLAGS@
>-+CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(srcdir)/.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(srcdir) @freetype2_CFLAGS@ @X_CFLAGS@
>- 
>- CXX = @CXX@
>- AR = @AR@
>Index: graphics/xpdf/files/patch-splash_SplashFTFont.cc
>===================================================================
>--- graphics/xpdf/files/patch-splash_SplashFTFont.cc	(revision 449046)
>+++ graphics/xpdf/files/patch-splash_SplashFTFont.cc	(nonexistent)
>@@ -1,11 +0,0 @@
>---- splash/SplashFTFont.cc.orig	Tue Feb 27 14:05:52 2007
>-+++ splash/SplashFTFont.cc
>-@@ -229,7 +229,7 @@
>- };
>- 
>- SplashPath *SplashFTFont::getGlyphPath(int c) {
>--  static FT_Outline_Funcs outlineFuncs = {
>-+  static const FT_Outline_Funcs outlineFuncs = {
>- #if FREETYPE_MINOR <= 1
>-     (int (*)(FT_Vector *, void *))&glyphPathMoveTo,
>-     (int (*)(FT_Vector *, void *))&glyphPathLineTo,
>Index: graphics/xpdf/files/patch-xfont
>===================================================================
>--- graphics/xpdf/files/patch-xfont	(revision 449046)
>+++ graphics/xpdf/files/patch-xfont	(nonexistent)
>@@ -1,11 +0,0 @@
>---- xpdf/XPDFViewer.cc.orig	Tue Feb 27 14:05:52 2007
>-+++ xpdf/XPDFViewer.cc
>-@@ -2791,7 +2791,7 @@
>-   aboutBigFont =
>-     createFontList("-*-times-bold-i-normal--20-*-*-*-*-*-iso8859-1");
>-   aboutVersionFont =
>--    createFontList("-*-times-medium-r-normal--16-*-*-*-*-*-iso8859-1");
>-+    createFontList("-*-times-medium-r-normal--14-*-*-*-*-*-iso8859-1");
>-   aboutFixedFont =
>-     createFontList("-*-courier-medium-r-normal--12-*-*-*-*-*-iso8859-1");
>- 
>Index: graphics/xpdf/files/patch-xpdf-qt_CMakeLists.txt
>===================================================================
>--- graphics/xpdf/files/patch-xpdf-qt_CMakeLists.txt	(nonexistent)
>+++ graphics/xpdf/files/patch-xpdf-qt_CMakeLists.txt	(working copy)
>@@ -0,0 +1,11 @@
>+--- xpdf-qt/CMakeLists.txt.orig	2017-09-01 19:21:51 UTC
>++++ xpdf-qt/CMakeLists.txt
>+@@ -86,6 +86,6 @@ if ((QT4_FOUND OR Qt5Widgets_FOUND)
>+                         ${CMAKE_THREAD_LIBS_INIT})
>+   set_property(TARGET xpdf PROPERTY WIN32_EXECUTABLE 1)
>+ 
>+-  install(TARGETS xpdf RUNTIME DESTINATION bin)
>+-  install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdf.1 DESTINATION man/man1)
>++  install(TARGETS xpdf RUNTIME DESTINATION libexec/xpdf)
>++  install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdf.1 DESTINATION share/xpdf/man/man1)
>+ endif ()
>Index: graphics/xpdf/files/patch-xpdf_CMakeLists.txt
>===================================================================
>--- graphics/xpdf/files/patch-xpdf_CMakeLists.txt	(nonexistent)
>+++ graphics/xpdf/files/patch-xpdf_CMakeLists.txt	(working copy)
>@@ -0,0 +1,103 @@
>+--- xpdf/CMakeLists.txt.orig	2017-09-01 19:21:44 UTC
>++++ xpdf/CMakeLists.txt
>+@@ -118,8 +118,8 @@ else ()
>+   )
>+   target_link_libraries(pdftops goo fofi ${LCMS_LIBRARY})
>+ endif ()
>+-install(TARGETS pdftops RUNTIME DESTINATION bin)
>+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftops.1 DESTINATION man/man1)
>++install(TARGETS pdftops RUNTIME DESTINATION libexec/xpdf)
>++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftops.1 DESTINATION share/xpdf/man/man1)
>+ 
>+ #--- pdftotext
>+ 
>+@@ -129,8 +129,8 @@ add_executable(pdftotext
>+   pdftotext.cc
>+ )
>+ target_link_libraries(pdftotext goo fofi ${LCMS_LIBRARY})
>+-install(TARGETS pdftotext RUNTIME DESTINATION bin)
>+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftotext.1 DESTINATION man/man1)
>++install(TARGETS pdftotext RUNTIME DESTINATION libexec/xpdf)
>++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftotext.1 DESTINATION share/xpdf/man/man1)
>+ 
>+ #--- pdftohtml
>+ 
>+@@ -146,8 +146,8 @@ if (HAVE_SPLASH AND PNG_FOUND)
>+                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
>+                         ${DTYPE_LIBRARY}
>+                         ${LCMS_LIBRARY} ${PNG_LIBRARIES})
>+-  install(TARGETS pdftohtml RUNTIME DESTINATION bin)
>+-  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftohtml.1 DESTINATION man/man1)
>++  install(TARGETS pdftohtml RUNTIME DESTINATION libexec/xpdf)
>++  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftohtml.1 DESTINATION share/xpdf/man/man1)
>+ endif ()
>+ 
>+ #--- pdfinfo
>+@@ -157,8 +157,8 @@ add_executable(pdfinfo
>+   pdfinfo.cc
>+ )
>+ target_link_libraries(pdfinfo goo fofi ${LCMS_LIBRARY})
>+-install(TARGETS pdfinfo RUNTIME DESTINATION bin)
>+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfinfo.1 DESTINATION man/man1)
>++install(TARGETS pdfinfo RUNTIME DESTINATION libexec/xpdf)
>++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfinfo.1 DESTINATION share/xpdf/man/man1)
>+ 
>+ #--- pdffonts
>+ 
>+@@ -167,8 +167,8 @@ add_executable(pdffonts
>+   pdffonts.cc
>+ )
>+ target_link_libraries(pdffonts goo fofi ${LCMS_LIBRARY})
>+-install(TARGETS pdffonts RUNTIME DESTINATION bin)
>+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdffonts.1 DESTINATION man/man1)
>++install(TARGETS pdffonts RUNTIME DESTINATION libexec/xpdf)
>++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdffonts.1 DESTINATION share/xpdf/man/man1)
>+ 
>+ #--- pdfdetach
>+ 
>+@@ -177,8 +177,8 @@ add_executable(pdfdetach
>+   pdfdetach.cc
>+ )
>+ target_link_libraries(pdfdetach goo fofi ${LCMS_LIBRARY})
>+-install(TARGETS pdfdetach RUNTIME DESTINATION bin)
>+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfdetach.1 DESTINATION man/man1)
>++install(TARGETS pdfdetach RUNTIME DESTINATION libexec/xpdf)
>++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfdetach.1 DESTINATION share/xpdf/man/man1)
>+ 
>+ #--- pdftoppm
>+ 
>+@@ -192,8 +192,8 @@ if (HAVE_SPLASH)
>+                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
>+                         ${DTYPE_LIBRARY}
>+                         ${LCMS_LIBRARY})
>+-  install(TARGETS pdftoppm RUNTIME DESTINATION bin)
>+-  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftoppm.1 DESTINATION man/man1)
>++  install(TARGETS pdftoppm RUNTIME DESTINATION libexec/xpdf)
>++  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftoppm.1 DESTINATION share/xpdf/man/man1)
>+ endif ()
>+ 
>+ #--- pdftopng
>+@@ -208,8 +208,8 @@ if (HAVE_SPLASH AND PNG_FOUND)
>+                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
>+                         ${DTYPE_LIBRARY}
>+                         ${LCMS_LIBRARY} ${PNG_LIBRARIES})
>+-  install(TARGETS pdftopng RUNTIME DESTINATION bin)
>+-  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftopng.1 DESTINATION man/man1)
>++  install(TARGETS pdftopng RUNTIME DESTINATION libexec/xpdf)
>++  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftopng.1 DESTINATION share/xpdf/man/man1)
>+ endif ()
>+ 
>+ #--- pdfimages
>+@@ -220,9 +220,9 @@ add_executable(pdfimages
>+   pdfimages.cc
>+ )
>+ target_link_libraries(pdfimages goo fofi ${LCMS_LIBRARY})
>+-install(TARGETS pdfimages RUNTIME DESTINATION bin)
>+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfimages.1 DESTINATION man/man1)
>++install(TARGETS pdfimages RUNTIME DESTINATION libexec/xpdf)
>++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfimages.1 DESTINATION share/xpdf/man/man1)
>+ 
>+ #--- xpdfrc man page
>+ 
>+-install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdfrc.5 DESTINATION man/man5)
>++install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdfrc.5 DESTINATION share/xpdf/man/man5)
>Index: graphics/xpdf/files/patch-xpdf_GlobalParams.cc
>===================================================================
>--- graphics/xpdf/files/patch-xpdf_GlobalParams.cc	(revision 449046)
>+++ graphics/xpdf/files/patch-xpdf_GlobalParams.cc	(nonexistent)
>@@ -1,13 +0,0 @@
>---- xpdf/GlobalParams.cc.orig	2007-02-28 00:05:52.000000000 +0200
>-+++ xpdf/GlobalParams.cc	2008-04-04 15:44:24.000000000 +0300
>-@@ -1566,6 +1566,10 @@
>-     *code = xpdfKeyCodeUp;
>-   } else if (!strcmp(p0, "down")) {
>-     *code = xpdfKeyCodeDown;
>-+  } else if (!strcmp(p0, "numpad-plus")) {
>-+    *code = xpdfKeyPlus;
>-+  } else if (!strcmp(p0, "numpad-minus")) {
>-+    *code = xpdfKeyMinus;
>-   } else if (p0[0] == 'f' && p0[1] >= '1' && p0[1] <= '9' && !p0[2]) {
>-     *code = xpdfKeyCodeF1 + (p0[1] - '1');
>-   } else if (p0[0] == 'f' &&
>Index: graphics/xpdf/files/patch-xpdf_GlobalParams.h
>===================================================================
>--- graphics/xpdf/files/patch-xpdf_GlobalParams.h	(revision 449046)
>+++ graphics/xpdf/files/patch-xpdf_GlobalParams.h	(nonexistent)
>@@ -1,10 +0,0 @@
>-Index: xpdf/GlobalParams.h
>-@@ -132,6 +132,8 @@
>- #define xpdfKeyCodeDown           0x100d
>- #define xpdfKeyCodeF1             0x1100
>- #define xpdfKeyCodeF35            0x1122
>-+#define xpdfKeyPlus               0x1200
>-+#define xpdfKeyMinus	           0x1201
>- #define xpdfKeyCodeMousePress1    0x2001
>- #define xpdfKeyCodeMousePress2    0x2002
>- #define xpdfKeyCodeMousePress3    0x2003
>Index: graphics/xpdf/files/patch-xpdf_Stream.cc
>===================================================================
>--- graphics/xpdf/files/patch-xpdf_Stream.cc	(revision 449046)
>+++ graphics/xpdf/files/patch-xpdf_Stream.cc	(nonexistent)
>@@ -1,18 +0,0 @@
>---- xpdf/Stream.cc.orig	2007-09-03 00:17:03.000000000 +0900
>-+++ xpdf/Stream.cc	2007-09-03 00:17:45.000000000 +0900
>-@@ -4479,6 +4479,7 @@
>- 	n = 3;
>- 	t = (c0 << 24) | (c1 << 16) | (c2 << 8);
>-       }
>-+      t &= 0xffffffff;
>-       for (i = 4; i >= 0; --i) {
>- 	buf1[i] = (char)(t % 85 + 0x21);
>- 	t /= 85;
>-@@ -4496,6 +4497,7 @@
>-     eof = gTrue;
>-   } else {
>-     t = (c0 << 24) | (c1 << 16) | (c2 << 8) | c3;
>-+    t &= 0xffffffff;
>-     if (t == 0) {
>-       *bufEnd++ = 'z';
>-       if (++lineLen == 65) {
>Index: graphics/xpdf/files/patch-xpdf_XPDFViewer.cc
>===================================================================
>--- graphics/xpdf/files/patch-xpdf_XPDFViewer.cc	(revision 449046)
>+++ graphics/xpdf/files/patch-xpdf_XPDFViewer.cc	(nonexistent)
>@@ -1,13 +0,0 @@
>---- xpdf/XPDFViewer.cc.orig	2008-04-04 15:36:27.000000000 +0300
>-+++ xpdf/XPDFViewer.cc	2008-04-04 15:41:05.000000000 +0300
>-@@ -569,6 +569,10 @@
>-     keyCode = xpdfKeyCodeDown;
>-   } else if (key >= XK_F1 && key <= XK_F35) {
>-     keyCode = xpdfKeyCodeF1 + (key - XK_F1);
>-+  } else if (key == XK_KP_Add) {
>-+    keyCode = xpdfKeyPlus;
>-+  } else if (key == XK_KP_Subtract) {
>-+    keyCode = xpdfKeyMinus;
>-   } else {
>-     return;
>-   }
>Index: graphics/xpdf/files/patch-xpdf__Makefile.in
>===================================================================
>--- graphics/xpdf/files/patch-xpdf__Makefile.in	(revision 449046)
>+++ graphics/xpdf/files/patch-xpdf__Makefile.in	(nonexistent)
>@@ -1,12 +0,0 @@
>---- xpdf/Makefile.in.orig	2014-05-28 11:50:50.000000000 -0700
>-+++ xpdf/Makefile.in	2015-01-20 11:19:11.373669249 -0800
>-@@ -122,7 +122,8 @@
>- 	pdftopng$(EXE) pdfimages$(EXE)
>- 
>- all-no-x: pdftops$(EXE) pdftotext$(EXE) pdftohtml$(EXE) pdfinfo$(EXE) \
>--	pdffonts$(EXE) pdfdetach$(EXE) pdfimages$(EXE)
>-+	pdffonts$(EXE) pdfdetach$(EXE) pdftoppm$(EXE) pdftopng$(EXE) \
>-+	pdfimages$(EXE)
>- 
>- #------------------------------------------------------------------------
>- 
>Index: graphics/xpdf/files/xpdf-man.conf.in
>===================================================================
>--- graphics/xpdf/files/xpdf-man.conf.in	(revision 449046)
>+++ graphics/xpdf/files/xpdf-man.conf.in	(working copy)
>@@ -1 +1,2 @@
> MANPATH %%PREFIX%%/share/xpdf/man
>+
>Index: graphics/xpdf/pkg-descr
>===================================================================
>--- graphics/xpdf/pkg-descr	(revision 449046)
>+++ graphics/xpdf/pkg-descr	(working copy)
>@@ -5,4 +5,4 @@
> It can also convert PDF input to ps, text, and info formats; and
> split out fonts and images.
> 
>-WWW: http://www.foolabs.com/xpdf/
>+WWW: http://www.xpdfreader.com/
>Index: graphics/xpdf/pkg-plist
>===================================================================
>--- graphics/xpdf/pkg-plist	(revision 449046)
>+++ graphics/xpdf/pkg-plist	(working copy)
>@@ -7,8 +7,8 @@
> libexec/xpdf/pdftoppm
> libexec/xpdf/pdftops
> libexec/xpdf/pdftotext
>-%%X11%%libexec/xpdf/xpdf
>-%%X11%%bin/xpdf
>+%%GUI%%libexec/xpdf/xpdf
>+%%GUI%%bin/xpdf
> etc/man.d/xpdf.conf
> %%DATADIR%%/man/man1/pdfdetach.1.gz
> %%DATADIR%%/man/man1/pdffonts.1.gz
>@@ -19,10 +19,6 @@
> %%DATADIR%%/man/man1/pdftoppm.1.gz
> %%DATADIR%%/man/man1/pdftops.1.gz
> %%DATADIR%%/man/man1/pdftotext.1.gz
>-%%X11%%%%DATADIR%%/man/man1/xpdf.1.gz
>+%%GUI%%%%DATADIR%%/man/man1/xpdf.1.gz
> %%DATADIR%%/man/man5/xpdfrc.5.gz
>-%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
>-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/hello.pdf
> @sample etc/xpdfrc.sample

Actions: View | Diff

Attachments on bug 222002: 185996 | 186007