diff options
| author | Andreas Enge <andreas@enge.fr> | 2013-04-04 18:48:24 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2013-04-04 18:49:28 +0200 |
| commit | 6be960c7f7f8538024f5807dcd5b6a8a7562baf1 (patch) | |
| tree | 05a6712b7e8aa0fe2b4314767dc0219e85ea695e /gnu/packages/patches | |
| parent | 9be8d7c8cb1b1ee4d1f3ba7360320527199b4a0d (diff) | |
| parent | 8dc5d0cf7e18ee423c73087570c6b50d215ae216 (diff) | |
Merge branch 'xorg' into core-updates
Diffstat (limited to 'gnu/packages/patches')
| -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); |