diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-04-30 17:06:00 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-04-30 17:06:00 +0200 |
| commit | 0734a9a8131525d6da2e7bf802402dc0350eda98 (patch) | |
| tree | f43bef210f6513b12c14ee9494bb47e4f80e99d0 /gnu/packages/patches/xpdf-constchar.patch | |
| parent | e0fbbc889d724678e9e310432ad3a3fb8345cf9a (diff) | |
| parent | 01155b1808b17f0a4f54388261ab0c6f5fee2f1b (diff) | |
| download | gnu-guix-0734a9a8131525d6da2e7bf802402dc0350eda98.tar gnu-guix-0734a9a8131525d6da2e7bf802402dc0350eda98.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/patches/xpdf-constchar.patch')
| -rw-r--r-- | gnu/packages/patches/xpdf-constchar.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/gnu/packages/patches/xpdf-constchar.patch b/gnu/packages/patches/xpdf-constchar.patch new file mode 100644 index 0000000000..95dbe73c71 --- /dev/null +++ b/gnu/packages/patches/xpdf-constchar.patch @@ -0,0 +1,15 @@ +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); |