~alpine/aports

1

[alpine-aports] [PATCH] community/xpdf: Update 3.04 -> 4.00

Marian Buschsieweke <marian.buschsieweke@ovgu.de>
Details
Message ID
<20190327095010.5863-1-marian.buschsieweke@ovgu.de>
Sender timestamp
1553680210
DKIM signature
missing
Download raw message
Patch: +242 -123
---
 community/xpdf/APKBUILD                     |  44 ++++----
 community/xpdf/xpdf-3.04-protection.patch   |  84 ----------------
 community/xpdf/xpdf-4.00-libpaperfix.patch  | 105 ++++++++++++++++++++
 community/xpdf/xpdf-4.00-man-path-fix.patch |  96 ++++++++++++++++++
 community/xpdf/xpdfrc                       |  36 +++----
 5 files changed, 242 insertions(+), 123 deletions(-)
 delete mode 100644 community/xpdf/xpdf-3.04-protection.patch
 create mode 100644 community/xpdf/xpdf-4.00-libpaperfix.patch
 create mode 100644 community/xpdf/xpdf-4.00-man-path-fix.patch

diff --git a/community/xpdf/APKBUILD b/community/xpdf/APKBUILD
index 844d51efc0..d3231d1577 100644
--- a/community/xpdf/APKBUILD
+++ b/community/xpdf/APKBUILD
@@ -1,46 +1,48 @@
# Contributor: Isaac Dunham <ibid.ag@gmail.com>
# Maintainer:  Isaac Dunham <ibid.ag@gmail.com>
pkgname=xpdf
pkgver="3.04"
pkgrel=4
pkgver="4.00"
pkgrel=0
pkgdesc="The classic X11 PDF viewer"
url="http://www.xpdfreader.com"
arch="all"
license="GPL-2.0 GPL-3.0"
depends="ghostscript-fonts"
makedepends="motif-dev freetype-dev libpng-dev"
makedepends="motif-dev freetype-dev libpng-dev cmake qt5-qtbase-dev cups-dev"
subpackages="$pkgname-doc"
source="https://xpdfreader-dl.s3.amazonaws.com/old/$pkgname-$pkgver.tar.gz
	xpdf-3.04-protection.patch
	xpdfrc"
	xpdf-4.00-man-path-fix.patch
	xpdf-4.00-libpaperfix.patch
	xpdfrc
	"

builddir="$srcdir/$pkgname-$pkgver"

build() {
	cd "$builddir"
	./configure \
		--with-x \
		--with-freetype2-includes=/usr/include/freetype2 \
		--build=$CBUILD \
		--host=$CHOST \
		--prefix=/usr \
		--sysconfdir=/etc \
		--mandir=/usr/share/man \
		--infodir=/usr/share/info \
		--localstatedir=/var
	mkdir -p "$builddir/build"
	cd "$builddir/build"

	cmake .. \
		-DMULTITHREADED=ON \
		-DOPI_SUPPORT=ON \
		-DXPDFWIDGET_PRINTING=ON \
		-DSYSTEM_XPDFRC=/etc/xpdfrc \
		-DCMAKE_INSTALL_PREFIX=/usr \
		-DCMAKE_BUILD_TYPE=Release
	make
}

package() {
	cd "$builddir"
	cd "$builddir/build"
	make DESTDIR="$pkgdir" install
	#delete pdf* utils that conflict with poppler-utils.
	rm -f "$pkgdir"/usr/bin/pdf*
	rm -f "$pkgdir"/usr/share/man/man1/pdf*
	#install xpdfrc so fonts get picked up
	cp "$srcdir"/xpdfrc "$pkgdir"/etc/xpdfrc
	install -Dm644 "$srcdir"/xpdfrc "$pkgdir"/etc/xpdfrc
}

sha512sums="3fb3c380fdbd13d937449ae3f7d7a163815cc85296d30be7b9907687884385d6171bb48ee5d5c13368d6bba87740b678f491bdcf61b38d130809e9afa260f6cf  xpdf-3.04.tar.gz
4c6360731ad60ed45e0612b016116a9588f293267ee3e2c1f7cd2f046f045f165334c6e7fceb6b51b3181adb7a74087036a28fcec0e04b23e6374ffc421c1f54  xpdf-3.04-protection.patch
7e8404fa5432bad578c29cf3ccd276bb64cd0316b700e40ce606b6b6261c497125e8689c6e545cab2adb04d69b1ed25d1e0d07155add9837e6bb44d5f18d82d3  xpdfrc"
sha512sums="32fb928aeb053be29c7342dda8caac8a7a3720e8f39507df29ad5a070e1423cc0960da4d7b36046d0be27b842b108e984363c0285839a0fd371a119948af0cac  xpdf-4.00.tar.gz
77d533e0cb2ed5e232a0497891eb6ec634659305a1c19d7c3a8f7efee1d18ba9e03b1ee009a9834497f8d7721694d4bd65e897ee4c9499544194bf6b240052a0  xpdf-4.00-man-path-fix.patch
aa101da42a3f4d8a559f8387143909c863de80dd6c4d2454a9a6cecef41a889f6e5d88225c22ec2c271c05eb77a412a0e0d66b94554b9ff5ccfe97953f1c1c4e  xpdf-4.00-libpaperfix.patch
6c35be65289d241f4ae4b2ec81e9e870d5a69ef74364c003140de97d71b0525d49176c95378e1c654fe4d955e74d0b4bbacc88205892a43e286df3256856eb8f  xpdfrc"
diff --git a/community/xpdf/xpdf-3.04-protection.patch b/community/xpdf/xpdf-3.04-protection.patch
deleted file mode 100644
index 677db00095..0000000000
--- a/community/xpdf/xpdf-3.04-protection.patch
@@ -1,84 +0,0 @@
Port Johannes Bauer's protection patch to 3.04.
This does NOT disable the error messages, since the user should
be aware of the author's intent.

Also, this does not deal with permission to print.

diff --git a/xpdf/PDFCore.cc b/xpdf/PDFCore.cc
index 34b6483..e93fe52 100644
--- a/xpdf/PDFCore.cc
+++ b/xpdf/PDFCore.cc
@@ -1677,9 +1677,6 @@ GString *PDFCore::extractText(int pg, double xMin, double yMin,
   int x0, y0, x1, y1, t;
   GString *s;
 
-  if (!doc->okToCopy()) {
-    return NULL;
-  }
   if ((page = findPage(pg))) {
     cvtUserToDev(pg, xMin, yMin, &x0, &y0);
     cvtUserToDev(pg, xMax, yMax, &x1, &y1);
diff --git a/xpdf/XPDFCore.cc b/xpdf/XPDFCore.cc
index 9a3725f..1562c7a 100644
--- a/xpdf/XPDFCore.cc
+++ b/xpdf/XPDFCore.cc
@@ -384,9 +384,8 @@ void XPDFCore::endSelection(int wx, int wy) {
 #ifndef NO_TEXT_SELECT
       if (selectULX != selectLRX &&
 	  selectULY != selectLRY) {
-	if (doc->okToCopy()) {
 	  copySelection();
-	} else {
+	if (!doc->okToCopy()) {
 	  error(errNotAllowed, -1,
 		"Copying of text from this document is not allowed.");
 	}
@@ -408,9 +407,6 @@ void XPDFCore::copySelection() {
   int pg;
   double ulx, uly, lrx, lry;
 
-  if (!doc->okToCopy()) {
-    return;
-  }
   if (getSelection(&pg, &ulx, &uly, &lrx, &lry)) {
     //~ for multithreading: need a mutex here
     if (currentSelection) {
diff --git a/xpdf/pdfimages.cc b/xpdf/pdfimages.cc
index dc79443..9aaa811 100644
--- a/xpdf/pdfimages.cc
+++ b/xpdf/pdfimages.cc
@@ -122,8 +122,6 @@ int main(int argc, char *argv[]) {
   if (!doc->okToCopy()) {
     error(errNotAllowed, -1,
 	  "Copying of images from this document is not allowed.");
-    exitCode = 3;
-    goto err1;
   }
 
   // get page range
diff --git a/xpdf/pdftohtml.cc b/xpdf/pdftohtml.cc
index f1fe691..824233e 100644
--- a/xpdf/pdftohtml.cc
+++ b/xpdf/pdftohtml.cc
@@ -134,8 +134,6 @@ int main(int argc, char *argv[]) {
   if (!doc->okToCopy()) {
     error(errNotAllowed, -1,
 	  "Copying of text from this document is not allowed.");
-    exitCode = 3;
-    goto err1;
   }
 
   // get page range
diff --git a/xpdf/pdftotext.cc b/xpdf/pdftotext.cc
index 758413e..e6779fa 100644
--- a/xpdf/pdftotext.cc
+++ b/xpdf/pdftotext.cc
@@ -192,8 +192,6 @@ int main(int argc, char *argv[]) {
   if (!doc->okToCopy()) {
     error(errNotAllowed, -1,
 	  "Copying of text from this document is not allowed.");
-    exitCode = 3;
-    goto err2;
   }
 
   // construct text file name
diff --git a/community/xpdf/xpdf-4.00-libpaperfix.patch b/community/xpdf/xpdf-4.00-libpaperfix.patch
new file mode 100644
index 0000000000..39ab831069
--- /dev/null
+++ b/community/xpdf/xpdf-4.00-libpaperfix.patch
@@ -0,0 +1,105 @@
diff -up xpdf-4.00/xpdf/CMakeLists.txt.paperfix xpdf-4.00/xpdf/CMakeLists.txt
--- xpdf-4.00/xpdf/CMakeLists.txt.paperfix	2017-08-08 19:22:50.000000000 -0400
+++ xpdf-4.00/xpdf/CMakeLists.txt	2017-08-16 19:40:19.103263736 -0400
@@ -108,7 +108,7 @@ if (HAVE_SPLASH)
   target_link_libraries(pdftops goo fofi splash
                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
                         ${DTYPE_LIBRARY}
-                        ${LCMS_LIBRARY})
+                        ${LCMS_LIBRARY} ${HAVE_PAPER_H})
 else ()
   add_executable(pdftops
     $<TARGET_OBJECTS:xpdf_objs>
@@ -116,7 +116,7 @@ else ()
     PSOutputDev.cc
     pdftops.cc
   )
-  target_link_libraries(pdftops goo fofi ${LCMS_LIBRARY})
+  target_link_libraries(pdftops goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
 endif ()
 install(TARGETS pdftops RUNTIME DESTINATION bin)
 install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftops.1 DESTINATION man/man1)
@@ -128,7 +128,7 @@ add_executable(pdftotext
   TextOutputDev.cc
   pdftotext.cc
 )
-target_link_libraries(pdftotext goo fofi ${LCMS_LIBRARY})
+target_link_libraries(pdftotext goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
 install(TARGETS pdftotext RUNTIME DESTINATION bin)
 install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftotext.1 DESTINATION man/man1)
 
@@ -145,7 +145,7 @@ if (HAVE_SPLASH AND PNG_FOUND)
   target_link_libraries(pdftohtml goo fofi splash
                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
                         ${DTYPE_LIBRARY}
-                        ${LCMS_LIBRARY} ${PNG_LIBRARIES})
+                        ${LCMS_LIBRARY} ${PNG_LIBRARIES} ${HAVE_PAPER_H})
   install(TARGETS pdftohtml RUNTIME DESTINATION bin)
   install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftohtml.1 DESTINATION man/man1)
 endif ()
@@ -156,7 +156,7 @@ add_executable(pdfinfo
   $<TARGET_OBJECTS:xpdf_objs>
   pdfinfo.cc
 )
-target_link_libraries(pdfinfo goo fofi ${LCMS_LIBRARY})
+target_link_libraries(pdfinfo goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
 install(TARGETS pdfinfo RUNTIME DESTINATION bin)
 install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfinfo.1 DESTINATION man/man1)
 
@@ -166,7 +166,7 @@ add_executable(pdffonts
   $<TARGET_OBJECTS:xpdf_objs>
   pdffonts.cc
 )
-target_link_libraries(pdffonts goo fofi ${LCMS_LIBRARY})
+target_link_libraries(pdffonts goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
 install(TARGETS pdffonts RUNTIME DESTINATION bin)
 install(FILES ${PROJECT_SOURCE_DIR}/doc/pdffonts.1 DESTINATION man/man1)
 
@@ -176,7 +176,7 @@ add_executable(pdfdetach
   $<TARGET_OBJECTS:xpdf_objs>
   pdfdetach.cc
 )
-target_link_libraries(pdfdetach goo fofi ${LCMS_LIBRARY})
+target_link_libraries(pdfdetach goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
 install(TARGETS pdfdetach RUNTIME DESTINATION bin)
 install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfdetach.1 DESTINATION man/man1)
 
@@ -191,7 +191,7 @@ if (HAVE_SPLASH)
   target_link_libraries(pdftoppm goo fofi splash
                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
                         ${DTYPE_LIBRARY}
-                        ${LCMS_LIBRARY})
+                        ${LCMS_LIBRARY} ${HAVE_PAPER_H})
   install(TARGETS pdftoppm RUNTIME DESTINATION bin)
   install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftoppm.1 DESTINATION man/man1)
 endif ()
@@ -207,7 +207,7 @@ if (HAVE_SPLASH AND PNG_FOUND)
   target_link_libraries(pdftopng goo fofi splash
                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
                         ${DTYPE_LIBRARY}
-                        ${LCMS_LIBRARY} ${PNG_LIBRARIES})
+                        ${LCMS_LIBRARY} ${PNG_LIBRARIES} ${HAVE_PAPER_H})
   install(TARGETS pdftopng RUNTIME DESTINATION bin)
   install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftopng.1 DESTINATION man/man1)
 endif ()
@@ -219,7 +219,7 @@ add_executable(pdfimages
   ImageOutputDev.cc
   pdfimages.cc
 )
-target_link_libraries(pdfimages goo fofi ${LCMS_LIBRARY})
+target_link_libraries(pdfimages goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
 install(TARGETS pdfimages RUNTIME DESTINATION bin)
 install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfimages.1 DESTINATION man/man1)
 
diff -up xpdf-4.00/xpdf-qt/CMakeLists.txt.paperfix xpdf-4.00/xpdf-qt/CMakeLists.txt
--- xpdf-4.00/xpdf-qt/CMakeLists.txt.paperfix	2017-08-16 19:39:23.275757290 -0400
+++ xpdf-4.00/xpdf-qt/CMakeLists.txt	2017-08-16 19:39:47.810100923 -0400
@@ -83,7 +83,7 @@ if ((QT4_FOUND OR Qt5Widgets_FOUND)
   target_link_libraries(xpdf ${QT_LIBRARIES} ${EXTRA_QT_LIBRARIES}
                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
                         ${DTYPE_LIBRARY} ${LCMS_LIBRARY}
-                        ${CMAKE_THREAD_LIBS_INIT})
+                        ${CMAKE_THREAD_LIBS_INIT} ${HAVE_PAPER_H})
   set_property(TARGET xpdf PROPERTY WIN32_EXECUTABLE 1)
 
   install(TARGETS xpdf RUNTIME DESTINATION bin)
diff --git a/community/xpdf/xpdf-4.00-man-path-fix.patch b/community/xpdf/xpdf-4.00-man-path-fix.patch
new file mode 100644
index 0000000000..1c60dfac15
--- /dev/null
+++ b/community/xpdf/xpdf-4.00-man-path-fix.patch
@@ -0,0 +1,96 @@
diff -up xpdf-4.00/xpdf/CMakeLists.txt.manfix xpdf-4.00/xpdf/CMakeLists.txt
--- xpdf-4.00/xpdf/CMakeLists.txt.manfix	2017-08-16 19:43:23.612344976 -0400
+++ xpdf-4.00/xpdf/CMakeLists.txt	2017-08-16 19:43:46.189746281 -0400
@@ -119,7 +119,7 @@ else ()
   target_link_libraries(pdftops goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
 endif ()
 install(TARGETS pdftops RUNTIME DESTINATION bin)
-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftops.1 DESTINATION man/man1)
+install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftops.1 DESTINATION share/man/man1)
 
 #--- pdftotext
 
@@ -130,7 +130,7 @@ add_executable(pdftotext
 )
 target_link_libraries(pdftotext goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
 install(TARGETS pdftotext RUNTIME DESTINATION bin)
-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftotext.1 DESTINATION man/man1)
+install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftotext.1 DESTINATION share/man/man1)
 
 #--- pdftohtml
 
@@ -147,7 +147,7 @@ if (HAVE_SPLASH AND PNG_FOUND)
                         ${DTYPE_LIBRARY}
                         ${LCMS_LIBRARY} ${PNG_LIBRARIES} ${HAVE_PAPER_H})
   install(TARGETS pdftohtml RUNTIME DESTINATION bin)
-  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftohtml.1 DESTINATION man/man1)
+  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftohtml.1 DESTINATION share/man/man1)
 endif ()
 
 #--- pdfinfo
@@ -158,7 +158,7 @@ add_executable(pdfinfo
 )
 target_link_libraries(pdfinfo goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
 install(TARGETS pdfinfo RUNTIME DESTINATION bin)
-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfinfo.1 DESTINATION man/man1)
+install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfinfo.1 DESTINATION share/man/man1)
 
 #--- pdffonts
 
@@ -168,7 +168,7 @@ add_executable(pdffonts
 )
 target_link_libraries(pdffonts goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
 install(TARGETS pdffonts RUNTIME DESTINATION bin)
-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdffonts.1 DESTINATION man/man1)
+install(FILES ${PROJECT_SOURCE_DIR}/doc/pdffonts.1 DESTINATION share/man/man1)
 
 #--- pdfdetach
 
@@ -178,7 +178,7 @@ add_executable(pdfdetach
 )
 target_link_libraries(pdfdetach goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
 install(TARGETS pdfdetach RUNTIME DESTINATION bin)
-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfdetach.1 DESTINATION man/man1)
+install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfdetach.1 DESTINATION share/man/man1)
 
 #--- pdftoppm
 
@@ -193,7 +193,7 @@ if (HAVE_SPLASH)
                         ${DTYPE_LIBRARY}
                         ${LCMS_LIBRARY} ${HAVE_PAPER_H})
   install(TARGETS pdftoppm RUNTIME DESTINATION bin)
-  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftoppm.1 DESTINATION man/man1)
+  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftoppm.1 DESTINATION share/man/man1)
 endif ()
 
 #--- pdftopng
@@ -209,7 +209,7 @@ if (HAVE_SPLASH AND PNG_FOUND)
                         ${DTYPE_LIBRARY}
                         ${LCMS_LIBRARY} ${PNG_LIBRARIES} ${HAVE_PAPER_H})
   install(TARGETS pdftopng RUNTIME DESTINATION bin)
-  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftopng.1 DESTINATION man/man1)
+  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftopng.1 DESTINATION share/man/man1)
 endif ()
 
 #--- pdfimages
@@ -221,8 +221,8 @@ add_executable(pdfimages
 )
 target_link_libraries(pdfimages goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
 install(TARGETS pdfimages RUNTIME DESTINATION bin)
-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfimages.1 DESTINATION man/man1)
+install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfimages.1 DESTINATION share/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/man/man5)
diff -up xpdf-4.00/xpdf-qt/CMakeLists.txt.manfix xpdf-4.00/xpdf-qt/CMakeLists.txt
--- xpdf-4.00/xpdf-qt/CMakeLists.txt.manfix	2017-08-16 19:44:45.218180999 -0400
+++ xpdf-4.00/xpdf-qt/CMakeLists.txt	2017-08-16 19:44:50.394043748 -0400
@@ -87,5 +87,5 @@ if ((QT4_FOUND OR Qt5Widgets_FOUND)
   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(FILES ${PROJECT_SOURCE_DIR}/doc/xpdf.1 DESTINATION share/man/man1)
 endif ()
diff --git a/community/xpdf/xpdfrc b/community/xpdf/xpdfrc
index b51b522818..e7a60d299c 100644
--- a/community/xpdf/xpdfrc
+++ b/community/xpdf/xpdfrc
@@ -16,7 +16,7 @@
# Also, the Xpdf language support packages each include a set of
# options to be added to the xpdfrc file.
#
# http://www.foolabs.com/xpdf/
# http://www.xpdfreader.com/
#
#========================================================================

@@ -29,20 +29,20 @@
# installed in a "standard" location, xpdf will find them
# automatically.)

fontFile Times-Roman		/usr/share/fonts/Type1/n021003l.pfb
fontFile Times-Italic		/usr/share/fonts/Type1/n021023l.pfb
fontFile Times-Bold		/usr/share/fonts/Type1/n021004l.pfb
fontFile Times-BoldItalic	/usr/share/fonts/Type1/n021024l.pfb
fontFile Helvetica		/usr/share/fonts/Type1/n019003l.pfb
fontFile Helvetica-Oblique	/usr/share/fonts/Type1/n019023l.pfb
fontFile Helvetica-Bold		/usr/share/fonts/Type1/n019004l.pfb
fontFile Helvetica-BoldOblique	/usr/share/fonts/Type1/n019024l.pfb
fontFile Courier		/usr/share/fonts/Type1/n022003l.pfb
fontFile Courier-Oblique	/usr/share/fonts/Type1/n022023l.pfb
fontFile Courier-Bold		/usr/share/fonts/Type1/n022004l.pfb
fontFile Courier-BoldOblique	/usr/share/fonts/Type1/n022024l.pfb
fontFile Symbol			/usr/share/fonts/Type1/s050000l.pfb
fontFile ZapfDingbats		/usr/share/fonts/Type1/d050000l.pfb
fontFile Times-Roman		/usr/local/share/ghostscript/fonts/n021003l.pfb
fontFile Times-Italic		/usr/local/share/ghostscript/fonts/n021023l.pfb
fontFile Times-Bold		/usr/local/share/ghostscript/fonts/n021004l.pfb
fontFile Times-BoldItalic	/usr/local/share/ghostscript/fonts/n021024l.pfb
fontFile Helvetica		/usr/local/share/ghostscript/fonts/n019003l.pfb
fontFile Helvetica-Oblique	/usr/local/share/ghostscript/fonts/n019023l.pfb
fontFile Helvetica-Bold		/usr/local/share/ghostscript/fonts/n019004l.pfb
fontFile Helvetica-BoldOblique	/usr/local/share/ghostscript/fonts/n019024l.pfb
fontFile Courier		/usr/local/share/ghostscript/fonts/n022003l.pfb
fontFile Courier-Oblique	/usr/local/share/ghostscript/fonts/n022023l.pfb
fontFile Courier-Bold		/usr/local/share/ghostscript/fonts/n022004l.pfb
fontFile Courier-BoldOblique	/usr/local/share/ghostscript/fonts/n022024l.pfb
fontFile Symbol			/usr/local/share/ghostscript/fonts/s050000l.pfb
fontFile ZapfDingbats		/usr/local/share/ghostscript/fonts/d050000l.pfb

# If you need to display PDF files that refer to non-embedded fonts,
# you should add one or more fontDir options to point to the
@@ -81,11 +81,11 @@ textEncoding		UTF-8

# Enable FreeType, and anti-aliased text.

enableFreeType		yes
antialias		yes
#enableFreeType		yes
#antialias		yes

# Set the command used to run a web browser when a URL hyperlink is
# clicked.

#launchCommand  viewer-script
urlCommand	"firefox '%s'"
#urlCommand	"netscape -remote 'openURL(%s)'"
-- 
2.21.0



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Details
Message ID
<3becb4a5-aecb-e3c8-9da7-62f1101a7da1@gmail.com>
In-Reply-To
<20190327095010.5863-1-marian.buschsieweke@ovgu.de> (view parent)
Sender timestamp
1554285931
DKIM signature
missing
Download raw message
Hi,

On 3/27/19 10:50 AM, Marian Buschsieweke wrote:
> ---
>   community/xpdf/APKBUILD                     |  44 ++++----
>   community/xpdf/xpdf-3.04-protection.patch   |  84 ----------------
>   community/xpdf/xpdf-4.00-libpaperfix.patch  | 105 ++++++++++++++++++++
>   community/xpdf/xpdf-4.00-man-path-fix.patch |  96 ++++++++++++++++++
>   community/xpdf/xpdfrc                       |  36 +++----
>   5 files changed, 242 insertions(+), 123 deletions(-)
>   delete mode 100644 community/xpdf/xpdf-3.04-protection.patch
>   create mode 100644 community/xpdf/xpdf-4.00-libpaperfix.patch
>   create mode 100644 community/xpdf/xpdf-4.00-man-path-fix.patch

my build fails here with:

-- The C compiler identification is GNU 8.3.0
-- The CXX compiler identification is GNU 8.3.0
-- Check for working C compiler: /usr/bin/gcc
-- Check for working C compiler: /usr/bin/gcc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Detecting C compile features
-- Detecting C compile features - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Looking for mkstemp
-- Looking for mkstemp - found
-- Looking for mkstemps
-- Looking for mkstemps - found
-- Looking for popen
-- Looking for popen - found
-- Performing Test HAVE_STD_SORT
-- Performing Test HAVE_STD_SORT - Success
-- Looking for fseeko
-- Looking for fseeko - found
-- Looking for fseek64
-- Looking for fseek64 - not found
-- Looking for _fseeki64
-- Looking for _fseeki64 - not found
-- Found FreeType (old-style includes): /usr/lib/libfreetype.so
-- Found ZLIB: /lib/libz.so (found version "1.2.11")
-- Found PNG: /usr/lib/libpng.so (found version "1.6.35")
-- Found JPEG: /usr/lib/libjpeg.so (found version "80")
-- Found TIFF: /usr/lib/libtiff.so (found version "4.0.10")
-- lcms2 not found
-- Qt5 found
CMake Deprecation Warning at cmake-config.txt:263 (cmake_policy):
   The OLD behavior for policy CMP0020 will be removed from a future version
   of CMake.

   The cmake-policies(7) manual explains that the OLD behaviors of all
   policies are deprecated and that a policy should be set to OLD only under
   specific short-term circumstances.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD.
Call Stack (most recent call first):
   CMakeLists.txt:15 (include)


-- Looking for pthread.h
-- Looking for pthread.h - found
-- Looking for pthread_create
-- Looking for pthread_create - found
-- Found Threads: TRUE
CMake Deprecation Warning at xpdf-qt/CMakeLists.txt:27 (cmake_policy):
   The OLD behavior for policy CMP0020 will be removed from a future version
   of CMake.

   The cmake-policies(7) manual explains that the OLD behaviors of all
   policies are deprecated and that a policy should be set to OLD only under
   specific short-term circumstances.  Projects should be ported to the NEW
   behavior and not rely on setting a policy to OLD.


CMake Error: The following variables are used in this project, but they 
are set to NOTFOUND.
Please set them or make sure they are set and tested correctly in the 
CMake files:
HAVE_PAPER_H
     linked by target "pdftohtml" in directory 
/home/larena/aports/community/xpdf/src/xpdf-4.00/xpdf
     linked by target "pdfimages" in directory 
/home/larena/aports/community/xpdf/src/xpdf-4.00/xpdf
     linked by target "pdftops" in directory 
/home/larena/aports/community/xpdf/src/xpdf-4.00/xpdf
     linked by target "pdffonts" in directory 
/home/larena/aports/community/xpdf/src/xpdf-4.00/xpdf
     linked by target "pdfdetach" in directory 
/home/larena/aports/community/xpdf/src/xpdf-4.00/xpdf
     linked by target "pdftoppm" in directory 
/home/larena/aports/community/xpdf/src/xpdf-4.00/xpdf
     linked by target "pdftopng" in directory 
/home/larena/aports/community/xpdf/src/xpdf-4.00/xpdf
     linked by target "pdftotext" in directory 
/home/larena/aports/community/xpdf/src/xpdf-4.00/xpdf
     linked by target "pdfinfo" in directory 
/home/larena/aports/community/xpdf/src/xpdf-4.00/xpdf
     linked by target "xpdf" in directory 
/home/larena/aports/community/xpdf/src/xpdf-4.00/xpdf-qt

-- Configuring incomplete, errors occurred!
See also 
"/home/larena/aports/community/xpdf/src/xpdf-4.00/build/CMakeFiles/CMakeOutput.log".
See also 
"/home/larena/aports/community/xpdf/src/xpdf-4.00/build/CMakeFiles/CMakeError.log".
 >>> ERROR: xpdf: build failed

I believe it's still missing some mdepends.

Thanks!

/eo




---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Reply to thread Export thread (mbox)