aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-10-05 19:08:03 -0400
committerMark H Weaver <mhw@netris.org>2014-10-05 22:39:37 -0400
commitf410c1107622f9a95073234eae18c623857338d4 (patch)
treeddd6f0cb234fa94ff838099fb7c24e19b7aea05c
parent553521d27c42cf7589d50daab1aeaeb9bc9e8e96 (diff)
downloadguix-f410c1107622f9a95073234eae18c623857338d4.tar
guix-f410c1107622f9a95073234eae18c623857338d4.tar.gz
gnu: xpdf: Update to 3.04.
* gnu/packages/patches/xpdf-constchar.patch: Remove. * gnu-system.am (dist_patch_DATA): Remove it. * gnu/packages/pdf.scm (xpdf): Update to 3.04. Remove patch. Add libpng as an input.
-rw-r--r--gnu-system.am3
-rw-r--r--gnu/packages/patches/xpdf-constchar.patch15
-rw-r--r--gnu/packages/pdf.scm6
3 files changed, 4 insertions, 20 deletions
diff --git a/gnu-system.am b/gnu-system.am
index 94d86246c9..0775f3746a 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -414,8 +414,7 @@ dist_patch_DATA = \
gnu/packages/patches/vpnc-script.patch \
gnu/packages/patches/w3m-fix-compile.patch \
gnu/packages/patches/xf86-input-synaptics-glibc-2.20.patch \
- gnu/packages/patches/xmodmap-asprintf.patch \
- gnu/packages/patches/xpdf-constchar.patch
+ gnu/packages/patches/xmodmap-asprintf.patch
bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap
bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux
diff --git a/gnu/packages/patches/xpdf-constchar.patch b/gnu/packages/patches/xpdf-constchar.patch
deleted file mode 100644
index 95dbe73c71..0000000000
--- a/gnu/packages/patches/xpdf-constchar.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This patch circumvents an error with 'const char *' to 'char *' conversion,
-see http://gnats.netbsd.org/45562 .
-
-diff -u a/xpdf/XPDFViewer.cc b/xpdf/XPDFViewer.cc
---- a/xpdf/XPDFViewer.cc 2011-08-15 23:08:53.000000000 +0200
-+++ b/xpdf/XPDFViewer.cc 2013-03-31 15:13:21.000000000 +0200
-@@ -1803,7 +1803,7 @@
- menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n);
- for (i = 0; i < nZoomMenuItems; ++i) {
- n = 0;
-- s = XmStringCreateLocalized(zoomMenuInfo[i].label);
-+ s = XmStringCreateLocalized((char *) zoomMenuInfo[i].label);
- XtSetArg(args[n], XmNlabelString, s); ++n;
- XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n;
- sprintf(buf, "zoom%d", i);
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index d6d97c1ea8..7ffdde04ae 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -85,14 +85,13 @@
(define-public xpdf
(package
(name "xpdf")
- (version "3.03")
+ (version "3.04")
(source (origin
(method url-fetch)
(uri (string-append "ftp://ftp.foolabs.com/pub/xpdf/xpdf-"
version ".tar.gz"))
(sha256 (base32
- "1jnfzdqc54wa73lw28kjv0m7120mksb0zkcn81jdlvijyvc67kq2"))
- (patches (list (search-patch "xpdf-constchar.patch")))))
+ "1rbp54mr3z2x3a3a1qmz8byzygzi223vckfam9ib5g1sfds0qf8i"))))
(build-system gnu-build-system)
(inputs `(("freetype" ,freetype)
("gs-fonts" ,gs-fonts)
@@ -103,6 +102,7 @@
("libxp" ,libxp)
("libxpm" ,libxpm)
("libxt" ,libxt)
+ ("libpng" ,libpng)
("zlib" ,zlib)))
(arguments
`(#:tests? #f ; there is no check target