diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-10-05 19:08:03 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-10-05 22:39:37 -0400 |
| commit | f410c1107622f9a95073234eae18c623857338d4 (patch) | |
| tree | ddd6f0cb234fa94ff838099fb7c24e19b7aea05c /gnu/packages/patches | |
| parent | 553521d27c42cf7589d50daab1aeaeb9bc9e8e96 (diff) | |
| download | guix-f410c1107622f9a95073234eae18c623857338d4.tar.gz guix-f410c1107622f9a95073234eae18c623857338d4.zip | |
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.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/xpdf-constchar.patch | 15 |
1 files changed, 0 insertions, 15 deletions
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); |